From: Tvrtko Ursulin Subject: [PATCH 18/22] drm/i915: Make IS_G4X only take dev_priv Date: Wed, 5 Oct 2016 13:33:45 +0100 Message-ID: <1475670829-14025-19-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1475670829-14025-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A47D16E830 for ; Wed, 5 Oct 2016 12:34:18 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p138so24361579wmb.0 for ; Wed, 05 Oct 2016 05:34:18 -0700 (PDT) In-Reply-To: <1475670829-14025-1-git-send-email-tvrtko.ursulin@linux.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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDQ3 MiBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0 b2xlbi5jIHwgIDUgKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jICAg IHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMgICAgICAgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgfCA0MCArKysrKysrKysr KysrKysrKystLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j ICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgICAgICB8 ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgIHwgIDQgKyst LQogOCBmaWxlcyBjaGFuZ2VkLCAzMyBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaAppbmRleCAzOGYxZDdiODEyMWMuLjIxNjI2OTBjYTQ0ZCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAorKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5oCkBAIC0yNjUxLDcgKzI2NTEsNyBAQCBzdHJ1Y3QgZHJtX2k5 MTVfY21kX3RhYmxlIHsKICNkZWZpbmUgSVNfQlJPQURXQVRFUihkZXYpCShJTlRFTF9JTkZPKGRl diktPmlzX2Jyb2Fkd2F0ZXIpCiAjZGVmaW5lIElTX0NSRVNUTElORShkZXYpCShJTlRFTF9JTkZP KGRldiktPmlzX2NyZXN0bGluZSkKICNkZWZpbmUgSVNfR000NShkZXZfcHJpdikJKElOVEVMX0RF VklEKGRldl9wcml2KSA9PSAweDJBNDIpCi0jZGVmaW5lIElTX0c0WChkZXYpCQkoSU5URUxfSU5G TyhkZXYpLT5pc19nNHgpCisjZGVmaW5lIElTX0c0WChkZXZfcHJpdikJKGRldl9wcml2LT5pbmZv LmlzX2c0eCkKICNkZWZpbmUgSVNfUElORVZJRVdfRyhkZXZfcHJpdikJKElOVEVMX0RFVklEKGRl dl9wcml2KSA9PSAweGEwMDEpCiAjZGVmaW5lIElTX1BJTkVWSUVXX00oZGV2X3ByaXYpCShJTlRF TF9ERVZJRChkZXZfcHJpdikgPT0gMHhhMDExKQogI2RlZmluZSBJU19QSU5FVklFVyhkZXYpCShJ TlRFTF9JTkZPKGRldiktPmlzX3BpbmV2aWV3KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9z dG9sZW4uYwppbmRleCAzNTA4MTIwYjhjOTAuLmQxYjQwYmNlMDI0OSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMKQEAgLTIwNCw3ICsyMDQsOCBAQCBzdGF0aWMgdW5zaWdu ZWQgbG9uZyBpOTE1X3N0b2xlbl90b19waHlzaWNhbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CQlyZXR1cm4gMDsKIAogCS8qIG1ha2Ugc3VyZSB3ZSBkb24ndCBjbG9iYmVyIHRoZSBHVFQgaWYg aXQncyB3aXRoaW4gc3RvbGVuIG1lbW9yeSAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA8 PSA0ICYmICFJU19HMzMoZGV2KSAmJiAhSVNfRzRYKGRldikpIHsKKwlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA8PSA0ICYmICFJU19HMzMoZGV2X3ByaXYpICYmCisJICAgICFJU19HNFgoZGV2X3By aXYpKSB7CiAJCXN0cnVjdCB7CiAJCQl1MzIgc3RhcnQsIGVuZDsKIAkJfSBzdG9sZW5bMl0gPSB7 CkBAIC00MzcsNyArNDM4LDcgQEAgaW50IGk5MTVfZ2VtX2luaXRfc3RvbGVuKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJY2FzZSAzOgogCQlicmVhazsKIAljYXNlIDQ6Ci0JCWlmIChJU19HNFgo ZGV2KSkKKwkJaWYgKElTX0c0WChkZXZfcHJpdikpCiAJCQlnNHhfZ2V0X3N0b2xlbl9yZXNlcnZl ZChkZXZfcHJpdiwgJnJlc2VydmVkX2Jhc2UsCiAJCQkJCQkmcmVzZXJ2ZWRfc2l6ZSk7CiAJCWJy ZWFrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3N1c3BlbmQuYwppbmRleCBhMGFmMTcwMDYyYjEuLjc4 NzA4NTZmY2NkMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5k LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMKQEAgLTM4LDcgKzM4 LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9zYXZlX2Rpc3BsYXkoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAkJZGV2X3ByaXYtPnJlZ2ZpbGUuc2F2ZURTUEFSQiA9IEk5MTVfUkVBRChEU1BBUkIpOwog CiAJLyogc2F2ZSBGQkMgaW50ZXJ2YWwgKi8KLQlpZiAoSEFTX0ZCQyhkZXYpICYmIElOVEVMX0lO Rk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpKQorCWlmIChIQVNfRkJDKGRldl9wcml2 KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDQgJiYgIUlTX0c0WChkZXZfcHJpdikpCiAJCWRl dl9wcml2LT5yZWdmaWxlLnNhdmVGQkNfQ09OVFJPTCA9IEk5MTVfUkVBRChGQkNfQ09OVFJPTCk7 CiB9CiAKQEAgLTU0LDcgKzU0LDcgQEAgc3RhdGljIHZvaWQgaTkxNV9yZXN0b3JlX2Rpc3BsYXko c3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpbnRlbF9mYmNfZ2xvYmFsX2Rpc2FibGUoZGV2X3By aXYpOwogCiAJLyogcmVzdG9yZSBGQkMgaW50ZXJ2YWwgKi8KLQlpZiAoSEFTX0ZCQyhkZXYpICYm IElOVEVMX0lORk8oZGV2KS0+Z2VuIDw9IDQgJiYgIUlTX0c0WChkZXYpKQorCWlmIChIQVNfRkJD KGRldl9wcml2KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDQgJiYgIUlTX0c0WChkZXZfcHJp dikpCiAJCUk5MTVfV1JJVEUoRkJDX0NPTlRST0wsIGRldl9wcml2LT5yZWdmaWxlLnNhdmVGQkNf Q09OVFJPTCk7CiAKIAlpOTE1X3JlZGlzYWJsZV92Z2EoZGV2KTsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf Y3J0LmMKaW5kZXggOGQxMzQ4ZjM4ODBhLi4wMjNmZDg0ZjhmN2IgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2NydC5jCkBAIC03NDEsNyArNzQxLDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRfZ2V0X21v ZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAKIAlpMmMgPSBpbnRlbF9nbWJ1 c19nZXRfYWRhcHRlcihkZXZfcHJpdiwgZGV2X3ByaXYtPnZidC5jcnRfZGRjX3Bpbik7CiAJcmV0 ID0gaW50ZWxfY3J0X2RkY19nZXRfbW9kZXMoY29ubmVjdG9yLCBpMmMpOwotCWlmIChyZXQgfHwg IUlTX0c0WChkZXYpKQorCWlmIChyZXQgfHwgIUlTX0c0WChkZXZfcHJpdikpCiAJCWdvdG8gb3V0 OwogCiAJLyogVHJ5IHRvIHByb2JlIGRpZ2l0YWwgcG9ydCBmb3Igb3V0cHV0IGluIERWSS1JIC0+ IFZHQSBtb2RlLiAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGUxMWVk OTE4YTQ1Mi4uNWVhMDdhMWFjMTcwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CkBAIC0zMDcxLDcgKzMwNzEsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X3VwZGF0ZV9wcmltYXJ5X3Bs YW5lKHN0cnVjdCBkcm1fcGxhbmUgKnByaW1hcnksCiAJICAgIGZiLT5tb2RpZmllclswXSA9PSBJ OTE1X0ZPUk1BVF9NT0RfWF9USUxFRCkKIAkJZHNwY250ciB8PSBESVNQUExBTkVfVElMRUQ7CiAK LQlpZiAoSVNfRzRYKGRldikpCisJaWYgKElTX0c0WChkZXZfcHJpdikpCiAJCWRzcGNudHIgfD0g RElTUFBMQU5FX1RSSUNLTEVfRkVFRF9ESVNBQkxFOwogCiAJaW50ZWxfYWRkX2ZiX29mZnNldHMo JngsICZ5LCBwbGFuZV9zdGF0ZSwgMCk7CkBAIC03MjIzLDcgKzcyMjMsNyBAQCBzdGF0aWMgaW50 IGludGVsX2NydGNfY29tcHV0ZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJLyog Q2FudGlnYSsgY2Fubm90IGhhbmRsZSBtb2RlcyB3aXRoIGEgaHN5bmMgZnJvbnQgcG9yY2ggb2Yg MC4KIAkgKiBXYVBydW5lTW9kZVdpdGhJbmNvcnJlY3RIc3luY09mZnNldDpjdGcsZWxrLGlsayxz bmIsaXZiLHZsdixoc3cuCiAJICovCi0JaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA+IDQgfHwg SVNfRzRYKGRldikpICYmCisJaWYgKChJTlRFTF9HRU4oZGV2X3ByaXYpID4gNCB8fCBJU19HNFgo ZGV2X3ByaXYpKSAmJgogCQlhZGp1c3RlZF9tb2RlLT5jcnRjX2hzeW5jX3N0YXJ0ID09IGFkanVz dGVkX21vZGUtPmNydGNfaGRpc3BsYXkpCiAJCXJldHVybiAtRUlOVkFMOwogCkBAIC03NTM3LDcg Kzc1MzcsNyBAQCBzdGF0aWMgdW5zaWduZWQgaW50IGludGVsX2hwbGxfdmNvKHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJLyogRklYTUUgb3RoZXIgY2hpcHNldHM/ICovCiAJaWYgKElTX0dNNDUo ZGV2X3ByaXYpKQogCQl2Y29fdGFibGUgPSBjdGdfdmNvOwotCWVsc2UgaWYgKElTX0c0WChkZXYp KQorCWVsc2UgaWYgKElTX0c0WChkZXZfcHJpdikpCiAJCXZjb190YWJsZSA9IGVsa192Y287CiAJ ZWxzZSBpZiAoSVNfQ1JFU1RMSU5FKGRldikpCiAJCXZjb190YWJsZSA9IGNsX3ZjbzsKQEAgLTgx NzEsNyArODE3MSw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfY29tcHV0ZV9kcGxsKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCQlkcGxsIHw9ICgxIDw8IChjbG9jay0+cDEgLSAxKSkgPDwgRFBMTF9G UEEwMV9QMV9QT1NUX0RJVl9TSElGVF9QSU5FVklFVzsKIAllbHNlIHsKIAkJZHBsbCB8PSAoMSA8 PCAoY2xvY2stPnAxIC0gMSkpIDw8IERQTExfRlBBMDFfUDFfUE9TVF9ESVZfU0hJRlQ7Ci0JCWlm IChJU19HNFgoZGV2KSAmJiByZWR1Y2VkX2Nsb2NrKQorCQlpZiAoSVNfRzRYKGRldl9wcml2KSAm JiByZWR1Y2VkX2Nsb2NrKQogCQkJZHBsbCB8PSAoMSA8PCAocmVkdWNlZF9jbG9jay0+cDEgLSAx KSkgPDwgRFBMTF9GUEExX1AxX1BPU1RfRElWX1NISUZUOwogCX0KIAlzd2l0Y2ggKGNsb2NrLT5w MikgewpAQCAtODQxMyw3ICs4NDEzLDggQEAgc3RhdGljIHZvaWQgaTl4eF9zZXRfcGlwZWNvbmYo c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCiAJCXBpcGVjb25mIHw9IFBJUEVDT05GX0RP VUJMRV9XSURFOwogCiAJLyogb25seSBnNHggYW5kIGxhdGVyIGhhdmUgZmFuY3kgYnBjL2RpdGhl ciBjb250cm9scyAqLwotCWlmIChJU19HNFgoZGV2KSB8fCBJU19WQUxMRVlWSUVXKGRldikgfHwg SVNfQ0hFUlJZVklFVyhkZXYpKSB7CisJaWYgKElTX0c0WChkZXZfcHJpdikgfHwgSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikgfHwKKwkgICAgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJLyog QnNwZWMgY2xhaW1zIHRoYXQgd2UgY2FuJ3QgdXNlIGRpdGhlcmluZyBmb3IgMzBicHAgcGlwZXMu ICovCiAJCWlmIChpbnRlbF9jcnRjLT5jb25maWctPmRpdGhlciAmJiBpbnRlbF9jcnRjLT5jb25m aWctPnBpcGVfYnBwICE9IDMwKQogCQkJcGlwZWNvbmYgfD0gUElQRUNPTkZfRElUSEVSX0VOIHwK QEAgLTg4MzAsNyArODgzMSw4IEBAIHN0YXRpYyBib29sIGk5eHhfZ2V0X3BpcGVfY29uZmlnKHN0 cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCWlmICghKHRtcCAmIFBJUEVDT05GX0VOQUJMRSkpCiAJ CWdvdG8gb3V0OwogCi0JaWYgKElTX0c0WChkZXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJ U19DSEVSUllWSUVXKGRldikpIHsKKwlpZiAoSVNfRzRYKGRldl9wcml2KSB8fCBJU19WQUxMRVlW SUVXKGRldl9wcml2KSB8fAorCSAgICBJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlzd2l0 Y2ggKHRtcCAmIFBJUEVDT05GX0JQQ19NQVNLKSB7CiAJCWNhc2UgUElQRUNPTkZfNkJQQzoKIAkJ CXBpcGVfY29uZmlnLT5waXBlX2JwcCA9IDE4OwpAQCAtMTE1NzksNyArMTE1ODEsNyBAQCBzdGF0 aWMgYm9vbCBfX3BhZ2VmbGlwX2ZpbmlzaGVkX2NzKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CSAqIHJlYWxseSBuZWVkZWQgdGhlcmUuIEJ1dCBzaW5jZSBjdGcgaGFzIHRoZSByZWdpc3RlcnMs CiAJICogaW5jbHVkZSBpdCBpbiB0aGUgY2hlY2sgYW55d2F5LgogCSAqLwotCWlmIChJTlRFTF9J TkZPKGRldiktPmdlbiA8IDUgJiYgIUlTX0c0WChkZXYpKQorCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpIDwgNSAmJiAhSVNfRzRYKGRldl9wcml2KSkKIAkJcmV0dXJuIHRydWU7CiAKIAkvKgpAQCAt MTIyNDIsNyArMTIyNDQsNyBAQCBzdGF0aWMgaW50IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKIAogCWF0b21pY19pbmMoJmludGVsX2NydGMtPnVucGluX3dvcmtf Y291bnQpOwogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUgfHwgSVNfRzRYKGRldikp CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSB8fCBJU19HNFgoZGV2X3ByaXYpKQogCQl3 b3JrLT5mbGlwX2NvdW50ID0gSTkxNV9SRUFEKFBJUEVfRkxJUENPVU5UX0c0WChwaXBlKSkgKyAx OwogCiAJaWYgKElTX1ZBTExFWVZJRVcoZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpIHsKQEAg LTEyNzAyLDE1ICsxMjcwNCwxNiBAQCBzdGF0aWMgaW50CiBjb21wdXRlX2Jhc2VsaW5lX3BpcGVf YnBwKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0 ZSAqcGlwZV9jb25maWcpCiB7Ci0Jc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IGNydGMtPmJhc2Uu ZGV2OworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9IHRvX2k5MTUoY3J0Yy0+ YmFzZS5kZXYpOwogCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZTsKIAlzdHJ1Y3QgZHJt X2Nvbm5lY3RvciAqY29ubmVjdG9yOwogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25u ZWN0b3Jfc3RhdGU7CiAJaW50IGJwcCwgaTsKIAotCWlmICgoSVNfRzRYKGRldikgfHwgSVNfVkFM TEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkpCisJaWYgKChJU19HNFgoZGV2X3By aXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8CisJICAgIElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKSkKIAkJYnBwID0gMTAqMzsKLQllbHNlIGlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+ PSA1KQorCWVsc2UgaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSkKIAkJYnBwID0gMTIqMzsK IAllbHNlCiAJCWJwcCA9IDgqMzsKQEAgLTEzNDAxLDcgKzEzNDA0LDcgQEAgaW50ZWxfcGlwZV9j b25maWdfY29tcGFyZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCVBJUEVfQ09ORl9DSEVDS19Y KGRzaV9wbGwuY3RybCk7CiAJUElQRV9DT05GX0NIRUNLX1goZHNpX3BsbC5kaXYpOwogCi0JaWYg KElTX0c0WChkZXYpIHx8IElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUpCisJaWYgKElTX0c0WChk ZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSA1KQogCQlQSVBFX0NPTkZfQ0hFQ0tf SShwaXBlX2JwcCk7CiAKIAlQSVBFX0NPTkZfQ0hFQ0tfQ0xPQ0tfRlVaWlkoYmFzZS5hZGp1c3Rl ZF9tb2RlLmNydGNfY2xvY2spOwpAQCAtMTQ5NjMsNyArMTQ5NjYsNyBAQCBzdGF0aWMgc3RydWN0 IGRybV9wbGFuZSAqaW50ZWxfcHJpbWFyeV9wbGFuZV9jcmVhdGUoc3RydWN0IGRybV9kZXZpY2Ug KmRldiwKIAkJCQkJICAgICAgIGludGVsX3ByaW1hcnlfZm9ybWF0cywgbnVtX2Zvcm1hdHMsCiAJ CQkJCSAgICAgICBEUk1fUExBTkVfVFlQRV9QUklNQVJZLAogCQkJCQkgICAgICAgInBsYW5lIDEl YyIsIHBpcGVfbmFtZShwaXBlKSk7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0g NSB8fCBJU19HNFgoZGV2KSkKKwllbHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwg SVNfRzRYKGRldl9wcml2KSkKIAkJcmV0ID0gZHJtX3VuaXZlcnNhbF9wbGFuZV9pbml0KGRldiwg JnByaW1hcnktPmJhc2UsIDAsCiAJCQkJCSAgICAgICAmaW50ZWxfcGxhbmVfZnVuY3MsCiAJCQkJ CSAgICAgICBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLApAQCAtMTU1MjQsMTIg KzE1NTI3LDEyIEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9k ZXZpY2UgKmRldikKIAkJaWYgKEk5MTVfUkVBRChHRU4zX1NEVk9CKSAmIFNEVk9fREVURUNURUQp IHsKIAkJCURSTV9ERUJVR19LTVMoInByb2JpbmcgU0RWT0JcbiIpOwogCQkJZm91bmQgPSBpbnRl bF9zZHZvX2luaXQoZGV2LCBHRU4zX1NEVk9CLCBQT1JUX0IpOwotCQkJaWYgKCFmb3VuZCAmJiBJ U19HNFgoZGV2KSkgeworCQkJaWYgKCFmb3VuZCAmJiBJU19HNFgoZGV2X3ByaXYpKSB7CiAJCQkJ RFJNX0RFQlVHX0tNUygicHJvYmluZyBIRE1JIG9uIFNEVk9CXG4iKTsKIAkJCQlpbnRlbF9oZG1p X2luaXQoZGV2LCBHRU40X0hETUlCLCBQT1JUX0IpOwogCQkJfQogCi0JCQlpZiAoIWZvdW5kICYm IElTX0c0WChkZXYpKQorCQkJaWYgKCFmb3VuZCAmJiBJU19HNFgoZGV2X3ByaXYpKQogCQkJCWlu dGVsX2RwX2luaXQoZGV2LCBEUF9CLCBQT1JUX0IpOwogCQl9CiAKQEAgLTE1NTQyLDE2ICsxNTU0 NSwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAKIAkJaWYgKCFmb3VuZCAmJiAoSTkxNV9SRUFEKEdFTjNfU0RWT0MpICYgU0RWT19E RVRFQ1RFRCkpIHsKIAotCQkJaWYgKElTX0c0WChkZXYpKSB7CisJCQlpZiAoSVNfRzRYKGRldl9w cml2KSkgewogCQkJCURSTV9ERUJVR19LTVMoInByb2JpbmcgSERNSSBvbiBTRFZPQ1xuIik7CiAJ CQkJaW50ZWxfaGRtaV9pbml0KGRldiwgR0VONF9IRE1JQywgUE9SVF9DKTsKIAkJCX0KLQkJCWlm IChJU19HNFgoZGV2KSkKKwkJCWlmIChJU19HNFgoZGV2X3ByaXYpKQogCQkJCWludGVsX2RwX2lu aXQoZGV2LCBEUF9DLCBQT1JUX0MpOwogCQl9CiAKLQkJaWYgKElTX0c0WChkZXYpICYmCi0JCSAg ICAoSTkxNV9SRUFEKERQX0QpICYgRFBfREVURUNURUQpKQorCQlpZiAoSVNfRzRYKGRldl9wcml2 KSAmJiAoSTkxNV9SRUFEKERQX0QpICYgRFBfREVURUNURUQpKQogCQkJaW50ZWxfZHBfaW5pdChk ZXYsIERQX0QsIFBPUlRfRCk7CiAJfSBlbHNlIGlmIChJU19HRU4yKGRldikpCiAJCWludGVsX2R2 b19pbml0KGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCBiNmM4YjI1ZWUxZDQuLmRm YzkzY2MxMWExMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xMzQxLDcgKzEzNDEsNyBA QCBpbnRlbF9kcF9zZXRfY2xvY2soc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJY29u c3Qgc3RydWN0IGRwX2xpbmtfZHBsbCAqZGl2aXNvciA9IE5VTEw7CiAJaW50IGksIGNvdW50ID0g MDsKIAotCWlmIChJU19HNFgoZGV2KSkgeworCWlmIChJU19HNFgoZGV2X3ByaXYpKSB7CiAJCWRp dmlzb3IgPSBnZW40X2RwbGw7CiAJCWNvdW50ID0gQVJSQVlfU0laRShnZW40X2RwbGwpOwogCX0g ZWxzZSBpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hk bWkuYwppbmRleCBmNjU2MjQ1MWM0N2UuLmM3ZDljZGRmNGUzZSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2hkbWkuYwpAQCAtMTg4OSw3ICsxODg5LDcgQEAgdm9pZCBpbnRlbF9oZG1pX2luaXRfY29u bmVjdG9yKHN0cnVjdCBpbnRlbF9kaWdpdGFsX3BvcnQgKmludGVsX2RpZ19wb3J0LAogCQlpbnRl bF9oZG1pLT53cml0ZV9pbmZvZnJhbWUgPSB2bHZfd3JpdGVfaW5mb2ZyYW1lOwogCQlpbnRlbF9o ZG1pLT5zZXRfaW5mb2ZyYW1lcyA9IHZsdl9zZXRfaW5mb2ZyYW1lczsKIAkJaW50ZWxfaGRtaS0+ aW5mb2ZyYW1lX2VuYWJsZWQgPSB2bHZfaW5mb2ZyYW1lX2VuYWJsZWQ7Ci0JfSBlbHNlIGlmIChJ U19HNFgoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfRzRYKGRldl9wcml2KSkgewogCQlpbnRlbF9o ZG1pLT53cml0ZV9pbmZvZnJhbWUgPSBnNHhfd3JpdGVfaW5mb2ZyYW1lOwogCQlpbnRlbF9oZG1p LT5zZXRfaW5mb2ZyYW1lcyA9IGc0eF9zZXRfaW5mb2ZyYW1lczsKIAkJaW50ZWxfaGRtaS0+aW5m b2ZyYW1lX2VuYWJsZWQgPSBnNHhfaW5mb2ZyYW1lX2VuYWJsZWQ7CkBAIC0xOTk2LDcgKzE5OTYs NyBAQCB2b2lkIGludGVsX2hkbWlfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCSAqIHRv IHdvcmsgb24gcmVhbCBoYXJkd2FyZS4gQW5kIHNpbmNlIGc0eCBjYW4gc2VuZCBpbmZvZnJhbWVz IHRvCiAJICogb25seSBvbmUgcG9ydCBhbnl3YXksIG5vdGhpbmcgaXMgbG9zdCBieSBhbGxvd2lu ZyBpdC4KIAkgKi8KLQlpZiAoSVNfRzRYKGRldikpCisJaWYgKElTX0c0WChkZXZfcHJpdikpCiAJ CWludGVsX2VuY29kZXItPmNsb25lYWJsZSB8PSAxIDw8IElOVEVMX09VVFBVVF9IRE1JOwogCiAJ aW50ZWxfZGlnX3BvcnQtPnBvcnQgPSBwb3J0OwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKaW5kZXgg MjgxMzNjOTcyYzU1Li4wZjgyZTYzYTBiZWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwpAQCAt MzI2LDcgKzMyNiw3IEBAIHZvaWQgaW50ZWxfc2V0X21lbW9yeV9jeHNyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCBlbmFibGUpCiAJCUk5MTVfV1JJVEUoRldfQkxDX1NF TEZfVkxWLCBlbmFibGUgPyBGV19DU1BXUkRXTkVOIDogMCk7CiAJCVBPU1RJTkdfUkVBRChGV19C TENfU0VMRl9WTFYpOwogCQlkZXZfcHJpdi0+d20udmx2LmN4c3IgPSBlbmFibGU7Ci0JfSBlbHNl IGlmIChJU19HNFgoZGV2KSB8fCBJU19DUkVTVExJTkUoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNf RzRYKGRldl9wcml2KSB8fCBJU19DUkVTVExJTkUoZGV2X3ByaXYpKSB7CiAJCUk5MTVfV1JJVEUo RldfQkxDX1NFTEYsIGVuYWJsZSA/IEZXX0JMQ19TRUxGX0VOIDogMCk7CiAJCVBPU1RJTkdfUkVB RChGV19CTENfU0VMRik7CiAJfSBlbHNlIGlmIChJU19QSU5FVklFVyhkZXYpKSB7CkBAIC03Nzc2 LDcgKzc3NzYsNyBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikK IAkJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IE5VTEw7CiAJCX0gZWxzZQogCQkJZGV2 X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gcGluZXZpZXdfdXBkYXRlX3dtOwotCX0gZWxzZSBp ZiAoSVNfRzRYKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0c0WChkZXZfcHJpdikpIHsKIAkJZGV2 X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gZzR4X3VwZGF0ZV93bTsKIAl9IGVsc2UgaWYgKElT X0dFTjQoZGV2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBpOTY1X3VwZGF0 ZV93bTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK