From: Jackie Li Subject: [PATCH v11 1/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Wed, 28 Feb 2018 17:01:35 -0800 Message-ID: <1519866100-19989-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 mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 193CC6EBBE for ; Thu, 1 Mar 2018 01:03:53 +0000 (UTC) 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 Y2UgaXRzIEd1QyByZWxhdGVkLiBDdXJyZW50Cmd1Y19nZ3R0X29mZnNldCgpIGZhaWxlZCB0byBm 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 YyAgICAgICAgfCAgOCArKysrLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0 LmMgICAgICAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncu YyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYyAg ICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3JlZy5oICAgICAg ICB8ICAzIC0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyB8 IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jICAgICAgICAg ICAgfCAgNiArKysrLS0KIDkgZmlsZXMgY2hhbmdlZCwgMzYgaW5zZXJ0aW9ucygrKSwgMjUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwppbmRleCBlNjUxMmNjLi5hNzg4ZTE1 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwpAQCAtMjY5LDggKzI2OSw5IEBAIHZvaWQgaW50 ZWxfZ3VjX2luaXRfcGFyYW1zKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAogCS8qIElmIEd1QyBz dWJtaXNzaW9uIGlzIGVuYWJsZWQsIHNldCB1cCBhZGRpdGlvbmFsIHBhcmFtZXRlcnMgaGVyZSAq LwogCWlmIChVU0VTX0dVQ19TVUJNSVNTSU9OKGRldl9wcml2KSkgewotCQl1MzIgYWRzID0gZ3Vj X2dndHRfb2Zmc2V0KGd1Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsKLQkJdTMyIHBncyA9IGd1 Y19nZ3R0X29mZnNldChkZXZfcHJpdi0+Z3VjLnN0YWdlX2Rlc2NfcG9vbCk7CisJCXUzMiBhZHMg PSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLAorCQkJCQkJZ3VjLT5hZHNfdm1hKSA+PiBQQUdF X1NISUZUOworCQl1MzIgcGdzID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5zdGFn ZV9kZXNjX3Bvb2wpOwogCQl1MzIgY3R4X2luXzE2ID0gR1VDX01BWF9TVEFHRV9ERVNDUklQVE9S UyAvIDE2OwogCiAJCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSB8PSBhZHMgPDwgR1VDX0FEU19BRERS X1NISUZUOwpAQCAtNDE4LDcgKzQxOSw3IEBAIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05f RU5URVJfU19TVEFURTsKIAkvKiBhbnkgdmFsdWUgZ3JlYXRlciB0aGFuIEdVQ19QT1dFUl9EMCAq LwogCWRhdGFbMV0gPSBHVUNfUE9XRVJfRDE7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChn dWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Z3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBB UlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTQ0MSw3ICs0NDIsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jl c2V0X2VuZ2luZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJZGF0YVszXSA9IDA7CiAJZGF0YVs0 XSA9IDA7CiAJZGF0YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnN0YWdlX2lkOwotCWRhdGFb Nl0gPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVs2XSA9IGludGVs X2d1Y19nZ3R0X29mZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVs X2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CkBAIC00NjMsNyArNDY0 LDcgQEAgaW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2KQogCiAJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRVhJVF9TX1NUQVRFOwogCWRhdGFb MV0gPSBHVUNfUE9XRVJfRDA7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChndWMtPnNoYXJl ZF9kYXRhKTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5zaGFy ZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpF KGRhdGEpKTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggNTI4NTZhOS4uMGM4YjEw YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTEwMCwxMyArMTAwLDIzIEBAIHN0YXRp YyBpbmxpbmUgdm9pZCBpbnRlbF9ndWNfbm90aWZ5KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAln dWMtPm5vdGlmeShndWMpOwogfQogCi0vKgorLyogR3VDIGFkZHJlc3NlcyBhYm92ZSBHVUNfR0dU VF9UT1AgYWxzbyBkb24ndCBtYXAgdGhyb3VnaCB0aGUgR1RUICovCisjZGVmaW5lIEdVQ19HR1RU X1RPUAkweEZFRTAwMDAwCisKKy8qKgorICogaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KCkgLSBHZXQg YW5kIHZhbGlkYXRlIHRoZSBHR1RUIG9mZnNldCBvZiBAdm1hCisgKiBAZ3VjOiBpbnRlbF9ndWMg c3RydWN0dXJlLgorICogQHZtYTogaTkxNSBncmFwaGljcyB2aXJ0dWFsIG1lbW9yeSBhcmVhLgor ICoKICAqIEd1QyBkb2VzIG5vdCBhbGxvdyBhbnkgZ2Z4IEdHVFQgYWRkcmVzcyB0aGF0IGZhbGxz IGludG8gcmFuZ2UgWzAsIFdPUENNX1RPUCksCiAgKiB3aGljaCBpcyByZXNlcnZlZCBmb3IgQm9v dCBST00sIFNSQU0gYW5kIFdPUENNLiBDdXJyZW50bHkgdGhpcyB0b3AgYWRkcmVzcyBpcwogICog NTEySy4gSW4gb3JkZXIgdG8gZXhjbHVkZSAwLTUxMksgYWRkcmVzcyBzcGFjZSBmcm9tIEdHVFQs IGFsbCBnZnggb2JqZWN0cwogICogdXNlZCBieSBHdUMgaXMgcGlubmVkIHdpdGggUElOX09GRlNF VF9CSUFTIGFsb25nIHdpdGggc2l6ZSBvZiBXT1BDTS4KKyAqCisgKiBSZXR1cm46IEdHVFQgb2Zm c2V0IHRoYXQgbWVldHMgdGhlIEd1QyBnZnggYWRkcmVzcyByZXF1aXJlbWVudC4KICAqLwotc3Rh dGljIGlubGluZSB1MzIgZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQorc3Rh dGljIGlubGluZSB1MzIgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KHN0cnVjdCBpbnRlbF9ndWMgKmd1 YywKKwkJCQkJc3RydWN0IGk5MTVfdm1hICp2bWEpCiB7CiAJdTMyIG9mZnNldCA9IGk5MTVfZ2d0 dF9vZmZzZXQodm1hKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX2Fkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Fkcy5jCmluZGV4IGFj NjI3NTMuLjMzNGNiNTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19hZHMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRzLmMKQEAgLTc1 LDcgKzc1LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3BvbGljaWVzX2luaXQoc3RydWN0IGd1Y19wb2xp Y2llcyAqcG9saWNpZXMpCiBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1 YyAqZ3VjKQogewogCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IGd1Y190b19p OTE1KGd1Yyk7Ci0Jc3RydWN0IGk5MTVfdm1hICp2bWE7CisJc3RydWN0IGk5MTVfdm1hICp2bWEs ICprZXJuZWxfY3R4X3ZtYTsKIAlzdHJ1Y3QgcGFnZSAqcGFnZTsKIAkvKiBUaGUgYWRzIG9iaiBp bmNsdWRlcyB0aGUgc3RydWN0IGl0c2VsZiBhbmQgYnVmZmVycyBwYXNzZWQgdG8gR3VDICovCiAJ c3RydWN0IHsKQEAgLTEyMSw5ICsxMjEsOSBAQCBpbnQgaW50ZWxfZ3VjX2Fkc19jcmVhdGUoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogCSAqIHRvIGZpbmQgaXQuIE5vdGUgdGhhdCB3ZSBoYXZlIHRv IHNraXAgb3VyIGhlYWRlciAoMSBwYWdlKSwKIAkgKiBiZWNhdXNlIG91ciBHdUMgc2hhcmVkIGRh dGEgaXMgdGhlcmUuCiAJICovCisJa2VybmVsX2N0eF92bWEgPSBkZXZfcHJpdi0+a2VybmVsX2Nv bnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlOwogCWJsb2ItPmFkcy5nb2xkZW5fY29udGV4dF9scmNh ID0KLQkJZ3VjX2dndHRfb2Zmc2V0KGRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW1JD U10uc3RhdGUpICsKLQkJc2tpcHBlZF9vZmZzZXQ7CisJCWludGVsX2d1Y19nZ3R0X29mZnNldChn dWMsIGtlcm5lbF9jdHhfdm1hKSArIHNraXBwZWRfb2Zmc2V0OwogCiAJLyoKIAkgKiBUaGUgR3VD IGV4cGVjdHMgdXMgdG8gZXhjbHVkZSB0aGUgcG9ydGlvbiBvZiB0aGUgY29udGV4dCBpbWFnZSB0 aGF0CkBAIC0xMzUsNyArMTM1LDcgQEAgaW50IGludGVsX2d1Y19hZHNfY3JlYXRlKHN0cnVjdCBp bnRlbF9ndWMgKmd1YykKIAkJYmxvYi0+YWRzLmVuZ19zdGF0ZV9zaXplW2VuZ2luZS0+Z3VjX2lk XSA9CiAJCQllbmdpbmUtPmNvbnRleHRfc2l6ZSAtIHNraXBwZWRfc2l6ZTsKIAotCWJhc2UgPSBn dWNfZ2d0dF9vZmZzZXQodm1hKTsKKwliYXNlID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg dm1hKTsKIAlibG9iLT5hZHMuc2NoZWR1bGVyX3BvbGljaWVzID0gYmFzZSArIHB0cl9vZmZzZXQo YmxvYiwgcG9saWNpZXMpOwogCWJsb2ItPmFkcy5yZWdfc3RhdGVfYnVmZmVyID0gYmFzZSArIHB0 cl9vZmZzZXQoYmxvYiwgcmVnX3N0YXRlX2J1ZmZlcik7CiAJYmxvYi0+YWRzLnJlZ19zdGF0ZV9h ZGRyID0gYmFzZSArIHB0cl9vZmZzZXQoYmxvYiwgcmVnX3N0YXRlKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19jdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2N0LmMKaW5kZXggMjRhZDU1Ny4uMGEwZDNkNSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2N0LmMKQEAgLTE1Niw3ICsxNTYsOCBAQCBzdGF0aWMgaW50IGN0Y2hfaW5pdChz dHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWVyciA9IFBUUl9FUlIoYmxvYik7CiAJCWdvdG8gZXJy X3ZtYTsKIAl9Ci0JRFJNX0RFQlVHX0RSSVZFUigiQ1Q6IHZtYSBiYXNlPSUjeFxuIiwgZ3VjX2dn dHRfb2Zmc2V0KGN0Y2gtPnZtYSkpOworCURSTV9ERUJVR19EUklWRVIoIkNUOiB2bWEgYmFzZT0l I3hcbiIsCisJCQkgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY3RjaC0+dm1hKSk7CiAKIAkv KiBzdG9yZSBwb2ludGVycyB0byBkZXNjIGFuZCBjbWRzICovCiAJZm9yIChpID0gMDsgaSA8IEFS UkFZX1NJWkUoY3RjaC0+Y3Ricyk7IGkrKykgewpAQCAtMjAyLDcgKzIwMyw3IEBAIHN0YXRpYyBp bnQgY3RjaF9vcGVuKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAl9CiAKIAkvKiB2bWEgc2hvdWxk IGJlIGFscmVhZHkgYWxsb2NhdGVkIGFuZCBtYXAnZWQgKi8KLQliYXNlID0gZ3VjX2dndHRfb2Zm c2V0KGN0Y2gtPnZtYSk7CisJYmFzZSA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGN0Y2gt PnZtYSk7CiAKIAkvKiAocmUpaW5pdGlhbGl6ZSBkZXNjcmlwdG9ycwogCSAqIGNtZHMgYnVmZmVy cyBhcmUgaW4gdGhlIHNlY29uZCBoYWxmIG9mIHRoZSBibG9iIHBhZ2UKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3LmMKaW5kZXggM2IwOTMyOS4uMTc4ZDMzOSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX2Z3LmMKQEAgLTE2NSw3ICsxNjUsNyBAQCBzdGF0aWMgaW50IGd1Y194ZmVyX3Vj b2RlKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yywgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJSTkxNV9X UklURShETUFfQ09QWV9TSVpFLCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9z aXplKTsKIAogCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSBuZXcgYmxvYiAqLwot CW9mZnNldCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0Owor CW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBndWNfZnctPmhlYWRl cl9vZmZzZXQ7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZz ZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQp ICYgMHhGRkZGKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvZy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCmluZGV4IDdiNTA3 NGUuLjMzNjM2ZGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19s b2cuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKQEAgLTYzOCw3 ICs2MzgsNyBAQCBpbnQgaW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3Vj KQogCQkoR1VDX0xPR19JU1JfUEFHRVMgPDwgR1VDX0xPR19JU1JfU0hJRlQpIHwKIAkJKEdVQ19M T0dfQ1JBU0hfUEFHRVMgPDwgR1VDX0xPR19DUkFTSF9TSElGVCk7CiAKLQlvZmZzZXQgPSBndWNf Z2d0dF9vZmZzZXQodm1hKSA+PiBQQUdFX1NISUZUOyAvKiBpbiBwYWdlcyAqLworCW9mZnNldCA9 IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgPj4gUEFHRV9TSElGVDsKIAlndWMtPmxv Zy5mbGFncyA9IChvZmZzZXQgPDwgR1VDX0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFnczsKIAog CXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3Jl Zy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3JlZy5oCmluZGV4IDE5YTkyNDcu LjcxMWU5ZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19yZWcu aAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfcmVnLmgKQEAgLTgwLDkgKzgw LDYgQEAKICNkZWZpbmUgICBHVUNfV09QQ01fVE9QCQkJICAoMHg4MCA8PCAxMikJLyogNTEyS0Ig Ki8KICNkZWZpbmUgICBCWFRfR1VDX1dPUENNX1JDNl9SRVNFUlZFRAkgICgweDEwIDw8IDEyKQkv KiA2NEtCICAqLwogCi0vKiBHdUMgYWRkcmVzc2VzIGFib3ZlIEdVQ19HR1RUX1RPUCBhbHNvIGRv bid0IG1hcCB0aHJvdWdoIHRoZSBHVFQgKi8KLSNkZWZpbmUgR1VDX0dHVFRfVE9QCQkJMHhGRUUw MDAwMAotCiAjZGVmaW5lIEdFTjhfR1RfUE1fQ09ORklHCQlfTU1JTygweDEzODE0MCkKICNkZWZp bmUgR0VOOUxQX0dUX1BNX0NPTkZJRwkJX01NSU8oMHgxMzgxNDApCiAjZGVmaW5lIEdFTjlfR1Rf UE1fQ09ORklHCQlfTU1JTygweDEzODE2YykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfc3VibWlzc2lvbi5jCmluZGV4IDhhOGFkMmYuLjMzYWYyOTMgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtMzg2LDggKzM4Niw4IEBAIHN0YXRp YyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQlscmMt PmNvbnRleHRfZGVzYyA9IGxvd2VyXzMyX2JpdHMoY2UtPmxyY19kZXNjKTsKIAogCQkvKiBUaGUg c3RhdGUgcGFnZSBpcyBhZnRlciBQUEhXU1AgKi8KLQkJbHJjLT5yaW5nX2xyY2EgPQotCQkJZ3Vj X2dndHRfb2Zmc2V0KGNlLT5zdGF0ZSkgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7CisJCWxy Yy0+cmluZ19scmNhID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY2UtPnN0YXRlKSArCisJ CQkJIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAogCQkvKiBYWFg6IEluIGRpcmVjdCBzdWJt aXNzaW9uLCB0aGUgR3VDIHdhbnRzIHRoZSBIVyBjb250ZXh0IGlkCiAJCSAqIGhlcmUuIEluIHBy b3h5IHN1Ym1pc3Npb24sIGl0IHdhbnRzIHRoZSBzdGFnZSBpZApAQCAtMzk1LDcgKzM5NSw3IEBA IHN0YXRpYyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAog CQlscmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5zdGFnZV9pZCA8PCBHVUNfRUxDX0NUWElEX09G RlNFVCkgfAogCQkJCShndWNfZW5naW5lX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNFVCk7CiAK LQkJbHJjLT5yaW5nX2JlZ2luID0gZ3VjX2dndHRfb2Zmc2V0KGNlLT5yaW5nLT52bWEpOworCQls cmMtPnJpbmdfYmVnaW4gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+cmluZy0+dm1h KTsKIAkJbHJjLT5yaW5nX2VuZCA9IGxyYy0+cmluZ19iZWdpbiArIGNlLT5yaW5nLT5zaXplIC0g MTsKIAkJbHJjLT5yaW5nX25leHRfZnJlZV9sb2NhdGlvbiA9IGxyYy0+cmluZ19iZWdpbjsKIAkJ bHJjLT5yaW5nX2N1cnJlbnRfdGFpbF9wb2ludGVyX3ZhbHVlID0gMDsKQEAgLTQxMSw3ICs0MTEs NyBAQCBzdGF0aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0cnVjdCBpbnRlbF9ndWMgKmd1 YywKIAkgKiBUaGUgZG9vcmJlbGwsIHByb2Nlc3MgZGVzY3JpcHRvciwgYW5kIHdvcmtxdWV1ZSBh cmUgYWxsIHBhcnRzCiAJICogb2YgdGhlIGNsaWVudCBvYmplY3QsIHdoaWNoIHRoZSBHdUMgd2ls bCByZWZlcmVuY2UgdmlhIHRoZSBHR1RUCiAJICovCi0JZ2Z4X2FkZHIgPSBndWNfZ2d0dF9vZmZz ZXQoY2xpZW50LT52bWEpOworCWdmeF9hZGRyID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Y2xpZW50LT52bWEpOwogCWRlc2MtPmRiX3RyaWdnZXJfcGh5ID0gc2dfZG1hX2FkZHJlc3MoY2xp ZW50LT52bWEtPnBhZ2VzLT5zZ2wpICsKIAkJCQljbGllbnQtPmRvb3JiZWxsX29mZnNldDsKIAlk ZXNjLT5kYl90cmlnZ2VyX2NwdSA9IHB0cl90b191NjQoX19nZXRfZG9vcmJlbGwoY2xpZW50KSk7 CkBAIC01ODQsNyArNTg0LDcgQEAgc3RhdGljIHZvaWQgaW5qZWN0X3ByZWVtcHRfY29udGV4dChz dHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJZGF0YVszXSA9IGVuZ2luZS0+Z3VjX2lkOwogCWRh dGFbNF0gPSBndWMtPmV4ZWNidWZfY2xpZW50LT5wcmlvcml0eTsKIAlkYXRhWzVdID0gZ3VjLT5l eGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0X29mZnNldChndWMt PnNoYXJlZF9kYXRhKTsKKwlkYXRhWzZdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3Vj LT5zaGFyZWRfZGF0YSk7CiAKIAlpZiAoV0FSTl9PTihpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEs IEFSUkFZX1NJWkUoZGF0YSkpKSkgewogCQlleGVjbGlzdHNfY2xlYXJfYWN0aXZlKCZlbmdpbmUt PmV4ZWNsaXN0cywKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKaW5kZXggZWY5YTA1ZC4uNzBhNTI4 MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVjLmMKQEAgLTEzOCw3ICsxMzgsOCBAQCBzdGF0aWMg aW50IGh1Y191Y29kZV94ZmVyKHN0cnVjdCBpbnRlbF91Y19mdyAqaHVjX2Z3LCBzdHJ1Y3QgaTkx NV92bWEgKnZtYSkKIAlpbnRlbF91bmNvcmVfZm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VX QUtFX0FMTCk7CiAKIAkvKiBTZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUgdUNvZGUgKi8K LQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZzZXQodm1hKSArIGh1Y19mdy0+aGVhZGVyX29mZnNldDsK KwlvZmZzZXQgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoJmRldl9wcml2LT5ndWMsIHZtYSkgKwor CQkgaHVjX2Z3LT5oZWFkZXJfb2Zmc2V0OwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxv d2VyXzMyX2JpdHMob2Zmc2V0KSk7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0hJR0gsIHVwcGVy XzMyX2JpdHMob2Zmc2V0KSAmIDB4RkZGRik7CiAKQEAgLTIxNCw3ICsyMTUsOCBAQCBpbnQgaW50 ZWxfaHVjX2F1dGgoc3RydWN0IGludGVsX2h1YyAqaHVjKQogCX0KIAogCXJldCA9IGludGVsX2d1 Y19hdXRoX2h1YyhndWMsCi0JCQkJIGd1Y19nZ3R0X29mZnNldCh2bWEpICsgaHVjLT5mdy5yc2Ff b2Zmc2V0KTsKKwkJCQkgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKSArCisJCQkJIGh1 Yy0+ZncucnNhX29mZnNldCk7CiAJaWYgKHJldCkgewogCQlEUk1fRVJST1IoIkh1QzogR3VDIGRp ZCBub3QgYWNrIEF1dGggcmVxdWVzdCAlZFxuIiwgcmV0KTsKIAkJZ290byBvdXQ7Ci0tIAoyLjcu NAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==