From: Tvrtko Ursulin Subject: [PATCH 11/22] drm/i915: Make IS_IVYBRIDGE only take dev_priv Date: Wed, 5 Oct 2016 13:33:38 +0100 Message-ID: <1475670829-14025-12-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-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70F5B6E839 for ; Wed, 5 Oct 2016 12:34:11 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id p138so24361103wmb.0 for ; Wed, 05 Oct 2016 05:34:11 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDg0 OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxp biA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMgICAgICAgICB8IDE5ICsrKysrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZHJ2LmggICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbS5jICAgICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f Y29udGV4dC5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAg ICB8IDEyICsrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAg ICAgIHwgMTMgKysrKysrKy0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRl LmMgICAgIHwgIDIgKy0KIDcgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgMjQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKaW5kZXggYmZkYmJiNzQ1OTM5Li5mNmJh OGYyNjIyMzggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwpAQCAtMTE0LDcgKzExNCw3IEBAIHN0 YXRpYyBib29sIGk5MTVfZXJyb3JfaW5qZWN0ZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl dl9wcml2KQogCQkgICAgICBmbXQsICMjX19WQV9BUkdTX18pCiAKIAotc3RhdGljIGVudW0gaW50 ZWxfcGNoIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQorc3Rh dGljIGVudW0gaW50ZWxfcGNoIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChzdHJ1Y3QgZHJtX2k5MTVf cHJpdmF0ZSAqZGV2X3ByaXYpCiB7CiAJZW51bSBpbnRlbF9wY2ggcmV0ID0gUENIX05PUDsKIApA QCAtMTI1LDE2ICsxMjUsMTYgQEAgc3RhdGljIGVudW0gaW50ZWxfcGNoIGludGVsX3ZpcnRfZGV0 ZWN0X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCSAqIG1ha2UgYW4gZWR1Y2F0ZWQgZ3Vl c3MgYXMgdG8gd2hpY2ggUENIIGlzIHJlYWxseSB0aGVyZS4KIAkgKi8KIAotCWlmIChJU19HRU41 KGRldikpIHsKKwlpZiAoSVNfR0VONShkZXZfcHJpdikpIHsKIAkJcmV0ID0gUENIX0lCWDsKIAkJ RFJNX0RFQlVHX0tNUygiQXNzdW1pbmcgSWJleCBQZWFrIFBDSFxuIik7Ci0JfSBlbHNlIGlmIChJ U19HRU42KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0dFTjYo ZGV2X3ByaXYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJcmV0ID0gUENIX0NQVDsK IAkJRFJNX0RFQlVHX0tNUygiQXNzdW1pbmcgQ291YXJQb2ludCBQQ0hcbiIpOwotCX0gZWxzZSBp ZiAoSVNfSEFTV0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKSB7CisJfSBlbHNlIGlmIChJ U19IQVNXRUxMKGRldl9wcml2KSB8fCBJU19CUk9BRFdFTEwoZGV2X3ByaXYpKSB7CiAJCXJldCA9 IFBDSF9MUFQ7CiAJCURSTV9ERUJVR19LTVMoIkFzc3VtaW5nIEx5bnhQb2ludCBQQ0hcbiIpOwot CX0gZWxzZSBpZiAoSVNfU0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpIHsKKwl9IGVs c2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewog CQlyZXQgPSBQQ0hfU1BUOwogCQlEUk1fREVCVUdfS01TKCJBc3N1bWluZyBTdW5yaXNlUG9pbnQg UENIXG4iKTsKIAl9CkBAIC0xNzgsMTIgKzE3OCwxNCBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZXRl Y3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVM X1BDSF9DUFRfREVWSUNFX0lEX1RZUEUpIHsKIAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hf Q1BUOwogCQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIENvdWdhclBvaW50IFBDSFxuIik7Ci0JCQkJ V0FSTl9PTighKElTX0dFTjYoZGV2KSB8fCBJU19JVllCUklER0UoZGV2KSkpOworCQkJCVdBUk5f T04oIShJU19HRU42KGRldl9wcml2KSB8fAorCQkJCQlJU19JVllCUklER0UoZGV2X3ByaXYpKSk7 CiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BDSF9QUFRfREVWSUNFX0lEX1RZUEUpIHsKIAkJ CQkvKiBQYW50aGVyUG9pbnQgaXMgQ1BUIGNvbXBhdGlibGUgKi8KIAkJCQlkZXZfcHJpdi0+cGNo X3R5cGUgPSBQQ0hfQ1BUOwogCQkJCURSTV9ERUJVR19LTVMoIkZvdW5kIFBhbnRoZXJQb2ludCBQ Q0hcbiIpOwotCQkJCVdBUk5fT04oIShJU19HRU42KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikp KTsKKwkJCQlXQVJOX09OKCEoSVNfR0VONihkZXZfcHJpdikgfHwKKwkJCQkJSVNfSVZZQlJJREdF KGRldl9wcml2KSkpOwogCQkJfSBlbHNlIGlmIChpZCA9PSBJTlRFTF9QQ0hfTFBUX0RFVklDRV9J RF9UWVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0gUENIX0xQVDsKIAkJCQlEUk1fREVC VUdfS01TKCJGb3VuZCBMeW54UG9pbnQgUENIXG4iKTsKQEAgLTIxNyw3ICsyMTksOCBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQkJCSAg ICBQQ0lfU1VCVkVORE9SX0lEX1JFREhBVF9RVU1SQU5FVCAmJgogCQkJCSAgICBwY2gtPnN1YnN5 c3RlbV9kZXZpY2UgPT0KIAkJCQkJICAgIFBDSV9TVUJERVZJQ0VfSURfUUVNVSkpIHsKLQkJCQlk ZXZfcHJpdi0+cGNoX3R5cGUgPSBpbnRlbF92aXJ0X2RldGVjdF9wY2goZGV2KTsKKwkJCQlkZXZf cHJpdi0+cGNoX3R5cGUgPQorCQkJCQlpbnRlbF92aXJ0X2RldGVjdF9wY2goZGV2X3ByaXYpOwog CQkJfSBlbHNlCiAJCQkJY29udGludWU7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDM5 OTZiMDFkODc0YS4uMTMxOTU0NGY5N2M1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2 NTcsNyArMjY1Nyw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19Q SU5FVklFVyhkZXYpCShJTlRFTF9JTkZPKGRldiktPmlzX3BpbmV2aWV3KQogI2RlZmluZSBJU19H MzMoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+aXNfZzMzKQogI2RlZmluZSBJU19JUk9OTEFLRV9N KGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDA0NikKLSNkZWZpbmUgSVNf SVZZQlJJREdFKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfaXZ5YnJpZGdlKQorI2RlZmluZSBJ U19JVllCUklER0UoZGV2X3ByaXYpCShkZXZfcHJpdi0+aW5mby5pc19pdnlicmlkZ2UpCiAjZGVm aW5lIElTX0lWQl9HVDEoZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTU2 IHx8IFwKIAkJCQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDE1MiB8fCBcCiAJCQkJIElO VEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNWEpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwppbmRl eCAxNmUyMGQ0ZjgwMzYuLmI2NTBjOWM3YWRkYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCkBA IC00MzYwLDcgKzQzNjAsNyBAQCBpOTE1X2dlbV9pbml0X2h3KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCQkgICBMT1dFUl9TTElDRV9FTkFCTEVEIDogTE9XRVJfU0xJQ0VfRElTQUJMRUQpOwog CiAJaWYgKEhBU19QQ0hfTk9QKGRldl9wcml2KSkgewotCQlpZiAoSVNfSVZZQlJJREdFKGRldikp IHsKKwkJaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJCXUzMiB0ZW1wID0gSTkxNV9S RUFEKEdFTjdfTVNHX0NUTCk7CiAJCQl0ZW1wICY9IH4oV0FJVF9GT1JfUENIX0ZMUl9BQ0sgfCBX QUlUX0ZPUl9QQ0hfUkVTRVRfQUNLKTsKIAkJCUk5MTVfV1JJVEUoR0VON19NU0dfQ1RMLCB0ZW1w KTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQuYwppbmRleCBkZjEwZjRlOTU3 MzYuLmUxMTdiOThjNzI2ZiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n ZW1fY29udGV4dC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRleHQu YwpAQCAtMTkyLDcgKzE5Miw3IEBAIGk5MTVfZ2VtX2FsbG9jX2NvbnRleHRfb2JqKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHNpemVfdCBzaXplKQogCSAqIFRoaXMgaXMgb25seSBhcHBsaWNhYmxl IGZvciBJdnkgQnJpZGdlIGRldmljZXMgc2luY2UKIAkgKiBsYXRlciBwbGF0Zm9ybXMgZG9uJ3Qg aGF2ZSBMMyBjb250cm9sIGJpdHMgaW4gdGhlIFBURS4KIAkgKi8KLQlpZiAoSVNfSVZZQlJJREdF KGRldikpIHsKKwlpZiAoSVNfSVZZQlJJREdFKHRvX2k5MTUoZGV2KSkpIHsKIAkJcmV0ID0gaTkx NV9nZW1fb2JqZWN0X3NldF9jYWNoZV9sZXZlbChvYmosIEk5MTVfQ0FDSEVfTDNfTExDKTsKIAkJ LyogRmFpbHVyZSBzaG91bGRuJ3QgZXZlciBoYXBwZW4gdGhpcyBlYXJseSAqLwogCQlpZiAoV0FS Tl9PTihyZXQpKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggZDhmZmIw YWExZWRhLi5kNWUxY2QxMjA2YWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK QEAgLTM3MjYsNyArMzcyNiw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZkaV9ub3JtYWxfdHJhaW4o c3RydWN0IGRybV9jcnRjICpjcnRjKQogCS8qIGVuYWJsZSBub3JtYWwgdHJhaW4gKi8KIAlyZWcg PSBGRElfVFhfQ1RMKHBpcGUpOwogCXRlbXAgPSBJOTE1X1JFQUQocmVnKTsKLQlpZiAoSVNfSVZZ QlJJREdFKGRldikpIHsKKwlpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewogCQl0ZW1wICY9 IH5GRElfTElOS19UUkFJTl9OT05FX0lWQjsKIAkJdGVtcCB8PSBGRElfTElOS19UUkFJTl9OT05F X0lWQiB8IEZESV9UWF9FTkhBTkNFX0ZSQU1FX0VOQUJMRTsKIAl9IGVsc2UgewpAQCAtMzc1MSw3 ICszNzUxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZmRpX25vcm1hbF90cmFpbihzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCiAJdWRlbGF5KDEwMDApOwogCiAJLyogSVZCIHdhbnRzIGVycm9yIGNvcnJl Y3Rpb24gZW5hYmxlZCAqLwotCWlmIChJU19JVllCUklER0UoZGV2KSkKKwlpZiAoSVNfSVZZQlJJ REdFKGRldl9wcml2KSkKIAkJSTkxNV9XUklURShyZWcsIEk5MTVfUkVBRChyZWcpIHwgRkRJX0ZT X0VSUkNfRU5BQkxFIHwKIAkJCSAgIEZESV9GRV9FUlJDX0VOQUJMRSk7CiB9CkBAIC00NTM3LDcg KzQ1MzcsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9wY2hfZW5hYmxlKHN0cnVjdCBkcm1fY3J0 YyAqY3J0YykKIAogCWFzc2VydF9wY2hfdHJhbnNjb2Rlcl9kaXNhYmxlZChkZXZfcHJpdiwgcGlw ZSk7CiAKLQlpZiAoSVNfSVZZQlJJREdFKGRldikpCisJaWYgKElTX0lWWUJSSURHRShkZXZfcHJp dikpCiAJCWl2eWJyaWRnZV91cGRhdGVfZmRpX2JjX2JpZnVyY2F0aW9uKGludGVsX2NydGMpOwog CiAJLyogV3JpdGUgdGhlIFRVIHNpemUgYml0cyBiZWZvcmUgZmRpIGxpbmsgdHJhaW5pbmcsIHNv IHRoYXQgZXJyb3IKQEAgLTQ4NTEsNyArNDg1MSw3IEBAIHN0YXRpYyB2b2lkIGlyb25sYWtlX3Bm aXRfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjKQogCQkgKiBhcyBzb21lIHByZS1wcm9n cmFtbWVkIHZhbHVlcyBhcmUgYnJva2VuLAogCQkgKiBlLmcuIHgyMDEuCiAJCSAqLwotCQlpZiAo SVNfSVZZQlJJREdFKGRldikgfHwgSVNfSEFTV0VMTChkZXYpKQorCQlpZiAoSVNfSVZZQlJJREdF KGRldl9wcml2KSB8fCBJU19IQVNXRUxMKGRldl9wcml2KSkKIAkJCUk5MTVfV1JJVEUoUEZfQ1RM KHBpcGUpLCBQRl9FTkFCTEUgfCBQRl9GSUxURVJfTUVEXzN4MyB8CiAJCQkJCQkgUEZfUElQRV9T RUxfSVZCKHBpcGUpKTsKIAkJZWxzZQpAQCAtMTIyNDgsNyArMTIyNDgsNyBAQCBzdGF0aWMgaW50 IGludGVsX2NydGNfcGFnZV9mbGlwKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKIAkJaWYgKGZiLT5t b2RpZmllclswXSAhPSBvbGRfZmItPm1vZGlmaWVyWzBdKQogCQkJLyogdmx2OiBESVNQTEFZX0ZM SVAgZmFpbHMgdG8gY2hhbmdlIHRpbGluZyAqLwogCQkJZW5naW5lID0gTlVMTDsKLQl9IGVsc2Ug aWYgKElTX0lWWUJSSURHRShkZXYpIHx8IElTX0hBU1dFTEwoZGV2KSkgeworCX0gZWxzZSBpZiAo SVNfSVZZQlJJREdFKGRldl9wcml2KSB8fCBJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQllbmdp bmUgPSAmZGV2X3ByaXYtPmVuZ2luZVtCQ1NdOwogCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gNykgewogCQllbmdpbmUgPSBpOTE1X2dlbV9hY3RpdmVfZ2V0X2VuZ2luZSgmb2Jq LT5sYXN0X3dyaXRlLApAQCAtMTI1MjQsNyArMTI1MjQsNyBAQCBpbnQgaW50ZWxfcGxhbmVfYXRv bWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJICog Y3N0YXRlLT51cGRhdGVfd20gd2FzIGFscmVhZHkgc2V0IGFib3ZlLCBzbyB0aGlzIGZsYWcgd2ls bAogCSAqIHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdhdGVybWFya3Mu CiAJICovCi0JaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYgSVNf SVZZQlJJREdFKGRldikgJiYKKwlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZF UkxBWSAmJiBJU19JVllCUklER0UoZGV2X3ByaXYpICYmCiAJICAgIG5lZWRzX3NjYWxpbmcodG9f aW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgogCSAgICAhbmVlZHNfc2NhbGluZyhv bGRfcGxhbmVfc3RhdGUpKQogCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9scF93bSA9IHRydWU7CmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAzYjQ0ZTg2ZDA5YTcuLmM4MmU1NDdjYmM0NiAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMTkxLDE0ICsyMTkxLDE1IEBAIHN0YXRpYyB2b2lk IGludGVsX2ZpeHVwX3Nwcl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQx Nl90IHdtWzVdKQogCQl3bVswXSA9IDEzOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9maXh1cF9j dXJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs1XSkKK3N0 YXRpYyB2b2lkIGludGVsX2ZpeHVwX2N1cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICpkZXZfcHJpdiwKKwkJCQkgICAgICAgdWludDE2X3Qgd21bNV0pCiB7CiAJLyogSUxLIGN1 cnNvciBMUDAgbGF0ZW5jeSBpcyAxMzAwIG5zICovCi0JaWYgKElTX0dFTjUoZGV2KSkKKwlpZiAo SVNfR0VONShkZXZfcHJpdikpCiAJCXdtWzBdID0gMTM7CiAKIAkvKiBXYURvdWJsZUN1cnNvckxQ M0xhdGVuY3k6aXZiICovCi0JaWYgKElTX0lWWUJSSURHRShkZXYpKQorCWlmIChJU19JVllCUklE R0UoZGV2X3ByaXYpKQogCQl3bVszXSAqPSAyOwogfQogCkBAIC0yMjk0LDcgKzIyOTUsNyBAQCBz dGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CSAgICAgICBzaXplb2YoZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KSk7CiAKIAlpbnRlbF9maXh1 cF9zcHJfd21fbGF0ZW5jeShkZXYsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7Ci0JaW50ZWxf Zml4dXBfY3VyX3dtX2xhdGVuY3koZGV2LCBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3kpOworCWlu dGVsX2ZpeHVwX2N1cl93bV9sYXRlbmN5KGRldl9wcml2LCBkZXZfcHJpdi0+d20uY3VyX2xhdGVu Y3kpOwogCiAJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJQcmltYXJ5IiwgZGV2X3ByaXYt PndtLnByaV9sYXRlbmN5KTsKIAlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldiwgIlNwcml0ZSIs IGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7CkBAIC0yNTIyLDcgKzI1MjMsNyBAQCBzdGF0aWMg dm9pZCBpbGtfd21fbWVyZ2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnQgbGFzdF9lbmFi bGVkX2xldmVsID0gbWF4X2xldmVsOwogCiAJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJtYXJr cyBvbmx5IHcvIHNpbmdsZSBwaXBlICovCi0JaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA8PSA2 IHx8IElTX0lWWUJSSURHRShkZXYpKSAmJgorCWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA8PSA2 IHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpICYmCiAJICAgIGNvbmZpZy0+bnVtX3BpcGVzX2Fj dGl2ZSA+IDEpCiAJCWxhc3RfZW5hYmxlZF9sZXZlbCA9IDA7CiAKQEAgLTQ2MTcsNyArNDYxOCw3 IEBAIHZvaWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlm IChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCiAJCWh3LT5wYXJ0aXRpb25p bmcgPSAoSTkxNV9SRUFEKFdNX01JU0MpICYgV01fTUlTQ19EQVRBX1BBUlRJVElPTl81XzYpID8K IAkJCUlOVEVMX0REQl9QQVJUXzVfNiA6IElOVEVMX0REQl9QQVJUXzFfMjsKLQllbHNlIGlmIChJ U19JVllCUklER0UoZGV2KSkKKwllbHNlIGlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKQogCQlo dy0+cGFydGl0aW9uaW5nID0gKEk5MTVfUkVBRChESVNQX0FSQl9DVEwyKSAmIERJU1BfREFUQV9Q QVJUSVRJT05fNV82KSA/CiAJCQlJTlRFTF9EREJfUEFSVF81XzYgOiBJTlRFTF9EREJfUEFSVF8x XzI7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNzNhNTIxZmRmMWJkLi5k MGY3OThjZTZiYjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0 ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMDg0LDcg KzEwODQsNyBAQCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVudW0g cGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAKIAljYXNlIDc6CiAJY2FzZSA4OgotCQlpZiAoSVNfSVZZ QlJJREdFKGRldikpIHsKKwkJaWYgKElTX0lWWUJSSURHRSh0b19pOTE1KGRldikpKSB7CiAJCQlp bnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKIAkJCWludGVsX3BsYW5lLT5tYXhfZG93bnNj YWxlID0gMjsKIAkJfSBlbHNlIHsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK