From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jackie Li Subject: [PATCH v5 2/6] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Mon, 8 Jan 2018 10:29:12 -0800 Message-ID: <1515436156-17954-2-git-send-email-yaodong.li@intel.com> References: <1515436156-17954-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 mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id AD3606E017 for ; Mon, 8 Jan 2018 18:30:40 +0000 (UTC) In-Reply-To: <1515436156-17954-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 dWNfIgpwcmVmaXggYW5kIHBhc3MgaW50ZWxfZ3VjIGFzIHRoZSBmaXJzdCBwYXJhbWV0ZXIgc2lu Y2UgaXRzIGd1YwpyZWxhdGVkLiBDdXJyZW50IGd1Y19nZ3R0X29mZnNldCgpIGZhaWxlZCB0byBm b2xsb3cgdGhpcyBjb2RlCmNvbnZlbnRpb24uCgpUaGlzIHBhdGNoIHJlbmFtZXMgdGhlIGd1Y19n Z3R0X29mZnNldCB0byBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQKYW5kIHVwZGF0ZXMgdGhlIHJlbGF0 ZWQgY29kZSB0byBwYXNzIGludGVsX2d1YyBwb2ludGVyIHRvCnRoaXMgZnVuY3Rpb24gY2FsbC4g c28gdGhhdCB3ZSBoYXZlIGEgdW5pZmllZCBjb2Rpbmcgc3R5bGUgZm9yCkd1QyBjb2RlLgoKQ2M6 IE1pY2hhbCBXYWpkZWN6a28gPG1pY2hhbC53YWpkZWN6a29AaW50ZWwuY29tPgpDYzogU2FnYXIg QXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8 Y2hyaXNAY2hyaXMtd2lsc29uLmNvLnVrPgpDYzogSm9vbmFzIExhaHRpbmVuIDxqb29uYXMubGFo dGluZW5AbGludXguaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKYWNraWUgTGkgPHlhb2Rvbmcu bGlAaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jICAgICAg ICAgICAgfCAxMiArKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5o ICAgICAgICAgICAgfCAxMCArKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfYWRzLmMgICAgICAgIHwgMjUgKysrKysrKysrKysrKy0tLS0tLS0tLS0tLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMgICAgICAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19sb2cuYyAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2h1Yy5jICAgICAgICAgICAgfCAgNiArKysrLS0KIDggZmlsZXMgY2hhbmdl ZCwgNDIgaW5zZXJ0aW9ucygrKSwgMzAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWMuYwppbmRleCBiY2Q2MDllLi41MDdkZjllIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwpA QCAtMjU2LDggKzI1NiwxMCBAQCB2b2lkIGludGVsX2d1Y19pbml0X3BhcmFtcyhzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMpCiAKIAkvKiBJZiBHdUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLCBzZXQgdXAg YWRkaXRpb25hbCBwYXJhbWV0ZXJzIGhlcmUgKi8KIAlpZiAoVVNFU19HVUNfU1VCTUlTU0lPTihk ZXZfcHJpdikpIHsKLQkJdTMyIGFkcyA9IGd1Y19nZ3R0X29mZnNldChndWMtPmFkc192bWEpID4+ IFBBR0VfU0hJRlQ7Ci0JCXUzMiBwZ3MgPSBndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmd1Yy5z dGFnZV9kZXNjX3Bvb2wpOworCQl1MzIgYWRzID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywK KwkJCQkJCWd1Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsKKwkJdTMyIHBncyA9IGludGVsX2d1 Y19nZ3R0X29mZnNldChndWMsCisJCQkJCQlkZXZfcHJpdi0+Z3VjLnN0YWdlX2Rlc2NfcG9vbCk7 CiAJCXUzMiBjdHhfaW5fMTYgPSBHVUNfTUFYX1NUQUdFX0RFU0NSSVBUT1JTIC8gMTY7CiAKIAkJ cGFyYW1zW0dVQ19DVExfREVCVUddIHw9IGFkcyA8PCBHVUNfQURTX0FERFJfU0hJRlQ7CkBAIC00 MDUsNyArNDA3LDcgQEAgaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdikKIAlkYXRhWzBdID0gSU5URUxfR1VDX0FDVElPTl9FTlRFUl9TX1NUQVRF OwogCS8qIGFueSB2YWx1ZSBncmVhdGVyIHRoYW4gR1VDX1BPV0VSX0QwICovCiAJZGF0YVsxXSA9 IEdVQ19QT1dFUl9EMTsKLQlkYXRhWzJdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2Rh dGEpOworCWRhdGFbMl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9k YXRhKTsKIAogCXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0 YSkpOwogfQpAQCAtNDI4LDcgKzQzMCw3IEBAIGludCBpbnRlbF9ndWNfcmVzZXRfZW5naW5lKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YywKIAlkYXRhWzNdID0gMDsKIAlkYXRhWzRdID0gMDsKIAlkYXRh WzVdID0gZ3VjLT5leGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0 X29mZnNldChndWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzZdID0gaW50ZWxfZ3VjX2dndHRfb2Zm c2V0KGd1YywgZ3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3Vj LCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTQ1MCw3ICs0NTIsNyBAQCBpbnQgaW50 ZWxfZ3VjX3Jlc3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlkYXRh WzBdID0gSU5URUxfR1VDX0FDVElPTl9FWElUX1NfU1RBVEU7CiAJZGF0YVsxXSA9IEdVQ19QT1dF Ul9EMDsKLQlkYXRhWzJdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRh dGFbMl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAog CXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogfQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9ndWMuaAppbmRleCA5ZTBhOTdlLi5iN2UyYTE4IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaApAQCAtMTAxLDEzICsxMDEsMTkgQEAgc3RhdGljIGlubGluZSB2b2lk IGludGVsX2d1Y19ub3RpZnkoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCWd1Yy0+bm90aWZ5KGd1 Yyk7CiB9CiAKLS8qCisvKiBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoKSAtIEdldCB0aGUgR0dUVCBv ZmZzZXQgb2YgQHZtYS4KKyAqIEBndWM6IGludGVsIGd1Yy4KKyAqIEB2bWE6IGk5MTUgZ3JhcGhp Y3MgdmlydHVhbCBtZW1vcnkgYXJlYS4KKyAqCiAgKiBHdUMgZG9lcyBub3QgYWxsb3cgYW55IGdm eCBHR1RUIGFkZHJlc3MgdGhhdCBmYWxscyBpbnRvIHJhbmdlIFswLCBXT1BDTV9UT1ApLAogICog d2hpY2ggaXMgcmVzZXJ2ZWQgZm9yIEJvb3QgUk9NLCBTUkFNIGFuZCBXT1BDTS4gQ3VycmVudGx5 IHRoaXMgdG9wIGFkZHJlc3MgaXMKICAqIDUxMksuIEluIG9yZGVyIHRvIGV4Y2x1ZGUgMC01MTJL IGFkZHJlc3Mgc3BhY2UgZnJvbSBHR1RULCBhbGwgZ2Z4IG9iamVjdHMKICAqIHVzZWQgYnkgR3VD IGlzIHBpbm5lZCB3aXRoIFBJTl9PRkZTRVRfQklBUyBhbG9uZyB3aXRoIHNpemUgb2YgV09QQ00u CisgKgorICogUmV0dXJuOiBHR1RUIG9mZnNldCB0aGF0IG1lZXRzIHRoZSBHdUMgZ2Z4IGFkZHJl c3MgcmVxdWlyZW1lbnQuCiAgKi8KLXN0YXRpYyBpbmxpbmUgdTMyIGd1Y19nZ3R0X29mZnNldChz dHJ1Y3QgaTkxNV92bWEgKnZtYSkKK3N0YXRpYyBpbmxpbmUgdTMyIGludGVsX2d1Y19nZ3R0X29m ZnNldChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCisJCQkJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hKQog ewogCXUzMiBvZmZzZXQgPSBpOTE1X2dndHRfb2Zmc2V0KHZtYSk7CiAKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19hZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2d1Y19hZHMuYwppbmRleCBhYzYyNzUzLi43MjE1NTk0IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfYWRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZ3VjX2Fkcy5jCkBAIC0xMTMsMTcgKzExMyw2IEBAIGludCBpbnRlbF9ndWNfYWRz X2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJCWJsb2ItPnJlZ19zdGF0ZS53aGl0ZV9s aXN0W2VuZ2luZS0+Z3VjX2lkXS5jb3VudCA9IDA7CiAJfQogCi0JLyoKLQkgKiBUaGUgR3VDIHJl cXVpcmVzIGEgIkdvbGRlbiBDb250ZXh0IiB3aGVuIGl0IHJlaW5pdGlhbGlzZXMKLQkgKiBlbmdp bmVzIGFmdGVyIGEgcmVzZXQuIEhlcmUgd2UgdXNlIHRoZSBSZW5kZXIgcmluZyBkZWZhdWx0Ci0J ICogY29udGV4dCwgd2hpY2ggbXVzdCBhbHJlYWR5IGV4aXN0IGFuZCBiZSBwaW5uZWQgaW4gdGhl IEdHVFQsCi0JICogc28gaXRzIGFkZHJlc3Mgd29uJ3QgY2hhbmdlIGFmdGVyIHdlJ3ZlIHRvbGQg dGhlIEd1QyB3aGVyZQotCSAqIHRvIGZpbmQgaXQuIE5vdGUgdGhhdCB3ZSBoYXZlIHRvIHNraXAg b3VyIGhlYWRlciAoMSBwYWdlKSwKLQkgKiBiZWNhdXNlIG91ciBHdUMgc2hhcmVkIGRhdGEgaXMg dGhlcmUuCi0JICovCi0JYmxvYi0+YWRzLmdvbGRlbl9jb250ZXh0X2xyY2EgPQotCQlndWNfZ2d0 dF9vZmZzZXQoZGV2X3ByaXYtPmtlcm5lbF9jb250ZXh0LT5lbmdpbmVbUkNTXS5zdGF0ZSkgKwot CQlza2lwcGVkX29mZnNldDsKIAogCS8qCiAJICogVGhlIEd1QyBleHBlY3RzIHVzIHRvIGV4Y2x1 ZGUgdGhlIHBvcnRpb24gb2YgdGhlIGNvbnRleHQgaW1hZ2UgdGhhdApAQCAtMTM1LDExICsxMjQs MjMgQEAgaW50IGludGVsX2d1Y19hZHNfY3JlYXRlKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAkJ YmxvYi0+YWRzLmVuZ19zdGF0ZV9zaXplW2VuZ2luZS0+Z3VjX2lkXSA9CiAJCQllbmdpbmUtPmNv bnRleHRfc2l6ZSAtIHNraXBwZWRfc2l6ZTsKIAotCWJhc2UgPSBndWNfZ2d0dF9vZmZzZXQodm1h KTsKKwliYXNlID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywgdm1hKTsKIAlibG9iLT5hZHMu c2NoZWR1bGVyX3BvbGljaWVzID0gYmFzZSArIHB0cl9vZmZzZXQoYmxvYiwgcG9saWNpZXMpOwog CWJsb2ItPmFkcy5yZWdfc3RhdGVfYnVmZmVyID0gYmFzZSArIHB0cl9vZmZzZXQoYmxvYiwgcmVn X3N0YXRlX2J1ZmZlcik7CiAJYmxvYi0+YWRzLnJlZ19zdGF0ZV9hZGRyID0gYmFzZSArIHB0cl9v ZmZzZXQoYmxvYiwgcmVnX3N0YXRlKTsKIAorCS8qCisJICogVGhlIEd1QyByZXF1aXJlcyBhICJH b2xkZW4gQ29udGV4dCIgd2hlbiBpdCByZWluaXRpYWxpc2VzCisJICogZW5naW5lcyBhZnRlciBh IHJlc2V0LiBIZXJlIHdlIHVzZSB0aGUgUmVuZGVyIHJpbmcgZGVmYXVsdAorCSAqIGNvbnRleHQs IHdoaWNoIG11c3QgYWxyZWFkeSBleGlzdCBhbmQgYmUgcGlubmVkIGluIHRoZSBHR1RULAorCSAq IHNvIGl0cyBhZGRyZXNzIHdvbid0IGNoYW5nZSBhZnRlciB3ZSd2ZSB0b2xkIHRoZSBHdUMgd2hl cmUKKwkgKiB0byBmaW5kIGl0LiBOb3RlIHRoYXQgd2UgaGF2ZSB0byBza2lwIG91ciBoZWFkZXIg KDEgcGFnZSksCisJICogYmVjYXVzZSBvdXIgR3VDIHNoYXJlZCBkYXRhIGlzIHRoZXJlLgorCSAq LworCXZtYSA9IGRldl9wcml2LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW1JDU10uc3RhdGU7CisJ YmxvYi0+YWRzLmdvbGRlbl9jb250ZXh0X2xyY2EgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3Vj LCB2bWEpICsKKwkJc2tpcHBlZF9vZmZzZXQ7CisKIAlrdW5tYXAocGFnZSk7CiAKIAlyZXR1cm4g MDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19jdC5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKaW5kZXggMjRhZDU1Ny4uMGEwZDNkNSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMKQEAgLTE1Niw3ICsxNTYsOCBAQCBzdGF0 aWMgaW50IGN0Y2hfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWVyciA9IFBUUl9FUlIo YmxvYik7CiAJCWdvdG8gZXJyX3ZtYTsKIAl9Ci0JRFJNX0RFQlVHX0RSSVZFUigiQ1Q6IHZtYSBi YXNlPSUjeFxuIiwgZ3VjX2dndHRfb2Zmc2V0KGN0Y2gtPnZtYSkpOworCURSTV9ERUJVR19EUklW RVIoIkNUOiB2bWEgYmFzZT0lI3hcbiIsCisJCQkgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Y3RjaC0+dm1hKSk7CiAKIAkvKiBzdG9yZSBwb2ludGVycyB0byBkZXNjIGFuZCBjbWRzICovCiAJ Zm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoY3RjaC0+Y3Ricyk7IGkrKykgewpAQCAtMjAyLDcg KzIwMyw3IEBAIHN0YXRpYyBpbnQgY3RjaF9vcGVuKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAl9 CiAKIAkvKiB2bWEgc2hvdWxkIGJlIGFscmVhZHkgYWxsb2NhdGVkIGFuZCBtYXAnZWQgKi8KLQli YXNlID0gZ3VjX2dndHRfb2Zmc2V0KGN0Y2gtPnZtYSk7CisJYmFzZSA9IGludGVsX2d1Y19nZ3R0 X29mZnNldChndWMsIGN0Y2gtPnZtYSk7CiAKIAkvKiAocmUpaW5pdGlhbGl6ZSBkZXNjcmlwdG9y cwogCSAqIGNtZHMgYnVmZmVycyBhcmUgaW4gdGhlIHNlY29uZCBoYWxmIG9mIHRoZSBibG9iIHBh Z2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKaW5kZXggM2IwOTMyOS4uMTc4ZDMzOSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2Z3LmMKQEAgLTE2NSw3ICsxNjUsNyBAQCBzdGF0 aWMgaW50IGd1Y194ZmVyX3Vjb2RlKHN0cnVjdCBpbnRlbF9ndWMgKmd1Yywgc3RydWN0IGk5MTVf dm1hICp2bWEpCiAJSTkxNV9XUklURShETUFfQ09QWV9TSVpFLCBndWNfZnctPmhlYWRlcl9zaXpl ICsgZ3VjX2Z3LT51Y29kZV9zaXplKTsKIAogCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9y IHRoZSBuZXcgYmxvYiAqLwotCW9mZnNldCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgZ3VjX2Z3 LT5oZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZt YSkgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0xPVywg bG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBw ZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2xvZy5jCmluZGV4IGVhZWRkNjMuLmFiZTc2MWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19sb2cuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9n dWNfbG9nLmMKQEAgLTU0OSw3ICs1NDksNyBAQCBpbnQgaW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogCQkoR1VDX0xPR19JU1JfUEFHRVMgPDwgR1VDX0xPR19JU1Jf U0hJRlQpIHwKIAkJKEdVQ19MT0dfQ1JBU0hfUEFHRVMgPDwgR1VDX0xPR19DUkFTSF9TSElGVCk7 CiAKLQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZzZXQodm1hKSA+PiBQQUdFX1NISUZUOyAvKiBpbiBw YWdlcyAqLworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgPj4gUEFH RV9TSElGVDsgLyogaW4gcGFnZXMgKi8KIAlndWMtPmxvZy5mbGFncyA9IChvZmZzZXQgPDwgR1VD X0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFnczsKIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKaW5kZXggMWYzYTg3OC4uYzU2ZTRmNCAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlzc2lvbi5jCkBAIC0zNzUs OCArMzc1LDggQEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxf Z3VjICpndWMsCiAJCWxyYy0+Y29udGV4dF9kZXNjID0gbG93ZXJfMzJfYml0cyhjZS0+bHJjX2Rl c2MpOwogCiAJCS8qIFRoZSBzdGF0ZSBwYWdlIGlzIGFmdGVyIFBQSFdTUCAqLwotCQlscmMtPnJp bmdfbHJjYSA9Ci0JCQlndWNfZ2d0dF9vZmZzZXQoY2UtPnN0YXRlKSArIExSQ19TVEFURV9QTiAq IFBBR0VfU0laRTsKKwkJbHJjLT5yaW5nX2xyY2EgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3Vj LCBjZS0+c3RhdGUpICsKKwkJCQkgTFJDX1NUQVRFX1BOICogUEFHRV9TSVpFOwogCiAJCS8qIFhY WDogSW4gZGlyZWN0IHN1Ym1pc3Npb24sIHRoZSBHdUMgd2FudHMgdGhlIEhXIGNvbnRleHQgaWQK IAkJICogaGVyZS4gSW4gcHJveHkgc3VibWlzc2lvbiwgaXQgd2FudHMgdGhlIHN0YWdlIGlkCkBA IC0zODQsNyArMzg0LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3Qg aW50ZWxfZ3VjICpndWMsCiAJCWxyYy0+Y29udGV4dF9pZCA9IChjbGllbnQtPnN0YWdlX2lkIDw8 IEdVQ19FTENfQ1RYSURfT0ZGU0VUKSB8CiAJCQkJKGd1Y19lbmdpbmVfaWQgPDwgR1VDX0VMQ19F TkdJTkVfT0ZGU0VUKTsKIAotCQlscmMtPnJpbmdfYmVnaW4gPSBndWNfZ2d0dF9vZmZzZXQoY2Ut PnJpbmctPnZtYSk7CisJCWxyYy0+cmluZ19iZWdpbiA9IGludGVsX2d1Y19nZ3R0X29mZnNldChn dWMsIGNlLT5yaW5nLT52bWEpOwogCQlscmMtPnJpbmdfZW5kID0gbHJjLT5yaW5nX2JlZ2luICsg Y2UtPnJpbmctPnNpemUgLSAxOwogCQlscmMtPnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJj LT5yaW5nX2JlZ2luOwogCQlscmMtPnJpbmdfY3VycmVudF90YWlsX3BvaW50ZXJfdmFsdWUgPSAw OwpAQCAtNDAwLDcgKzQwMCw3IEBAIHN0YXRpYyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3Ry dWN0IGludGVsX2d1YyAqZ3VjLAogCSAqIFRoZSBkb29yYmVsbCwgcHJvY2VzcyBkZXNjcmlwdG9y LCBhbmQgd29ya3F1ZXVlIGFyZSBhbGwgcGFydHMKIAkgKiBvZiB0aGUgY2xpZW50IG9iamVjdCwg d2hpY2ggdGhlIEd1QyB3aWxsIHJlZmVyZW5jZSB2aWEgdGhlIEdHVFQKIAkgKi8KLQlnZnhfYWRk ciA9IGd1Y19nZ3R0X29mZnNldChjbGllbnQtPnZtYSk7CisJZ2Z4X2FkZHIgPSBpbnRlbF9ndWNf Z2d0dF9vZmZzZXQoZ3VjLCBjbGllbnQtPnZtYSk7CiAJZGVzYy0+ZGJfdHJpZ2dlcl9waHkgPSBz Z19kbWFfYWRkcmVzcyhjbGllbnQtPnZtYS0+cGFnZXMtPnNnbCkgKwogCQkJCWNsaWVudC0+ZG9v cmJlbGxfb2Zmc2V0OwogCWRlc2MtPmRiX3RyaWdnZXJfY3B1ID0gcHRyX3RvX3U2NChfX2dldF9k b29yYmVsbChjbGllbnQpKTsKQEAgLTU5Niw3ICs1OTYsNyBAQCBzdGF0aWMgdm9pZCBpbmplY3Rf cHJlZW1wdF9jb250ZXh0KHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKIAlkYXRhWzNdID0gZW5n aW5lLT5ndWNfaWQ7CiAJZGF0YVs0XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnByaW9yaXR5Owog CWRhdGFbNV0gPSBndWMtPmV4ZWNidWZfY2xpZW50LT5zdGFnZV9pZDsKLQlkYXRhWzZdID0gZ3Vj X2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRhdGFbNl0gPSBpbnRlbF9ndWNfZ2d0 dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAogCWlmIChXQVJOX09OKGludGVsX2d1 Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSkpKSB7CiAJCWV4ZWNsaXN0c19jbGVh cl9hY3RpdmUoJmVuZ2luZS0+ZXhlY2xpc3RzLApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRl eCA4ZWQwNTE4Li5hZWQ5YzFjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9odWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpAQCAtMTM3LDcg KzEzNyw4IEBAIHN0YXRpYyBpbnQgaHVjX3Vjb2RlX3hmZXIoc3RydWN0IGludGVsX3VjX2Z3ICpo dWNfZncsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0 KGRldl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAogCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3Mg Zm9yIHRoZSB1Q29kZSAqLwotCW9mZnNldCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgaHVjX2Z3 LT5oZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldCgmZGV2X3By aXYtPmd1Yywgdm1hKSArCisJCSBodWNfZnctPmhlYWRlcl9vZmZzZXQ7CiAJSTkxNV9XUklURShE TUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9B RERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApAQCAtMjEzLDcg KzIxNCw4IEBAIGludCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJfQog CiAJcmV0ID0gaW50ZWxfZ3VjX2F1dGhfaHVjKGd1YywKLQkJCQkgZ3VjX2dndHRfb2Zmc2V0KHZt YSkgKyBodWMtPmZ3LnJzYV9vZmZzZXQpOworCQkJCSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3Vj LCB2bWEpICsKKwkJCQkgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsKIAlpZiAocmV0KSB7CiAJCURSTV9F UlJPUigiSHVDOiBHdUMgZGlkIG5vdCBhY2sgQXV0aCByZXF1ZXN0ICVkXG4iLCByZXQpOwogCQln b3RvIG91dDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK