From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jackie Li Subject: [PATCH v4 2/5] drm/i915/guc: Rename guc_ggtt_offset to intel_guc_ggtt_offset Date: Tue, 12 Dec 2017 14:56:31 -0800 Message-ID: <1513119394-28951-2-git-send-email-yaodong.li@intel.com> References: <1513119394-28951-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 40BDF89904 for ; Tue, 12 Dec 2017 22:57:51 +0000 (UTC) In-Reply-To: <1513119394-28951-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 dWNfY3QuYyAgICAgICAgIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19mdy5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xv Zy5jICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfc3VibWlz c2lvbi5jIHwgMjAgKysrKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2h1Yy5jICAgICAgICAgICAgfCAgNiArKysrLS0KIDcgZmlsZXMgY2hhbmdlZCwgMzQgaW5z ZXJ0aW9ucygrKSwgMjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwppbmRl eCA3NjUxOWE3Li40MWFlZTk2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwpAQCAtMTMwLDgg KzEzMCwxMCBAQCB2b2lkIGludGVsX2d1Y19pbml0X3BhcmFtcyhzdHJ1Y3QgaW50ZWxfZ3VjICpn dWMpCiAKIAkvKiBJZiBHdUMgc3VibWlzc2lvbiBpcyBlbmFibGVkLCBzZXQgdXAgYWRkaXRpb25h bCBwYXJhbWV0ZXJzIGhlcmUgKi8KIAlpZiAoVVNFU19HVUNfU1VCTUlTU0lPTihkZXZfcHJpdikp IHsKLQkJdTMyIGFkcyA9IGd1Y19nZ3R0X29mZnNldChndWMtPmFkc192bWEpID4+IFBBR0VfU0hJ RlQ7Ci0JCXUzMiBwZ3MgPSBndWNfZ2d0dF9vZmZzZXQoZGV2X3ByaXYtPmd1Yy5zdGFnZV9kZXNj X3Bvb2wpOworCQl1MzIgYWRzID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywKKwkJCQkJCWd1 Yy0+YWRzX3ZtYSkgPj4gUEFHRV9TSElGVDsKKwkJdTMyIHBncyA9IGludGVsX2d1Y19nZ3R0X29m ZnNldChndWMsCisJCQkJCQlkZXZfcHJpdi0+Z3VjLnN0YWdlX2Rlc2NfcG9vbCk7CiAJCXUzMiBj dHhfaW5fMTYgPSBHVUNfTUFYX1NUQUdFX0RFU0NSSVBUT1JTIC8gMTY7CiAKIAkJcGFyYW1zW0dV Q19DVExfREVCVUddIHw9IGFkcyA8PCBHVUNfQURTX0FERFJfU0hJRlQ7CkBAIC0yNzksNyArMjgx LDcgQEAgaW50IGludGVsX2d1Y19zdXNwZW5kKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf cHJpdikKIAlkYXRhWzBdID0gSU5URUxfR1VDX0FDVElPTl9FTlRFUl9TX1NUQVRFOwogCS8qIGFu eSB2YWx1ZSBncmVhdGVyIHRoYW4gR1VDX1BPV0VSX0QwICovCiAJZGF0YVsxXSA9IEdVQ19QT1dF Ul9EMTsKLQlkYXRhWzJdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRh dGFbMl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAog CXJldHVybiBpbnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogfQpA QCAtMzAyLDcgKzMwNCw3IEBAIGludCBpbnRlbF9ndWNfcmVzZXRfZW5naW5lKHN0cnVjdCBpbnRl bF9ndWMgKmd1YywKIAlkYXRhWzNdID0gMDsKIAlkYXRhWzRdID0gMDsKIAlkYXRhWzVdID0gZ3Vj LT5leGVjYnVmX2NsaWVudC0+c3RhZ2VfaWQ7Ci0JZGF0YVs2XSA9IGd1Y19nZ3R0X29mZnNldChn dWMtPnNoYXJlZF9kYXRhKTsKKwlkYXRhWzZdID0gaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1Yywg Z3VjLT5zaGFyZWRfZGF0YSk7CiAKIAlyZXR1cm4gaW50ZWxfZ3VjX3NlbmQoZ3VjLCBkYXRhLCBB UlJBWV9TSVpFKGRhdGEpKTsKIH0KQEAgLTMyNCw3ICszMjYsNyBAQCBpbnQgaW50ZWxfZ3VjX3Jl c3VtZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIAlkYXRhWzBdID0gSU5U RUxfR1VDX0FDVElPTl9FWElUX1NfU1RBVEU7CiAJZGF0YVsxXSA9IEdVQ19QT1dFUl9EMDsKLQlk YXRhWzJdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2RhdGEpOworCWRhdGFbMl0gPSBp bnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9kYXRhKTsKIAogCXJldHVybiBp bnRlbF9ndWNfc2VuZChndWMsIGRhdGEsIEFSUkFZX1NJWkUoZGF0YSkpOwogfQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9ndWMuaAppbmRleCBiZmRjODg3Li4zOTk2MTJkIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9ndWMuaApAQCAtMTAxLDEzICsxMDEsMTkgQEAgc3RhdGljIGlubGluZSB2b2lkIGludGVsX2d1 Y19ub3RpZnkoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCWd1Yy0+bm90aWZ5KGd1Yyk7CiB9CiAK LS8qCisvKiBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoKSAtIEdldCB0aGUgR0dUVCBvZmZzZXQgb2Yg QHZtYS4KKyAqIEBndWM6IGludGVsIGd1Yy4KKyAqIEB2bWE6IGk5MTUgZ3JhcGhpY3MgdmlydHVh bCBtZW1vcnkgYXJlYS4KKyAqCiAgKiBHdUMgZG9lcyBub3QgYWxsb3cgYW55IGdmeCBHR1RUIGFk ZHJlc3MgdGhhdCBmYWxscyBpbnRvIHJhbmdlIFswLCBXT1BDTV9UT1ApLAogICogd2hpY2ggaXMg cmVzZXJ2ZWQgZm9yIEJvb3QgUk9NLCBTUkFNIGFuZCBXT1BDTS4gQ3VycmVudGx5IHRoaXMgdG9w IGFkZHJlc3MgaXMKICAqIDUxMksuIEluIG9yZGVyIHRvIGV4Y2x1ZGUgMC01MTJLIGFkZHJlc3Mg c3BhY2UgZnJvbSBHR1RULCBhbGwgZ2Z4IG9iamVjdHMKICAqIHVzZWQgYnkgR3VDIGlzIHBpbm5l ZCB3aXRoIFBJTl9PRkZTRVRfQklBUyBhbG9uZyB3aXRoIHNpemUgb2YgV09QQ00uCisgKgorICog UmV0dXJuOiBHR1RUIG9mZnNldCB0aGF0IG1lZXRzIHRoZSBHdUMgZ2Z4IGFkZHJlc3MgcmVxdWly ZW1lbnQuCiAgKi8KLXN0YXRpYyBpbmxpbmUgdTMyIGd1Y19nZ3R0X29mZnNldChzdHJ1Y3QgaTkx NV92bWEgKnZtYSkKK3N0YXRpYyBpbmxpbmUgdTMyIGludGVsX2d1Y19nZ3R0X29mZnNldChzdHJ1 Y3QgaW50ZWxfZ3VjICpndWMsCisJCQkJCXN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogewogCXUzMiBv ZmZzZXQgPSBpOTE1X2dndHRfb2Zmc2V0KHZtYSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19jdC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2N0LmMKaW5kZXggMjRhZDU1Ny4uMGEwZDNkNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2N0LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2N0LmMKQEAgLTE1Niw3ICsxNTYsOCBAQCBzdGF0aWMgaW50IGN0Y2hfaW5pdChzdHJ1Y3QgaW50 ZWxfZ3VjICpndWMsCiAJCWVyciA9IFBUUl9FUlIoYmxvYik7CiAJCWdvdG8gZXJyX3ZtYTsKIAl9 Ci0JRFJNX0RFQlVHX0RSSVZFUigiQ1Q6IHZtYSBiYXNlPSUjeFxuIiwgZ3VjX2dndHRfb2Zmc2V0 KGN0Y2gtPnZtYSkpOworCURSTV9ERUJVR19EUklWRVIoIkNUOiB2bWEgYmFzZT0lI3hcbiIsCisJ CQkgaW50ZWxfZ3VjX2dndHRfb2Zmc2V0KGd1YywgY3RjaC0+dm1hKSk7CiAKIAkvKiBzdG9yZSBw b2ludGVycyB0byBkZXNjIGFuZCBjbWRzICovCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUo Y3RjaC0+Y3Ricyk7IGkrKykgewpAQCAtMjAyLDcgKzIwMyw3IEBAIHN0YXRpYyBpbnQgY3RjaF9v cGVuKHN0cnVjdCBpbnRlbF9ndWMgKmd1YywKIAl9CiAKIAkvKiB2bWEgc2hvdWxkIGJlIGFscmVh ZHkgYWxsb2NhdGVkIGFuZCBtYXAnZWQgKi8KLQliYXNlID0gZ3VjX2dndHRfb2Zmc2V0KGN0Y2gt PnZtYSk7CisJYmFzZSA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGN0Y2gtPnZtYSk7CiAK IAkvKiAocmUpaW5pdGlhbGl6ZSBkZXNjcmlwdG9ycwogCSAqIGNtZHMgYnVmZmVycyBhcmUgaW4g dGhlIHNlY29uZCBoYWxmIG9mIHRoZSBibG9iIHBhZ2UKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2d1Y19mdy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2Z3LmMKaW5kZXggY2JjNTFjOS4uMjM2OWZmNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX2Z3LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3Vj X2Z3LmMKQEAgLTE3NCw3ICsxNzQsNyBAQCBzdGF0aWMgaW50IGd1Y194ZmVyX3Vjb2RlKHN0cnVj dCBpbnRlbF9ndWMgKmd1Yywgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJSTkxNV9XUklURShETUFf Q09QWV9TSVpFLCBndWNfZnctPmhlYWRlcl9zaXplICsgZ3VjX2Z3LT51Y29kZV9zaXplKTsKIAog CS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9yIHRoZSBuZXcgYmxvYiAqLwotCW9mZnNldCA9 IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgZ3VjX2Z3LT5oZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9 IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIHZtYSkgKyBndWNfZnctPmhlYWRlcl9vZmZzZXQ7 CiAJSTkxNV9XUklURShETUFfQUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJ OTE1X1dSSVRFKERNQV9BRERSXzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZG KTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvZy5jCmluZGV4IDFhMmM1ZWUuLjQxYzI1 MjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19sb2cuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9nLmMKQEAgLTU3Miw3ICs1NzIsNyBA QCBpbnQgaW50ZWxfZ3VjX2xvZ19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQogCQkoR1VD X0xPR19JU1JfUEFHRVMgPDwgR1VDX0xPR19JU1JfU0hJRlQpIHwKIAkJKEdVQ19MT0dfQ1JBU0hf UEFHRVMgPDwgR1VDX0xPR19DUkFTSF9TSElGVCk7CiAKLQlvZmZzZXQgPSBndWNfZ2d0dF9vZmZz ZXQodm1hKSA+PiBQQUdFX1NISUZUOyAvKiBpbiBwYWdlcyAqLworCW9mZnNldCA9IGludGVsX2d1 Y19nZ3R0X29mZnNldChndWMsIHZtYSkgPj4gUEFHRV9TSElGVDsgLyogaW4gcGFnZXMgKi8KIAln dWMtPmxvZy5mbGFncyA9IChvZmZzZXQgPDwgR1VDX0xPR19CVUZfQUREUl9TSElGVCkgfCBmbGFn czsKIAogCXJldHVybiAwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Z3VjX3N1Ym1pc3Npb24uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Y19zdWJtaXNz aW9uLmMKaW5kZXggOTEyZmYxNC4uOGJkYmU0OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZ3VjX3N1Ym1pc3Npb24uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9ndWNfc3VibWlzc2lvbi5jCkBAIC00MDEsOCArNDAxLDggQEAgc3RhdGljIHZvaWQgZ3Vj X3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWxyYy0+Y29udGV4dF9k ZXNjID0gbG93ZXJfMzJfYml0cyhjZS0+bHJjX2Rlc2MpOwogCiAJCS8qIFRoZSBzdGF0ZSBwYWdl IGlzIGFmdGVyIFBQSFdTUCAqLwotCQlscmMtPnJpbmdfbHJjYSA9Ci0JCQlndWNfZ2d0dF9vZmZz ZXQoY2UtPnN0YXRlKSArIExSQ19TVEFURV9QTiAqIFBBR0VfU0laRTsKKwkJbHJjLT5yaW5nX2xy Y2EgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjZS0+c3RhdGUpICsKKwkJCQkgTFJDX1NU QVRFX1BOICogUEFHRV9TSVpFOwogCiAJCS8qIFhYWDogSW4gZGlyZWN0IHN1Ym1pc3Npb24sIHRo ZSBHdUMgd2FudHMgdGhlIEhXIGNvbnRleHQgaWQKIAkJICogaGVyZS4gSW4gcHJveHkgc3VibWlz c2lvbiwgaXQgd2FudHMgdGhlIHN0YWdlIGlkCkBAIC00MTAsNyArNDEwLDcgQEAgc3RhdGljIHZv aWQgZ3VjX3N0YWdlX2Rlc2NfaW5pdChzdHJ1Y3QgaW50ZWxfZ3VjICpndWMsCiAJCWxyYy0+Y29u dGV4dF9pZCA9IChjbGllbnQtPnN0YWdlX2lkIDw8IEdVQ19FTENfQ1RYSURfT0ZGU0VUKSB8CiAJ CQkJKGd1Y19lbmdpbmVfaWQgPDwgR1VDX0VMQ19FTkdJTkVfT0ZGU0VUKTsKIAotCQlscmMtPnJp bmdfYmVnaW4gPSBndWNfZ2d0dF9vZmZzZXQoY2UtPnJpbmctPnZtYSk7CisJCWxyYy0+cmluZ19i ZWdpbiA9IGludGVsX2d1Y19nZ3R0X29mZnNldChndWMsIGNlLT5yaW5nLT52bWEpOwogCQlscmMt PnJpbmdfZW5kID0gbHJjLT5yaW5nX2JlZ2luICsgY2UtPnJpbmctPnNpemUgLSAxOwogCQlscmMt PnJpbmdfbmV4dF9mcmVlX2xvY2F0aW9uID0gbHJjLT5yaW5nX2JlZ2luOwogCQlscmMtPnJpbmdf Y3VycmVudF90YWlsX3BvaW50ZXJfdmFsdWUgPSAwOwpAQCAtNDI2LDcgKzQyNiw3IEBAIHN0YXRp YyB2b2lkIGd1Y19zdGFnZV9kZXNjX2luaXQoc3RydWN0IGludGVsX2d1YyAqZ3VjLAogCSAqIFRo ZSBkb29yYmVsbCwgcHJvY2VzcyBkZXNjcmlwdG9yLCBhbmQgd29ya3F1ZXVlIGFyZSBhbGwgcGFy dHMKIAkgKiBvZiB0aGUgY2xpZW50IG9iamVjdCwgd2hpY2ggdGhlIEd1QyB3aWxsIHJlZmVyZW5j ZSB2aWEgdGhlIEdHVFQKIAkgKi8KLQlnZnhfYWRkciA9IGd1Y19nZ3R0X29mZnNldChjbGllbnQt PnZtYSk7CisJZ2Z4X2FkZHIgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBjbGllbnQtPnZt YSk7CiAJZGVzYy0+ZGJfdHJpZ2dlcl9waHkgPSBzZ19kbWFfYWRkcmVzcyhjbGllbnQtPnZtYS0+ cGFnZXMtPnNnbCkgKwogCQkJCWNsaWVudC0+ZG9vcmJlbGxfb2Zmc2V0OwogCWRlc2MtPmRiX3Ry aWdnZXJfY3B1ID0gcHRyX3RvX3U2NChfX2dldF9kb29yYmVsbChjbGllbnQpKTsKQEAgLTY0OSw3 ICs2NDksNyBAQCBzdGF0aWMgdm9pZCBpbmplY3RfcHJlZW1wdF9jb250ZXh0KHN0cnVjdCB3b3Jr X3N0cnVjdCAqd29yaykKIAlkYXRhWzNdID0gZW5naW5lLT5ndWNfaWQ7CiAJZGF0YVs0XSA9IGd1 Yy0+ZXhlY2J1Zl9jbGllbnQtPnByaW9yaXR5OwogCWRhdGFbNV0gPSBndWMtPmV4ZWNidWZfY2xp ZW50LT5zdGFnZV9pZDsKLQlkYXRhWzZdID0gZ3VjX2dndHRfb2Zmc2V0KGd1Yy0+c2hhcmVkX2Rh dGEpOworCWRhdGFbNl0gPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCBndWMtPnNoYXJlZF9k YXRhKTsKIAogCWlmIChXQVJOX09OKGludGVsX2d1Y19zZW5kKGd1YywgZGF0YSwgQVJSQVlfU0la RShkYXRhKSkpKSB7CiAJCWV4ZWNsaXN0c19jbGVhcl9hY3RpdmUoJmVuZ2luZS0+ZXhlY2xpc3Rz LApAQCAtMTEzOSw3ICsxMTM5LDcgQEAgc3RhdGljIHZvaWQgZ3VjX3BvbGljaWVzX2luaXQoc3Ry dWN0IGd1Y19wb2xpY2llcyAqcG9saWNpZXMpCiBzdGF0aWMgaW50IGd1Y19hZHNfY3JlYXRlKHN0 cnVjdCBpbnRlbF9ndWMgKmd1YykKIHsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3By aXYgPSBndWNfdG9faTkxNShndWMpOwotCXN0cnVjdCBpOTE1X3ZtYSAqdm1hOworCXN0cnVjdCBp OTE1X3ZtYSAqdm1hLCAqcmNzX3N0YXRlOwogCXN0cnVjdCBwYWdlICpwYWdlOwogCS8qIFRoZSBh ZHMgb2JqIGluY2x1ZGVzIHRoZSBzdHJ1Y3QgaXRzZWxmIGFuZCBidWZmZXJzIHBhc3NlZCB0byBH dUMgKi8KIAlzdHJ1Y3QgewpAQCAtMTE4NSw5ICsxMTg1LDkgQEAgc3RhdGljIGludCBndWNfYWRz X2NyZWF0ZShzdHJ1Y3QgaW50ZWxfZ3VjICpndWMpCiAJICogdG8gZmluZCBpdC4gTm90ZSB0aGF0 IHdlIGhhdmUgdG8gc2tpcCBvdXIgaGVhZGVyICgxIHBhZ2UpLAogCSAqIGJlY2F1c2Ugb3VyIEd1 QyBzaGFyZWQgZGF0YSBpcyB0aGVyZS4KIAkgKi8KLQlibG9iLT5hZHMuZ29sZGVuX2NvbnRleHRf bHJjYSA9Ci0JCWd1Y19nZ3R0X29mZnNldChkZXZfcHJpdi0+a2VybmVsX2NvbnRleHQtPmVuZ2lu ZVtSQ1NdLnN0YXRlKSArCi0JCXNraXBwZWRfb2Zmc2V0OworCXJjc19zdGF0ZSA9IGRldl9wcml2 LT5rZXJuZWxfY29udGV4dC0+ZW5naW5lW1JDU10uc3RhdGU7CisJYmxvYi0+YWRzLmdvbGRlbl9j b250ZXh0X2xyY2EgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCByY3Nfc3RhdGUpICsKKwkJ CQkJc2tpcHBlZF9vZmZzZXQ7CiAKIAkvKgogCSAqIFRoZSBHdUMgZXhwZWN0cyB1cyB0byBleGNs dWRlIHRoZSBwb3J0aW9uIG9mIHRoZSBjb250ZXh0IGltYWdlIHRoYXQKQEAgLTExOTksNyArMTE5 OSw3IEBAIHN0YXRpYyBpbnQgZ3VjX2Fkc19jcmVhdGUoc3RydWN0IGludGVsX2d1YyAqZ3VjKQog CQlibG9iLT5hZHMuZW5nX3N0YXRlX3NpemVbZW5naW5lLT5ndWNfaWRdID0KIAkJCWVuZ2luZS0+ Y29udGV4dF9zaXplIC0gc2tpcHBlZF9zaXplOwogCi0JYmFzZSA9IGd1Y19nZ3R0X29mZnNldCh2 bWEpOworCWJhc2UgPSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2bWEpOwogCWJsb2ItPmFk cy5zY2hlZHVsZXJfcG9saWNpZXMgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCBwb2xpY2llcyk7 CiAJYmxvYi0+YWRzLnJlZ19zdGF0ZV9idWZmZXIgPSBiYXNlICsgcHRyX29mZnNldChibG9iLCBy ZWdfc3RhdGVfYnVmZmVyKTsKIAlibG9iLT5hZHMucmVnX3N0YXRlX2FkZHIgPSBiYXNlICsgcHRy X29mZnNldChibG9iLCByZWdfc3RhdGUpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfaHVjLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwppbmRleCA5 NzRiZTNkLi42NDgyMTc0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9o dWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9odWMuYwpAQCAtMTQ4LDcgKzE0 OCw4IEBAIHN0YXRpYyBpbnQgaHVjX3Vjb2RlX3hmZXIoc3RydWN0IGludGVsX3VjX2Z3ICpodWNf ZncsIHN0cnVjdCBpOTE1X3ZtYSAqdm1hKQogCWludGVsX3VuY29yZV9mb3JjZXdha2VfZ2V0KGRl dl9wcml2LCBGT1JDRVdBS0VfQUxMKTsKIAogCS8qIFNldCB0aGUgc291cmNlIGFkZHJlc3MgZm9y IHRoZSB1Q29kZSAqLwotCW9mZnNldCA9IGd1Y19nZ3R0X29mZnNldCh2bWEpICsgaHVjX2Z3LT5o ZWFkZXJfb2Zmc2V0OworCW9mZnNldCA9IGludGVsX2d1Y19nZ3R0X29mZnNldCgmZGV2X3ByaXYt Pmd1Yywgdm1hKSArCisJCSBodWNfZnctPmhlYWRlcl9vZmZzZXQ7CiAJSTkxNV9XUklURShETUFf QUREUl8wX0xPVywgbG93ZXJfMzJfYml0cyhvZmZzZXQpKTsKIAlJOTE1X1dSSVRFKERNQV9BRERS XzBfSElHSCwgdXBwZXJfMzJfYml0cyhvZmZzZXQpICYgMHhGRkZGKTsKIApAQCAtMjI0LDcgKzIy NSw4IEBAIGludCBpbnRlbF9odWNfYXV0aChzdHJ1Y3QgaW50ZWxfaHVjICpodWMpCiAJfQogCiAJ cmV0ID0gaW50ZWxfZ3VjX2F1dGhfaHVjKGd1YywKLQkJCQkgZ3VjX2dndHRfb2Zmc2V0KHZtYSkg KyBodWMtPmZ3LnJzYV9vZmZzZXQpOworCQkJCSBpbnRlbF9ndWNfZ2d0dF9vZmZzZXQoZ3VjLCB2 bWEpICsKKwkJCQkgaHVjLT5mdy5yc2Ffb2Zmc2V0KTsKIAlpZiAocmV0KSB7CiAJCURSTV9FUlJP UigiSHVDOiBHdUMgZGlkIG5vdCBhY2sgQXV0aCByZXF1ZXN0ICVkXG4iLCByZXQpOwogCQlnb3Rv IG91dDsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK