From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jackie Li Subject: [PATCH v3 2/5] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Fri, 8 Dec 2017 13:41:49 -0800 Message-ID: <1512769312-21993-2-git-send-email-yaodong.li@intel.com> References: <1512769312-21993-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 mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB6DD6E97D for ; Fri, 8 Dec 2017 21:43:17 +0000 (UTC) In-Reply-To: <1512769312-21993-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 QXJ1biBLYW1ibGUgPHNhZ2FyLmEua2FtYmxlQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmFj a2llIExpIDx5YW9kb25nLmxpQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWMuYyAgICAgICAgICAgIHwgMTIgKysrKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9ndWMuaCAgICAgICAgICAgIHwgMTAgKysrKysrKystLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZ3VjX2N0LmMgICAgICAgICB8ICA1ICsrKy0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9ndWNfZncuYyAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2d1Y19sb2cuYyAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjX3N1Ym1pc3Npb24uYyB8IDIwICsrKysrKysrKystLS0tLS0tLS0tCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYyAgICAgICAgICAgIHwgIDYgKysrKy0tCiA3IGZpbGVz IGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZ3VjLmMKaW5kZXggNzY1MTlhNy4uNDFhZWU5NiAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjLmMKQEAgLTEzMCw4ICsxMzAsMTAgQEAgdm9pZCBpbnRlbF9ndWNfaW5pdF9wYXJhbXMoc3Ry dWN0IGludGVsX2d1YyAqZ3VjKQogCiAJLyogSWYgR3VDIHN1Ym1pc3Npb24gaXMgZW5hYmxlZCwg c2V0IHVwIGFkZGl0aW9uYWwgcGFyYW1ldGVycyBoZXJlICovCiAJaWYgKFVTRVNfR1VDX1NVQk1J U1NJT04oZGV2X3ByaXYpKSB7Ci0JCXUzMiBhZHMgPSBndWNfZ2d0dF9vZmZzZXQoZ3VjLT5hZHNf dm1hKSA+PiBQQUdFX1NISUZUOwotCQl1MzIgcGdzID0gZ3VjX2dndHRfb2Zmc2V0KGRldl9wcml2 LT5ndWMuc3RhZ2VfZGVzY19wb29sKTsKKwkJdTMyIGFkcyA9IGludGVsX2d1Y19nZ3R0X29mZnNl dChndWMsCisJCQkJCQlndWMtPmFkc192bWEpID4+IFBBR0VfU0hJRlQ7CisJCXUzMiBwZ3MgPSBp bnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLAorCQkJCQkJZGV2X3ByaXYtPmd1Yy5zdGFnZV9kZXNj X3Bvb2wpOwogCQl1MzIgY3R4X2luXzE2ID0gR1VDX01BWF9TVEFHRV9ERVNDUklQVE9SUyAvIDE2 OwogCiAJCXBhcmFtc1tHVUNfQ1RMX0RFQlVHXSB8PSBhZHMgPDwgR1VDX0FEU19BRERSX1NISUZU OwpAQCAtMjc5LDcgKzI4MSw3IEBAIGludCBpbnRlbF9ndWNfc3VzcGVuZChzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRU5URVJf U19TVEFURTsKIAkvKiBhbnkgdmFsdWUgZ3JlYXRlciB0aGFuIEdVQ19QT1dFUl9EMCAqLwogCWRh dGFbMV0gPSBHVUNfUE9XRVJfRDE7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChndWMtPnNo YXJlZF9kYXRhKTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5z aGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9T SVpFKGRhdGEpKTsKIH0KQEAgLTMwMiw3ICszMDQsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jlc2V0X2Vu Z2luZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJZGF0YVszXSA9IDA7CiAJZGF0YVs0XSA9IDA7 CiAJZGF0YVs1XSA9IGd1Yy0+ZXhlY2J1Zl9jbGllbnQtPnN0YWdlX2lkOwotCWRhdGFbNl0gPSBn dWNfZ2d0dF9vZmZzZXQoZ3VjLT5zaGFyZWRfZGF0YSk7CisJZGF0YVs2XSA9IGludGVsX2d1Y19n Z3R0X29mZnNldChndWMsIGd1Yy0+c2hhcmVkX2RhdGEpOwogCiAJcmV0dXJuIGludGVsX2d1Y19z ZW5kKGd1YywgZGF0YSwgQVJSQVlfU0laRShkYXRhKSk7CiB9CkBAIC0zMjQsNyArMzI2LDcgQEAg aW50IGludGVsX2d1Y19yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog CiAJZGF0YVswXSA9IElOVEVMX0dVQ19BQ1RJT05fRVhJVF9TX1NUQVRFOwogCWRhdGFbMV0gPSBH VUNfUE9XRVJfRDA7Ci0JZGF0YVsyXSA9IGd1Y19nZ3R0X29mZnNldChndWMtPnNoYXJlZF9kYXRh KTsKKwlkYXRhWzJdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgZ3VjLT5zaGFyZWRfZGF0 YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBBUlJBWV9TSVpFKGRhdGEp KTsKIH0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKaW5kZXggYmZkYzg4Ny4uMzk5NjEyZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmgKQEAgLTEwMSwxMyArMTAxLDE5IEBAIHN0YXRpYyBpbmxp bmUgdm9pZCBpbnRlbF9ndWNfbm90aWZ5KHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKIAlndWMtPm5v dGlmeShndWMpOwogfQogCi0vKgorLyogaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KCkgLSBHZXQgdGhl IEdHVFQgb2Zmc2V0IG9mIEB2bWEuCisgKiBAZ3VjOiBpbnRlbCBndWMuCisgKiBAdm1hOiBpOTE1 IGdyYXBoaWNzIHZpcnR1YWwgbWVtb3J5IGFyZWEuCisgKgogICogR3VDIGRvZXMgbm90IGFsbG93 IGFueSBnZnggR0dUVCBhZGRyZXNzIHRoYXQgZmFsbHMgaW50byByYW5nZSBbMCwgV09QQ01fVE9Q KSwKICAqIHdoaWNoIGlzIHJlc2VydmVkIGZvciBCb290IFJPTSwgU1JBTSBhbmQgV09QQ00uIEN1 cnJlbnRseSB0aGlzIHRvcCBhZGRyZXNzIGlzCiAgKiA1MTJLLiBJbiBvcmRlciB0byBleGNsdWRl IDAtNTEySyBhZGRyZXNzIHNwYWNlIGZyb20gR0dUVCwgYWxsIGdmeCBvYmplY3RzCiAgKiB1c2Vk IGJ5IEd1QyBpcyBwaW5uZWQgd2l0aCBQSU5fT0ZGU0VUX0JJQVMgYWxvbmcgd2l0aCBzaXplIG9m IFdPUENNLgorICoKKyAqIFJldHVybjogR0dUVCBvZmZzZXQgdGhhdCBtZWV0cyB0aGUgR3VDIGdm eCBhZGRyZXNzIHJlcXVpcmVtZW50LgogICovCi1zdGF0aWMgaW5saW5lIHUzMiBndWNfZ2d0dF9v ZmZzZXQoc3RydWN0IGk5MTVfdm1hICp2bWEpCitzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9ndWNf Z2d0dF9vZmZzZXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAorCQkJCQlzdHJ1Y3QgaTkxNV92bWEg KnZtYSkKIHsKIAl1MzIgb2Zmc2V0ID0gaTkxNV9nZ3R0X29mZnNldCh2bWEpOwogCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfY3QuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19jdC5jCmluZGV4IDI0YWQ1NTcuLjBhMGQzZDUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19jdC5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19jdC5jCkBAIC0xNTYsNyArMTU2LDggQEAgc3RhdGljIGludCBjdGNo X2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCQllcnIgPSBQVFJfRVJSKGJsb2IpOwogCQln b3RvIGVycl92bWE7CiAJfQotCURSTV9ERUJVR19EUklWRVIoIkNUOiB2bWEgYmFzZT0lI3hcbiIs IGd1Y19nZ3R0X29mZnNldChjdGNoLT52bWEpKTsKKwlEUk1fREVCVUdfRFJJVkVSKCJDVDogdm1h IGJhc2U9JSN4XG4iLAorCQkJIGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGN0Y2gtPnZtYSkp OwogCiAJLyogc3RvcmUgcG9pbnRlcnMgdG8gZGVzYyBhbmQgY21kcyAqLwogCWZvciAoaSA9IDA7 IGkgPCBBUlJBWV9TSVpFKGN0Y2gtPmN0YnMpOyBpKyspIHsKQEAgLTIwMiw3ICsyMDMsNyBAQCBz dGF0aWMgaW50IGN0Y2hfb3BlbihzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJfQogCiAJLyogdm1h IHNob3VsZCBiZSBhbHJlYWR5IGFsbG9jYXRlZCBhbmQgbWFwJ2VkICovCi0JYmFzZSA9IGd1Y19n Z3R0X29mZnNldChjdGNoLT52bWEpOworCWJhc2UgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3Vj LCBjdGNoLT52bWEpOwogCiAJLyogKHJlKWluaXRpYWxpemUgZGVzY3JpcHRvcnMKIAkgKiBjbWRz IGJ1ZmZlcnMgYXJlIGluIHRoZSBzZWNvbmQgaGFsZiBvZiB0aGUgYmxvYiBwYWdlCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfZncuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19mdy5jCmluZGV4IGNiYzUxYzkuLjIzNjlmZjcgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jCisrKyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2d1Y19mdy5jCkBAIC0xNzQsNyArMTc0LDcgQEAgc3RhdGljIGludCBndWNf eGZlcl91Y29kZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQog CUk5MTVfV1JJVEUoRE1BX0NPUFlfU0laRSwgZ3VjX2Z3LT5oZWFkZXJfc2l6ZSArIGd1Y19mdy0+ dWNvZGVfc2l6ZSk7CiAKIAkvKiBTZXQgdGhlIHNvdXJjZSBhZGRyZXNzIGZvciB0aGUgbmV3IGJs b2IgKi8KLQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZzZXQodm1hKSArIGd1Y19mdy0+aGVhZGVyX29m ZnNldDsKKwlvZmZzZXQgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpICsgZ3VjX2Z3 LT5oZWFkZXJfb2Zmc2V0OwogCUk5MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxvd2VyXzMyX2Jp dHMob2Zmc2V0KSk7CiAJSTkxNV9XUklURShETUFfQUREUl8wX0hJR0gsIHVwcGVyXzMyX2JpdHMo b2Zmc2V0KSAmIDB4RkZGRik7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2cuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYwppbmRl eCAxYTJjNWVlLi40MWMyNTI5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWNfbG9nLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCkBA IC01NzIsNyArNTcyLDcgQEAgaW50IGludGVsX2d1Y19sb2dfY3JlYXRlKHN0cnVjdCBpbnRlbF9n dWMgKmd1YykKIAkJKEdVQ19MT0dfSVNSX1BBR0VTIDw8IEdVQ19MT0dfSVNSX1NISUZUKSB8CiAJ CShHVUNfTE9HX0NSQVNIX1BBR0VTIDw8IEdVQ19MT0dfQ1JBU0hfU0hJRlQpOwogCi0Jb2Zmc2V0 ID0gZ3VjX2dndHRfb2Zmc2V0KHZtYSkgPj4gUEFHRV9TSElGVDsgLyogaW4gcGFnZXMgKi8KKwlv ZmZzZXQgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpID4+IFBBR0VfU0hJRlQ7IC8q IGluIHBhZ2VzICovCiAJZ3VjLT5sb2cuZmxhZ3MgPSAob2Zmc2V0IDw8IEdVQ19MT0dfQlVGX0FE RFJfU0hJRlQpIHwgZmxhZ3M7CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfc3VibWlzc2lvbi5jCmluZGV4IDkxMmZmMTQuLjhiZGJlNDggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNzaW9uLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYwpAQCAtNDAxLDggKzQwMSw4IEBA IHN0YXRpYyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAog CQlscmMtPmNvbnRleHRfZGVzYyA9IGxvd2VyXzMyX2JpdHMoY2UtPmxyY19kZXNjKTsKIAogCQkv KiBUaGUgc3RhdGUgcGFnZSBpcyBhZnRlciBQUEhXU1AgKi8KLQkJbHJjLT5yaW5nX2xyY2EgPQot CQkJZ3VjX2dndHRfb2Zmc2V0KGNlLT5zdGF0ZSkgKyBMUkNfU1RBVEVfUE4gKiBQQUdFX1NJWkU7 CisJCWxyYy0+cmluZ19scmNhID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY2UtPnN0YXRl KSArCisJCQkJIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKIAogCQkvKiBYWFg6IEluIGRpcmVj dCBzdWJtaXNzaW9uLCB0aGUgR3VDIHdhbnRzIHRoZSBIVyBjb250ZXh0IGlkCiAJCSAqIGhlcmUu IEluIHByb3h5IHN1Ym1pc3Npb24sIGl0IHdhbnRzIHRoZSBzdGFnZSBpZApAQCAtNDEwLDcgKzQx MCw3IEBAIHN0YXRpYyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAq Z3VjLAogCQlscmMtPmNvbnRleHRfaWQgPSAoY2xpZW50LT5zdGFnZV9pZCA8PCBHVUNfRUxDX0NU WElEX09GRlNFVCkgfAogCQkJCShndWNfZW5naW5lX2lkIDw8IEdVQ19FTENfRU5HSU5FX09GRlNF VCk7CiAKLQkJbHJjLT5yaW5nX2JlZ2luID0gZ3VjX2dndHRfb2Zmc2V0KGNlLT5yaW5nLT52bWEp OworCQlscmMtPnJpbmdfYmVnaW4gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+cmlu Zy0+dm1hKTsKIAkJbHJjLT5yaW5nX2VuZCA9IGxyYy0+cmluZ19iZWdpbiArIGNlLT5yaW5nLT5z aXplIC0gMTsKIAkJbHJjLT5yaW5nX25leHRfZnJlZV9sb2NhdGlvbiA9IGxyYy0+cmluZ19iZWdp bjsKIAkJbHJjLT5yaW5nX2N1cnJlbnRfdGFpbF9wb2ludGVyX3ZhbHVlID0gMDsKQEAgLTQyNiw3 ICs0MjYsNyBAQCBzdGF0aWMgdm9pZCBndWNfc3RhZ2VfZGVzY19pbml0KHN0cnVjdCBpbnRlbF9n dWMgKmd1YywKIAkgKiBUaGUgZG9vcmJlbGwsIHByb2Nlc3MgZGVzY3JpcHRvciwgYW5kIHdvcmtx dWV1ZSBhcmUgYWxsIHBhcnRzCiAJICogb2YgdGhlIGNsaWVudCBvYmplY3QsIHdoaWNoIHRoZSBH dUMgd2lsbCByZWZlcmVuY2UgdmlhIHRoZSBHR1RUCiAJICovCi0JZ2Z4X2FkZHIgPSBndWNfZ2d0 dF9vZmZzZXQoY2xpZW50LT52bWEpOworCWdmeF9hZGRyID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0 KGd1YywgY2xpZW50LT52bWEpOwogCWRlc2MtPmRiX3RyaWdnZXJfcGh5ID0gc2dfZG1hX2FkZHJl c3MoY2xpZW50LT52bWEtPnBhZ2VzLT5zZ2wpICsKIAkJCQljbGllbnQtPmRvb3JiZWxsX29mZnNl dDsKIAlkZXNjLT5kYl90cmlnZ2VyX2NwdSA9IHB0cl90b191NjQoX19nZXRfZG9vcmJlbGwoY2xp ZW50KSk7CkBAIC02NDksNyArNjQ5LDcgQEAgc3RhdGljIHZvaWQgaW5qZWN0X3ByZWVtcHRfY29u dGV4dChzdHJ1Y3Qgd29ya19zdHJ1Y3QgKndvcmspCiAJZGF0YVszXSA9IGVuZ2luZS0+Z3VjX2lk OwogCWRhdGFbNF0gPSBndWMtPmV4ZWNidWZfY2xpZW50LT5wcmlvcml0eTsKIAlkYXRhWzVdID0g Z3VjLT5leGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0X29mZnNl dChndWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzZdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1 YywgZ3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlpZiAoV0FSTl9PTihpbnRlbF9ndWNfc2VuZChndWMs IGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpKSkgewogCQlleGVjbGlzdHNfY2xlYXJfYWN0aXZlKCZl bmdpbmUtPmV4ZWNsaXN0cywKQEAgLTExMzksNyArMTEzOSw3IEBAIHN0YXRpYyB2b2lkIGd1Y19w b2xpY2llc19pbml0KHN0cnVjdCBndWNfcG9saWNpZXMgKnBvbGljaWVzKQogc3RhdGljIGludCBn dWNfYWRzX2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiB7CiAJc3RydWN0IGRybV9pOTE1 X3ByaXZhdGUgKmRldl9wcml2ID0gZ3VjX3RvX2k5MTUoZ3VjKTsKLQlzdHJ1Y3QgaTkxNV92bWEg KnZtYTsKKwlzdHJ1Y3QgaTkxNV92bWEgKnZtYSwgKnJjc19zdGF0ZTsKIAlzdHJ1Y3QgcGFnZSAq cGFnZTsKIAkvKiBUaGUgYWRzIG9iaiBpbmNsdWRlcyB0aGUgc3RydWN0IGl0c2VsZiBhbmQgYnVm ZmVycyBwYXNzZWQgdG8gR3VDICovCiAJc3RydWN0IHsKQEAgLTExODUsOSArMTE4NSw5IEBAIHN0 YXRpYyBpbnQgZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCSAqIHRvIGZp bmQgaXQuIE5vdGUgdGhhdCB3ZSBoYXZlIHRvIHNraXAgb3VyIGhlYWRlciAoMSBwYWdlKSwKIAkg KiBiZWNhdXNlIG91ciBHdUMgc2hhcmVkIGRhdGEgaXMgdGhlcmUuCiAJICovCi0JYmxvYi0+YWRz LmdvbGRlbl9jb250ZXh0X2xyY2EgPQotCQlndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmtlcm5l bF9jb250ZXh0LT5lbmdpbmVbUkNTXS5zdGF0ZSkgKwotCQlza2lwcGVkX29mZnNldDsKKwlyY3Nf c3RhdGUgPSBkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2luZVtSQ1NdLnN0YXRlOworCWJs b2ItPmFkcy5nb2xkZW5fY29udGV4dF9scmNhID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg cmNzX3N0YXRlKSArCisJCQkJCXNraXBwZWRfb2Zmc2V0OwogCiAJLyoKIAkgKiBUaGUgR3VDIGV4 cGVjdHMgdXMgdG8gZXhjbHVkZSB0aGUgcG9ydGlvbiBvZiB0aGUgY29udGV4dCBpbWFnZSB0aGF0 CkBAIC0xMTk5LDcgKzExOTksNyBAQCBzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0cnVjdCBp bnRlbF9ndWMgKmd1YykKIAkJYmxvYi0+YWRzLmVuZ19zdGF0ZV9zaXplW2VuZ2luZS0+Z3VjX2lk XSA9CiAJCQllbmdpbmUtPmNvbnRleHRfc2l6ZSAtIHNraXBwZWRfc2l6ZTsKIAotCWJhc2UgPSBn dWNfZ2d0dF9vZmZzZXQodm1hKTsKKwliYXNlID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg dm1hKTsKIAlibG9iLT5hZHMuc2NoZWR1bGVyX3BvbGljaWVzID0gYmFzZSArIHB0cl9vZmZzZXQo YmxvYiwgcG9saWNpZXMpOwogCWJsb2ItPmFkcy5yZWdfc3RhdGVfYnVmZmVyID0gYmFzZSArIHB0 cl9vZmZzZXQoYmxvYiwgcmVnX3N0YXRlX2J1ZmZlcik7CiAJYmxvYi0+YWRzLnJlZ19zdGF0ZV9h ZGRyID0gYmFzZSArIHB0cl9vZmZzZXQoYmxvYiwgcmVnX3N0YXRlKTsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2h1Yy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaHVjLmMKaW5kZXggOTc0YmUzZC4uNjQ4MjE3NCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfaHVjLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaHVj LmMKQEAgLTE0OCw3ICsxNDgsOCBAQCBzdGF0aWMgaW50IGh1Y191Y29kZV94ZmVyKHN0cnVjdCBp bnRlbF91Y19mdyAqaHVjX2Z3LCBzdHJ1Y3QgaTkxNV92bWEgKnZtYSkKIAlpbnRlbF91bmNvcmVf Zm9yY2V3YWtlX2dldChkZXZfcHJpdiwgRk9SQ0VXQUtFX0FMTCk7CiAKIAkvKiBTZXQgdGhlIHNv dXJjZSBhZGRyZXNzIGZvciB0aGUgdUNvZGUgKi8KLQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZzZXQo dm1hKSArIGh1Y19mdy0+aGVhZGVyX29mZnNldDsKKwlvZmZzZXQgPSBpbnRlbF9ndWNfZ2d0dF9v ZmZzZXQoJmRldl9wcml2LT5ndWMsIHZtYSkgKworCQkgaHVjX2Z3LT5oZWFkZXJfb2Zmc2V0Owog CUk5MTVfV1JJVEUoRE1BX0FERFJfMF9MT1csIGxvd2VyXzMyX2JpdHMob2Zmc2V0KSk7CiAJSTkx NV9XUklURShETUFfQUREUl8wX0hJR0gsIHVwcGVyXzMyX2JpdHMob2Zmc2V0KSAmIDB4RkZGRik7 CiAKQEAgLTIyNCw3ICsyMjUsOCBAQCBpbnQgaW50ZWxfaHVjX2F1dGgoc3RydWN0IGludGVsX2h1 YyAqaHVjKQogCX0KIAogCXJldCA9IGludGVsX2d1Y19hdXRoX2h1YyhndWMsCi0JCQkJIGd1Y19n Z3R0X29mZnNldCh2bWEpICsgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsKKwkJCQkgaW50ZWxfZ3VjX2dn dHRfb2Zmc2V0KGd1Yywgdm1hKSArCisJCQkJIGh1Yy0+ZncucnNhX29mZnNldCk7CiAJaWYgKHJl dCkgewogCQlEUk1fRVJST1IoIkh1QzogR3VDIGRpZCBub3QgYWNrIEF1dGggcmVxdWVzdCAlZFxu IiwgcmV0KTsKIAkJZ290byBvdXQ7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==