From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jackie Li Subject: [PATCH v10 2/7] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Mon, 12 Feb 2018 15:45:48 -0800 Message-ID: <1518479153-28429-2-git-send-email-yaodong.li@intel.com> References: <1518479153-28429-1-git-send-email-yaodong.li@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E02E6E092 for ; Mon, 12 Feb 2018 23:47:33 +0000 (UTC) In-Reply-To: <1518479153-28429-1-git-send-email-yaodong.li@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org R3VDIHJlbGF0ZWQgZXhwb3J0ZWQgZnVuY3Rpb25zIHNob3VsZCBzdGFydCB3aXRoICJpbnRlbF9n dWNfIiBwcmVmaXggYW5kCnBhc3MgaW50ZWxfZ3VjIGFzIHRoZSBmaXJzdCBwYXJhbWV0ZXIgc2lu Y2UgaXRzIGd1YyByZWxhdGVkLiBDdXJyZW50Cmd1Y19nZ3R0X29mZnNldCgpIGZhaWxlZCB0byBm b2xsb3cgdGhpcyBjb2RlIGNvbnZlbnRpb24gYW5kIHRoaXMgaXMgYQpwcm9ibGVtIGZvciBmdXR1 cmUgcGF0Y2hlcyB0aGF0IG5lZWRzIHRvIGFjY2VzcyBpbnRlbF9ndWMgZGF0YSB0byB2ZXJpZnkK dGhlIEdHVFQgb2Zmc2V0IGFnYWluc3QgdGhlIEd1QyBXT1BDTSB0b3AuCgpUaGlzIHBhdGNoIHJl bmFtZXMgdGhlIGd1Y19nZ3R0X29mZnNldCB0byBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQgYW5kIHVw ZGF0ZXMKdGhlIHJlbGF0ZWQgY29kZSB0byBwYXNzIGludGVsX2d1YyBwb2ludGVyIHRvIHRoaXMg ZnVuY3Rpb24gY2FsbCwgc28gdGhhdAp3ZSBjYW4gaGF2ZSBhIHVuaWZpZWQgY29kaW5nIHN0eWxl IGZvciBHdUMgY29kZSBhbmQgYWxzbyBlbmFibGUgdGhlIGZ1dHVyZQpwYXRjaGVzIHRvIGdldCBH dUMgcmVsYXRlZCBkYXRhIGZyb20gaW50ZWxfZ3VjIHRvIGRvIHRoZSBvZmZzZXQKdmVyaWZpY2F0 aW9uLiBNZWFud2hpbGUsIHRoaXMgcGF0Y2ggYWxzbyBtb3ZlcyB0aGUgR1VDX0dHVFRfVE9QIGZy b20KaW50ZWxfZ3VjX3JlZ3MuaCB0byBpbnRlbF9ndWMuaCBzaW5jZSBpdCBpcyBub3QgR3VDIHJl Z2lzdGVyIHJlbGF0ZWQKZGVmaW5pdGlvbi4KCnY4OgogLSBGaXhlZCBjb2Rpbmcgc3R5bGUgaXNz dWVzIGFuZCBtb3ZlZCBHVUNfR0dUVF9UT1AgdG8gaW50ZWxfZ3VjLmggKFNhZ2FyKQogLSBVcGRh dGVkIGNvbW1pdCBtZXNzYWdlIHRvIGV4cGxhaW4gdG8gcmVhc29uIGFuZCBtb3RpdmF0aW9uIHRv IGFkZAogICBpbnRlbF9ndWMgYXMgdGhlIGZpcnN0IHBhcmFtZXRlciBvZiBpbnRlbF9ndWNfZ2d0 dF9vZmZzZXQgKENocmlzKQoKdjk6CiAtIEZpeGVkIGNvZGUgYWxpZ25tZW50IGlzc3VlIGR1ZSB0 byBsaW5lIGJyZWFrIChDaHJpcykKCnYxMDoKIC0gUmVtb3ZlZCB1bm5lY2Vzc2FyeSBjb21tZW50 cywgcmVkdW5kYW50IGNvZGUgYW5kIGF2b2lkZWQgcmV1c2UgdmFyaWFibGUKICAgdG8gYXZvaWQg cG90ZW50aWFsIGlzc3VlcyAoSm9vbmFzKQoKQ2M6IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53 YWpkZWN6a29AaW50ZWwuY29tPgpDYzogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxl QGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpD YzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50ZWwuY29tPgpSZXZp ZXdlZC1ieTogU2FnYXIgQXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4gKHY4 KQpSZXZpZXdlZC1ieTogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFodGluZW5AbGludXguaW50 ZWwuY29tPiAodjkpClNpZ25lZC1vZmYtYnk6IEphY2tpZSBMaSA8eWFvZG9uZy5saUBpbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMgICAgICAgICAgICB8IDEx ICsrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAg IHwgMTQgKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19hZHMu YyAgICAgICAgfCAyNyArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19jdC5jICAgICAgICAgfCAgNSArKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2Z3LmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWNfbG9nLmMgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19yZWcuaCAgICAgICAgfCAgMyAtLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2d1Y19zdWJtaXNzaW9uLmMgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9odWMuYyAgICAgICAgICAgIHwgIDYgKysrKy0tCiA5IGZpbGVzIGNoYW5nZWQsIDQ2IGlu c2VydGlvbnMoKyksIDM0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKaW5k ZXggOWY0NWU2ZC4uZmRmOGNiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKQEAgLTI2OSw4 ICsyNjksOSBAQCB2b2lkIGludGVsX2d1Y19pbml0X3BhcmFtcyhzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCiAKIAkvKiBJZiBHdUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLCBzZXQgdXAgYWRkaXRpb25h bCBwYXJhbWV0ZXJzIGhlcmUgKi8KIAlpZiAoVVNFU19HVUNfU1VCTUlTU0lPTihkZXZfcHJpdikp IHsKLQkJdTMyIGFkcyA9IGd1Y19nZ3R0X29mZnNldChndWMtPmFkc192bWEpID4+IFBBR0VfU0hJ RlQ7Ci0JCXUzMiBwZ3MgPSBndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmd1Yy5zdGFnZV9kZXNj X3Bvb2wpOworCQl1MzIgYWRzID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywKKwkJCQkJCWd1 Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsKKwkJdTMyIHBncyA9IGludGVsX2d1Y19nZ3R0X29m ZnNldChndWMsIGd1Yy0+c3RhZ2VfZGVzY19wb29sKTsKIAkJdTMyIGN0eF9pbl8xNiA9IEdVQ19N QVhfU1RBR0VfREVTQ1JJUFRPUlMgLyAxNjsKIAogCQlwYXJhbXNbR1VDX0NUTF9ERUJVR10gfD0g YWRzIDw8IEdVQ19BRFNfQUREUl9TSElGVDsKQEAgLTQxOCw3ICs0MTksNyBAQCBpbnQgaW50ZWxf Z3VjX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWRhdGFbMF0g PSBJTlRFTF9HVUNfQUNUSU9OX0VOVEVSX1NfU1RBVEU7CiAJLyogYW55IHZhbHVlIGdyZWF0ZXIg dGhhbiBHVUNfUE9XRVJfRDAgKi8KIAlkYXRhWzFdID0gR1VDX1BPV0VSX0QxOwotCWRhdGFbMl0g PSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVsyXSA9IGludGVsX2d1 Y19nZ3R0X29mZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVsX2d1 Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CkBAIC00NDEsNyArNDQyLDcg QEAgaW50IGludGVsX2d1Y19yZXNldF9lbmdpbmUoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCWRh dGFbM10gPSAwOwogCWRhdGFbNF0gPSAwOwogCWRhdGFbNV0gPSBndWMtPmV4ZWNidWZfY2xpZW50 LT5zdGFnZV9pZDsKLQlkYXRhWzZdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEp OworCWRhdGFbNl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRh KTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkp OwogfQpAQCAtNDYzLDcgKzQ2NCw3IEBAIGludCBpbnRlbF9ndWNfcmVzdW1lKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogCWRhdGFbMF0gPSBJTlRFTF9HVUNfQUNUSU9OX0VY SVRfU19TVEFURTsKIAlkYXRhWzFdID0gR1VDX1BPV0VSX0QwOwotCWRhdGFbMl0gPSBndWNfZ2d0 dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVsyXSA9IGludGVsX2d1Y19nZ3R0X29m ZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVsX2d1Y19zZW5kKGd1 YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCmlu ZGV4IDllMGE5N2UuLjUwYmU2ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oCkBAIC0xMDEs MTMgKzEwMSwyMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaW50ZWxfZ3VjX25vdGlmeShzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMpCiAJZ3VjLT5ub3RpZnkoZ3VjKTsKIH0KIAotLyoKKy8qIEd1QyBhZGRy ZXNzZXMgYWJvdmUgR1VDX0dHVFRfVE9QIGFsc28gZG9uJ3QgbWFwIHRocm91Z2ggdGhlIEdUVCAq LworI2RlZmluZSBHVUNfR0dUVF9UT1AJMHhGRUUwMDAwMAorCisvKioKKyAqIGludGVsX2d1Y19n Z3R0X29mZnNldCgpIC0gR2V0IGFuZCB2YWxpZGF0ZSB0aGUgR0dUVCBvZmZzZXQgb2YgQHZtYQor ICogQGd1YzogaW50ZWwgZ3VjLgorICogQHZtYTogaTkxNSBncmFwaGljcyB2aXJ0dWFsIG1lbW9y eSBhcmVhLgorICoKICAqIEd1QyBkb2VzIG5vdCBhbGxvdyBhbnkgZ2Z4IEdHVFQgYWRkcmVzcyB0 aGF0IGZhbGxzIGludG8gcmFuZ2UgWzAsIFdPUENNX1RPUCksCiAgKiB3aGljaCBpcyByZXNlcnZl ZCBmb3IgQm9vdCBST00sIFNSQU0gYW5kIFdPUENNLiBDdXJyZW50bHkgdGhpcyB0b3AgYWRkcmVz cyBpcwogICogNTEySy4gSW4gb3JkZXIgdG8gZXhjbHVkZSAwLTUxMksgYWRkcmVzcyBzcGFjZSBm cm9tIEdHVFQsIGFsbCBnZnggb2JqZWN0cwogICogdXNlZCBieSBHdUMgaXMgcGlubmVkIHdpdGgg UElOX09GRlNFVF9CSUFTIGFsb25nIHdpdGggc2l6ZSBvZiBXT1BDTS4KKyAqCisgKiBSZXR1cm46 IEdHVFQgb2Zmc2V0IHRoYXQgbWVldHMgdGhlIEd1QyBnZnggYWRkcmVzcyByZXF1aXJlbWVudC4K ICAqLwotc3RhdGljIGlubGluZSB1MzIgZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpOTE1X3ZtYSAq dm1hKQorc3RhdGljIGlubGluZSB1MzIgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKKwkJCQkJc3RydWN0IGk5MTVfdm1hICp2bWEpCiB7CiAJdTMyIG9mZnNldCA9 IGk5MTVfZ2d0dF9vZmZzZXQodm1hKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2Fkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Fkcy5j CmluZGV4IGFjNjI3NTMuLmI0YjE4Y2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19hZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRz LmMKQEAgLTc1LDcgKzc1LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3BvbGljaWVzX2luaXQoc3RydWN0 IGd1Y19wb2xpY2llcyAqcG9saWNpZXMpCiBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUoc3RydWN0 IGludGVsX2d1YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IGd1Y190b19pOTE1KGd1Yyk7Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWE7CisJc3RydWN0IGk5MTVf dm1hICp2bWEsICprZXJuZWxfY3R4X3ZtYTsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAkvKiBUaGUg YWRzIG9iaiBpbmNsdWRlcyB0aGUgc3RydWN0IGl0c2VsZiBhbmQgYnVmZmVycyBwYXNzZWQgdG8g R3VDICovCiAJc3RydWN0IHsKQEAgLTExMywxNyArMTEzLDYgQEAgaW50IGludGVsX2d1Y19hZHNf Y3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJYmxvYi0+cmVnX3N0YXRlLndoaXRlX2xp c3RbZW5naW5lLT5ndWNfaWRdLmNvdW50ID0gMDsKIAl9CiAKLQkvKgotCSAqIFRoZSBHdUMgcmVx dWlyZXMgYSAiR29sZGVuIENvbnRleHQiIHdoZW4gaXQgcmVpbml0aWFsaXNlcwotCSAqIGVuZ2lu ZXMgYWZ0ZXIgYSByZXNldC4gSGVyZSB3ZSB1c2UgdGhlIFJlbmRlciByaW5nIGRlZmF1bHQKLQkg KiBjb250ZXh0LCB3aGljaCBtdXN0IGFscmVhZHkgZXhpc3QgYW5kIGJlIHBpbm5lZCBpbiB0aGUg R0dUVCwKLQkgKiBzbyBpdHMgYWRkcmVzcyB3b24ndCBjaGFuZ2UgYWZ0ZXIgd2UndmUgdG9sZCB0 aGUgR3VDIHdoZXJlCi0JICogdG8gZmluZCBpdC4gTm90ZSB0aGF0IHdlIGhhdmUgdG8gc2tpcCBv dXIgaGVhZGVyICgxIHBhZ2UpLAotCSAqIGJlY2F1c2Ugb3VyIEd1QyBzaGFyZWQgZGF0YSBpcyB0 aGVyZS4KLQkgKi8KLQlibG9iLT5hZHMuZ29sZGVuX2NvbnRleHRfbHJjYSA9Ci0JCWd1Y19nZ3R0 X29mZnNldChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlKSArCi0J CXNraXBwZWRfb2Zmc2V0OwogCiAJLyoKIAkgKiBUaGUgR3VDIGV4cGVjdHMgdXMgdG8gZXhjbHVk ZSB0aGUgcG9ydGlvbiBvZiB0aGUgY29udGV4dCBpbWFnZSB0aGF0CkBAIC0xMzUsMTEgKzEyNCwy MyBAQCBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQli bG9iLT5hZHMuZW5nX3N0YXRlX3NpemVbZW5naW5lLT5ndWNfaWRdID0KIAkJCWVuZ2luZS0+Y29u dGV4dF9zaXplIC0gc2tpcHBlZF9zaXplOwogCi0JYmFzZSA9IGd1Y19nZ3R0X29mZnNldCh2bWEp OworCWJhc2UgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpOwogCWJsb2ItPmFkcy5z Y2hlZHVsZXJfcG9saWNpZXMgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCBwb2xpY2llcyk7CiAJ YmxvYi0+YWRzLnJlZ19zdGF0ZV9idWZmZXIgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCByZWdf c3RhdGVfYnVmZmVyKTsKIAlibG9iLT5hZHMucmVnX3N0YXRlX2FkZHIgPSBiYXNlICsgcHRyX29m ZnNldChibG9iLCByZWdfc3RhdGUpOwogCisJLyoKKwkgKiBUaGUgR3VDIHJlcXVpcmVzIGEgIkdv bGRlbiBDb250ZXh0IiB3aGVuIGl0IHJlaW5pdGlhbGlzZXMKKwkgKiBlbmdpbmVzIGFmdGVyIGEg cmVzZXQuIEhlcmUgd2UgdXNlIHRoZSBSZW5kZXIgcmluZyBkZWZhdWx0CisJICogY29udGV4dCwg d2hpY2ggbXVzdCBhbHJlYWR5IGV4aXN0IGFuZCBiZSBwaW5uZWQgaW4gdGhlIEdHVFQsCisJICog c28gaXRzIGFkZHJlc3Mgd29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQgdGhlIEd1QyB3aGVy ZQorCSAqIHRvIGZpbmQgaXQuIE5vdGUgdGhhdCB3ZSBoYXZlIHRvIHNraXAgb3VyIGhlYWRlciAo MSBwYWdlKSwKKwkgKiBiZWNhdXNlIG91ciBHdUMgc2hhcmVkIGRhdGEgaXMgdGhlcmUuCisJICov CisJa2VybmVsX2N0eF92bWEgPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtSQ1Nd LnN0YXRlOworCWJsb2ItPmFkcy5nb2xkZW5fY29udGV4dF9scmNhID0KKwkJaW50ZWxfZ3VjX2dn dHRfb2Zmc2V0KGd1Yywga2VybmVsX2N0eF92bWEpICsgc2tpcHBlZF9vZmZzZXQ7CisKIAlrdW5t YXAocGFnZSk7CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19jdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKaW5k ZXggMjRhZDU1Ny4uMGEwZDNkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2N0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKQEAg LTE1Niw3ICsxNTYsOCBAQCBzdGF0aWMgaW50IGN0Y2hfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMsCiAJCWVyciA9IFBUUl9FUlIoYmxvYik7CiAJCWdvdG8gZXJyX3ZtYTsKIAl9Ci0JRFJNX0RF QlVHX0RSSVZFUigiQ1Q6IHZtYSBiYXNlPSUjeFxuIiwgZ3VjX2dndHRfb2Zmc2V0KGN0Y2gtPnZt YSkpOworCURSTV9ERUJVR19EUklWRVIoIkNUOiB2bWEgYmFzZT0lI3hcbiIsCisJCQkgaW50ZWxf Z3VjX2dndHRfb2Zmc2V0KGd1YywgY3RjaC0+dm1hKSk7CiAKIAkvKiBzdG9yZSBwb2ludGVycyB0 byBkZXNjIGFuZCBjbWRzICovCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY3RjaC0+Y3Ri cyk7IGkrKykgewpAQCAtMjAyLDcgKzIwMyw3IEBAIHN0YXRpYyBpbnQgY3RjaF9vcGVuKHN0cnVj dCBpbnRlbF9ndWMgKmd1YywKIAl9CiAKIAkvKiB2bWEgc2hvdWxkIGJlIGFscmVhZHkgYWxsb2Nh dGVkIGFuZCBtYXAnZWQgKi8KLQliYXNlID0gZ3VjX2dndHRfb2Zmc2V0KGN0Y2gtPnZtYSk7CisJ YmFzZSA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGN0Y2gtPnZtYSk7CiAKIAkvKiAocmUp aW5pdGlhbGl6ZSBkZXNjcmlwdG9ycwogCSAqIGNtZHMgYnVmZmVycyBhcmUgaW4gdGhlIHNlY29u ZCBoYWxmIG9mIHRoZSBibG9iIHBhZ2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKaW5k ZXggM2IwOTMyOS4uMTc4ZDMzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZ3VjX2Z3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKQEAg LTE2NSw3ICsxNjUsNyBAQCBzdGF0aWMgaW50IGd1Y194ZmVyX3Vjb2RlKHN0cnVjdCBpbnRlbF9n dWMgKmd1Yywgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJSTkxNV9XUklURShETUFfQ09QWV9TSVpF LCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplKTsKIAogCS8qIFNldCB0 aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSBuZXcgYmxvYiAqLwotCW9mZnNldCA9IGd1Y19nZ3R0 X29mZnNldCh2bWEpICsgZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1 Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7CiAJSTkxNV9X UklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRF KERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCmluZGV4IDdiNTA3NGUuLjMzNjM2ZGUgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKQEAgLTYzOCw3ICs2MzgsNyBAQCBpbnQgaW50 ZWxfZ3VjX2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQkoR1VDX0xPR19JU1Jf UEFHRVMgPDwgR1VDX0xPR19JU1JfU0hJRlQpIHwKIAkJKEdVQ19MT0dfQ1JBU0hfUEFHRVMgPDwg R1VDX0xPR19DUkFTSF9TSElGVCk7CiAKLQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZzZXQodm1hKSA+ PiBQQUdFX1NISUZUOyAvKiBpbiBwYWdlcyAqLworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29m ZnNldChndWMsIHZtYSkgPj4gUEFHRV9TSElGVDsKIAlndWMtPmxvZy5mbGFncyA9IChvZmZzZXQg PDwgR1VDX0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFnczsKIAogCXJldHVybiAwOwpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3JlZy5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX3JlZy5oCmluZGV4IDFmNTJmYjguLmRlNGY3OGIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19yZWcuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVnLmgKQEAgLTc2LDkgKzc2LDYgQEAKIC8qIERlZmluZXMg V09QQ00gc3BhY2UgYXZhaWxhYmxlIHRvIEd1QyBmaXJtd2FyZSAqLwogI2RlZmluZSBHVUNfV09Q Q01fU0laRQkJCV9NTUlPKDB4YzA1MCkKIAotLyogR3VDIGFkZHJlc3NlcyBhYm92ZSBHVUNfR0dU VF9UT1AgYWxzbyBkb24ndCBtYXAgdGhyb3VnaCB0aGUgR1RUICovCi0jZGVmaW5lIEdVQ19HR1RU X1RPUAkJCTB4RkVFMDAwMDAKLQogI2RlZmluZSBHRU44X0dUX1BNX0NPTkZJRwkJX01NSU8oMHgx MzgxNDApCiAjZGVmaW5lIEdFTjlMUF9HVF9QTV9DT05GSUcJCV9NTUlPKDB4MTM4MTQwKQogI2Rl ZmluZSBHRU45X0dUX1BNX0NPTkZJRwkJX01NSU8oMHgxMzgxNmMpCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwppbmRleCBiNDNiNThjLi5lYmZjYjlmIDEwMDY0 NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKQEAgLTM3NSw4ICsz NzUsOCBAQCBzdGF0aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0cnVjdCBpbnRlbF9ndWMg Kmd1YywKIAkJbHJjLT5jb250ZXh0X2Rlc2MgPSBsb3dlcl8zMl9iaXRzKGNlLT5scmNfZGVzYyk7 CiAKIAkJLyogVGhlIHN0YXRlIHBhZ2UgaXMgYWZ0ZXIgUFBIV1NQICovCi0JCWxyYy0+cmluZ19s cmNhID0KLQkJCWd1Y19nZ3R0X29mZnNldChjZS0+c3RhdGUpICsgTFJDX1NUQVRFX1BOICogUEFH RV9TSVpFOworCQlscmMtPnJpbmdfbHJjYSA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGNl LT5zdGF0ZSkgKworCQkJCSBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CiAKIAkJLyogWFhYOiBJ biBkaXJlY3Qgc3VibWlzc2lvbiwgdGhlIEd1QyB3YW50cyB0aGUgSFcgY29udGV4dCBpZAogCQkg KiBoZXJlLiBJbiBwcm94eSBzdWJtaXNzaW9uLCBpdCB3YW50cyB0aGUgc3RhZ2UgaWQKQEAgLTM4 NCw3ICszODQsNyBAQCBzdGF0aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKIAkJbHJjLT5jb250ZXh0X2lkID0gKGNsaWVudC0+c3RhZ2VfaWQgPDwgR1VD X0VMQ19DVFhJRF9PRkZTRVQpIHwKIAkJCQkoZ3VjX2VuZ2luZV9pZCA8PCBHVUNfRUxDX0VOR0lO RV9PRkZTRVQpOwogCi0JCWxyYy0+cmluZ19iZWdpbiA9IGd1Y19nZ3R0X29mZnNldChjZS0+cmlu Zy0+dm1hKTsKKwkJbHJjLT5yaW5nX2JlZ2luID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Y2UtPnJpbmctPnZtYSk7CiAJCWxyYy0+cmluZ19lbmQgPSBscmMtPnJpbmdfYmVnaW4gKyBjZS0+ cmluZy0+c2l6ZSAtIDE7CiAJCWxyYy0+cmluZ19uZXh0X2ZyZWVfbG9jYXRpb24gPSBscmMtPnJp bmdfYmVnaW47CiAJCWxyYy0+cmluZ19jdXJyZW50X3RhaWxfcG9pbnRlcl92YWx1ZSA9IDA7CkBA IC00MDAsNyArNDAwLDcgQEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMsCiAJICogVGhlIGRvb3JiZWxsLCBwcm9jZXNzIGRlc2NyaXB0b3IsIGFu ZCB3b3JrcXVldWUgYXJlIGFsbCBwYXJ0cwogCSAqIG9mIHRoZSBjbGllbnQgb2JqZWN0LCB3aGlj aCB0aGUgR3VDIHdpbGwgcmVmZXJlbmNlIHZpYSB0aGUgR0dUVAogCSAqLwotCWdmeF9hZGRyID0g Z3VjX2dndHRfb2Zmc2V0KGNsaWVudC0+dm1hKTsKKwlnZnhfYWRkciA9IGludGVsX2d1Y19nZ3R0 X29mZnNldChndWMsIGNsaWVudC0+dm1hKTsKIAlkZXNjLT5kYl90cmlnZ2VyX3BoeSA9IHNnX2Rt YV9hZGRyZXNzKGNsaWVudC0+dm1hLT5wYWdlcy0+c2dsKSArCiAJCQkJY2xpZW50LT5kb29yYmVs bF9vZmZzZXQ7CiAJZGVzYy0+ZGJfdHJpZ2dlcl9jcHUgPSBwdHJfdG9fdTY0KF9fZ2V0X2Rvb3Ji ZWxsKGNsaWVudCkpOwpAQCAtNTk2LDcgKzU5Niw3IEBAIHN0YXRpYyB2b2lkIGluamVjdF9wcmVl bXB0X2NvbnRleHQoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCWRhdGFbM10gPSBlbmdpbmUt Pmd1Y19pZDsKIAlkYXRhWzRdID0gZ3VjLT5leGVjYnVmX2NsaWVudC0+cHJpb3JpdHk7CiAJZGF0 YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnN0YWdlX2lkOwotCWRhdGFbNl0gPSBndWNfZ2d0 dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVs2XSA9IGludGVsX2d1Y19nZ3R0X29m ZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJaWYgKFdBUk5fT04oaW50ZWxfZ3VjX3Nl bmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKSkpIHsKIAkJZXhlY2xpc3RzX2NsZWFyX2Fj dGl2ZSgmZW5naW5lLT5leGVjbGlzdHMsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9odWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCmluZGV4IDhl ZDA1MTguLmFlZDljMWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1 Yy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jCkBAIC0xMzcsNyArMTM3 LDggQEAgc3RhdGljIGludCBodWNfdWNvZGVfeGZlcihzdHJ1Y3QgaW50ZWxfdWNfZncgKmh1Y19m dywgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJaW50ZWxfdW5jb3JlX2ZvcmNld2FrZV9nZXQoZGV2 X3ByaXYsIEZPUkNFV0FLRV9BTEwpOwogCiAJLyogU2V0IHRoZSBzb3VyY2UgYWRkcmVzcyBmb3Ig dGhlIHVDb2RlICovCi0Jb2Zmc2V0ID0gZ3VjX2dndHRfb2Zmc2V0KHZtYSkgKyBodWNfZnctPmhl YWRlcl9vZmZzZXQ7CisJb2Zmc2V0ID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KCZkZXZfcHJpdi0+ Z3VjLCB2bWEpICsKKwkJIGh1Y19mdy0+aGVhZGVyX29mZnNldDsKIAlJOTE1X1dSSVRFKERNQV9B RERSXzBfTE9XLCBsb3dlcl8zMl9iaXRzKG9mZnNldCkpOwogCUk5MTVfV1JJVEUoRE1BX0FERFJf MF9ISUdILCB1cHBlcl8zMl9iaXRzKG9mZnNldCkgJiAweEZGRkYpOwogCkBAIC0yMTMsNyArMjE0 LDggQEAgaW50IGludGVsX2h1Y19hdXRoKHN0cnVjdCBpbnRlbF9odWMgKmh1YykKIAl9CiAKIAly ZXQgPSBpbnRlbF9ndWNfYXV0aF9odWMoZ3VjLAotCQkJCSBndWNfZ2d0dF9vZmZzZXQodm1hKSAr IGh1Yy0+ZncucnNhX29mZnNldCk7CisJCQkJIGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZt YSkgKworCQkJCSBodWMtPmZ3LnJzYV9vZmZzZXQpOwogCWlmIChyZXQpIHsKIAkJRFJNX0VSUk9S KCJIdUM6IEd1QyBkaWQgbm90IGFjayBBdXRoIHJlcXVlc3QgJWRcbiIsIHJldCk7CiAJCWdvdG8g b3V0OwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=