From: Tvrtko Ursulin Subject: [CI 08/19] drm/i915: Make IS_IVYBRIDGE only take dev_priv Date: Thu, 13 Oct 2016 11:02:59 +0100 Message-ID: <1476352990-2504-8-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-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-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 276F36EA04 for ; Thu, 13 Oct 2016 10:03:27 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id b75so11686381lfg.3 for ; Thu, 13 Oct 2016 03:03:27 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id yo1sm21209210wjc.16.2016.10.13.03.03.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:24 -0700 (PDT) In-Reply-To: <1476352990-2504-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 OCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjogQWRkIHBhcmFudGhlc2VzIGFyb3VuZCBk ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxk YXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3Vs YUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAg ICAgICAgIHwgMTkgKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg ICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMg fCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jICAgIHwgMTIgKysr KysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAgICAgICAgfCAxMyAr KysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgICAgfCAg MiArLQogNyBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyNCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCA0ZGQ3ZDc1ZWU0ZTMuLjVhMmUwZDBjN2Y0YSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xMTQsNyArMTE0LDcgQEAgc3RhdGljIGJvb2wg aTkxNV9lcnJvcl9pbmplY3RlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJ CSAgICAgIGZtdCwgIyNfX1ZBX0FSR1NfXykKIAogCi1zdGF0aWMgZW51bSBpbnRlbF9wY2ggaW50 ZWxfdmlydF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitzdGF0aWMgZW51bSBp bnRlbF9wY2ggaW50ZWxfdmlydF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpk ZXZfcHJpdikKIHsKIAllbnVtIGludGVsX3BjaCByZXQgPSBQQ0hfTk9QOwogCkBAIC0xMjUsMTYg KzEyNSwxNiBAQCBzdGF0aWMgZW51bSBpbnRlbF9wY2ggaW50ZWxfdmlydF9kZXRlY3RfcGNoKHN0 cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogbWFrZSBhbiBlZHVjYXRlZCBndWVzcyBhcyB0byB3 aGljaCBQQ0ggaXMgcmVhbGx5IHRoZXJlLgogCSAqLwogCi0JaWYgKElTX0dFTjUoZGV2KSkgewor CWlmIChJU19HRU41KGRldl9wcml2KSkgewogCQlyZXQgPSBQQ0hfSUJYOwogCQlEUk1fREVCVUdf S01TKCJBc3N1bWluZyBJYmV4IFBlYWsgUENIXG4iKTsKLQl9IGVsc2UgaWYgKElTX0dFTjYoZGV2 KSB8fCBJU19JVllCUklER0UoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfR0VONihkZXZfcHJpdikg fHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewogCQlyZXQgPSBQQ0hfQ1BUOwogCQlEUk1fREVC VUdfS01TKCJBc3N1bWluZyBDb3VhclBvaW50IFBDSFxuIik7Ci0JfSBlbHNlIGlmIChJU19IQVNX RUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0hBU1dFTEwo ZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJcmV0ID0gUENIX0xQVDsK IAkJRFJNX0RFQlVHX0tNUygiQXNzdW1pbmcgTHlueFBvaW50IFBDSFxuIik7Ci0JfSBlbHNlIGlm IChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNf U0tZTEFLRShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7CiAJCXJldCA9IFBD SF9TUFQ7CiAJCURSTV9ERUJVR19LTVMoIkFzc3VtaW5nIFN1bnJpc2VQb2ludCBQQ0hcbiIpOwog CX0KQEAgLTE3OCwxMiArMTc4LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX2RldGVjdF9wY2goc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX0NQVF9E RVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBDSF9DUFQ7CiAJCQkJ RFJNX0RFQlVHX0tNUygiRm91bmQgQ291Z2FyUG9pbnQgUENIXG4iKTsKLQkJCQlXQVJOX09OKCEo SVNfR0VONihkZXYpIHx8IElTX0lWWUJSSURHRShkZXYpKSk7CisJCQkJV0FSTl9PTighKElTX0dF TjYoZGV2X3ByaXYpIHx8CisJCQkJCUlTX0lWWUJSSURHRShkZXZfcHJpdikpKTsKIAkJCX0gZWxz ZSBpZiAoaWQgPT0gSU5URUxfUENIX1BQVF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCS8qIFBhbnRo ZXJQb2ludCBpcyBDUFQgY29tcGF0aWJsZSAqLwogCQkJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBD SF9DUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgUGFudGhlclBvaW50IFBDSFxuIik7Ci0J CQkJV0FSTl9PTighKElTX0dFTjYoZGV2KSB8fCBJU19JVllCUklER0UoZGV2KSkpOworCQkJCVdB Uk5fT04oIShJU19HRU42KGRldl9wcml2KSB8fAorCQkJCQlJU19JVllCUklER0UoZGV2X3ByaXYp KSk7CiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BDSF9MUFRfREVWSUNFX0lEX1RZUEUpIHsK IAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hfTFBUOwogCQkJCURSTV9ERUJVR19LTVMoIkZv dW5kIEx5bnhQb2ludCBQQ0hcbiIpOwpAQCAtMjE3LDcgKzIxOSw4IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQkJICAgIFBDSV9TVUJW RU5ET1JfSURfUkVESEFUX1FVTVJBTkVUICYmCiAJCQkJICAgIHBjaC0+c3Vic3lzdGVtX2Rldmlj ZSA9PQogCQkJCQkgICAgUENJX1NVQkRFVklDRV9JRF9RRU1VKSkgewotCQkJCWRldl9wcml2LT5w Y2hfdHlwZSA9IGludGVsX3ZpcnRfZGV0ZWN0X3BjaChkZXYpOworCQkJCWRldl9wcml2LT5wY2hf dHlwZSA9CisJCQkJCWludGVsX3ZpcnRfZGV0ZWN0X3BjaChkZXZfcHJpdik7CiAJCQl9IGVsc2UK IAkJCQljb250aW51ZTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k cnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggZjk4ZTRkZDVkZTEx Li43MzE4MDA5MDU0YzEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2 LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjY1OCw3ICsyNjU4 LDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIElTX1BJTkVWSUVXKGRl dikJKElOVEVMX0lORk8oZGV2KS0+aXNfcGluZXZpZXcpCiAjZGVmaW5lIElTX0czMyhkZXYpCQko SU5URUxfSU5GTyhkZXYpLT5pc19nMzMpCiAjZGVmaW5lIElTX0lST05MQUtFX00oZGV2X3ByaXYp CShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMDQ2KQotI2RlZmluZSBJU19JVllCUklER0Uo ZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19pdnlicmlkZ2UpCisjZGVmaW5lIElTX0lWWUJSSURH RShkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfaXZ5YnJpZGdlKQogI2RlZmluZSBJU19J VkJfR1QxKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MDE1NiB8fCBcCiAJ CQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwgXAogCQkJCSBJTlRFTF9ERVZJ RChkZXZfcHJpdikgPT0gMHgwMTVhKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggNjIwZGVj NzQ1YzJlLi5hMDE4MTFjYWJkYzMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDM4OCw3 ICs0Mzg4LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJ ICAgTE9XRVJfU0xJQ0VfRU5BQkxFRCA6IExPV0VSX1NMSUNFX0RJU0FCTEVEKTsKIAogCWlmIChI QVNfUENIX05PUChkZXZfcHJpdikpIHsKLQkJaWYgKElTX0lWWUJSSURHRShkZXYpKSB7CisJCWlm IChJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCQl1MzIgdGVtcCA9IEk5MTVfUkVBRChHRU43 X01TR19DVEwpOwogCQkJdGVtcCAmPSB+KFdBSVRfRk9SX1BDSF9GTFJfQUNLIHwgV0FJVF9GT1Jf UENIX1JFU0VUX0FDSyk7CiAJCQlJOTE1X1dSSVRFKEdFTjdfTVNHX0NUTCwgdGVtcCk7CmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggZGYxMGY0ZTk1NzM2Li5lMTE3 Yjk4YzcyNmYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2NvbnRl eHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKQEAgLTE5 Miw3ICsxOTIsNyBAQCBpOTE1X2dlbV9hbGxvY19jb250ZXh0X29iaihzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCBzaXplX3Qgc2l6ZSkKIAkgKiBUaGlzIGlzIG9ubHkgYXBwbGljYWJsZSBmb3IgSXZ5 IEJyaWRnZSBkZXZpY2VzIHNpbmNlCiAJICogbGF0ZXIgcGxhdGZvcm1zIGRvbid0IGhhdmUgTDMg Y29udHJvbCBiaXRzIGluIHRoZSBQVEUuCiAJICovCi0JaWYgKElTX0lWWUJSSURHRShkZXYpKSB7 CisJaWYgKElTX0lWWUJSSURHRSh0b19pOTE1KGRldikpKSB7CiAJCXJldCA9IGk5MTVfZ2VtX29i amVjdF9zZXRfY2FjaGVfbGV2ZWwob2JqLCBJOTE1X0NBQ0hFX0wzX0xMQyk7CiAJCS8qIEZhaWx1 cmUgc2hvdWxkbid0IGV2ZXIgaGFwcGVuIHRoaXMgZWFybHkgKi8KIAkJaWYgKFdBUk5fT04ocmV0 KSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGJhODdjM2Q2ZmJjOC4u MWRhMGZkMDQwMjNiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zNzI3 LDcgKzM3MjcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mZGlfbm9ybWFsX3RyYWluKHN0cnVjdCBk cm1fY3J0YyAqY3J0YykKIAkvKiBlbmFibGUgbm9ybWFsIHRyYWluICovCiAJcmVnID0gRkRJX1RY X0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7Ci0JaWYgKElTX0lWWUJSSURHRShk ZXYpKSB7CisJaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJdGVtcCAmPSB+RkRJX0xJ TktfVFJBSU5fTk9ORV9JVkI7CiAJCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5fTk9ORV9JVkIgfCBG RElfVFhfRU5IQU5DRV9GUkFNRV9FTkFCTEU7CiAJfSBlbHNlIHsKQEAgLTM3NTIsNyArMzc1Miw3 IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZkaV9ub3JtYWxfdHJhaW4oc3RydWN0IGRybV9jcnRjICpj cnRjKQogCXVkZWxheSgxMDAwKTsKIAogCS8qIElWQiB3YW50cyBlcnJvciBjb3JyZWN0aW9uIGVu YWJsZWQgKi8KLQlpZiAoSVNfSVZZQlJJREdFKGRldikpCisJaWYgKElTX0lWWUJSSURHRShkZXZf cHJpdikpCiAJCUk5MTVfV1JJVEUocmVnLCBJOTE1X1JFQUQocmVnKSB8IEZESV9GU19FUlJDX0VO QUJMRSB8CiAJCQkgICBGRElfRkVfRVJSQ19FTkFCTEUpOwogfQpAQCAtNDUzOCw3ICs0NTM4LDcg QEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3QgZHJtX2NydGMgKmNydGMp CiAKIAlhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQoZGV2X3ByaXYsIHBpcGUpOwogCi0J aWYgKElTX0lWWUJSSURHRShkZXYpKQorCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKQogCQlp dnlicmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihpbnRlbF9jcnRjKTsKIAogCS8qIFdy aXRlIHRoZSBUVSBzaXplIGJpdHMgYmVmb3JlIGZkaSBsaW5rIHRyYWluaW5nLCBzbyB0aGF0IGVy cm9yCkBAIC00ODUyLDcgKzQ4NTIsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFrZV9wZml0X2VuYWJs ZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJICogYXMgc29tZSBwcmUtcHJvZ3JhbW1lZCB2 YWx1ZXMgYXJlIGJyb2tlbiwKIAkJICogZS5nLiB4MjAxLgogCQkgKi8KLQkJaWYgKElTX0lWWUJS SURHRShkZXYpIHx8IElTX0hBU1dFTEwoZGV2KSkKKwkJaWYgKElTX0lWWUJSSURHRShkZXZfcHJp dikgfHwgSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCQlJOTE1X1dSSVRFKFBGX0NUTChwaXBlKSwg UEZfRU5BQkxFIHwgUEZfRklMVEVSX01FRF8zeDMgfAogCQkJCQkJIFBGX1BJUEVfU0VMX0lWQihw aXBlKSk7CiAJCWVsc2UKQEAgLTEyMjQ5LDcgKzEyMjQ5LDcgQEAgc3RhdGljIGludCBpbnRlbF9j cnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlmIChmYi0+bW9kaWZpZXJb MF0gIT0gb2xkX2ZiLT5tb2RpZmllclswXSkKIAkJCS8qIHZsdjogRElTUExBWV9GTElQIGZhaWxz IHRvIGNoYW5nZSB0aWxpbmcgKi8KIAkJCWVuZ2luZSA9IE5VTEw7Ci0JfSBlbHNlIGlmIChJU19J VllCUklER0UoZGV2KSB8fCBJU19IQVNXRUxMKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0lWWUJS SURHRShkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKIAkJZW5naW5lID0gJmRl dl9wcml2LT5lbmdpbmVbQkNTXTsKIAl9IGVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49 IDcpIHsKIAkJZW5naW5lID0gaTkxNV9nZW1fYWN0aXZlX2dldF9lbmdpbmUoJm9iai0+bGFzdF93 cml0ZSwKQEAgLTEyNTI1LDcgKzEyNTI1LDcgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jYWxj X2NoYW5nZXMoc3RydWN0IGRybV9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCSAqIGNzdGF0ZS0+ dXBkYXRlX3dtIHdhcyBhbHJlYWR5IHNldCBhYm92ZSwgc28gdGhpcyBmbGFnIHdpbGwKIAkgKiB0 YWtlIGVmZmVjdCB3aGVuIHdlIGNvbW1pdCBhbmQgcHJvZ3JhbSB3YXRlcm1hcmtzLgogCSAqLwot CWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZICYmIElTX0lWWUJSSURH RShkZXYpICYmCisJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYg SVNfSVZZQlJJREdFKGRldl9wcml2KSAmJgogCSAgICBuZWVkc19zY2FsaW5nKHRvX2ludGVsX3Bs YW5lX3N0YXRlKHBsYW5lX3N0YXRlKSkgJiYKIAkgICAgIW5lZWRzX3NjYWxpbmcob2xkX3BsYW5l X3N0YXRlKSkKIAkJcGlwZV9jb25maWctPmRpc2FibGVfbHBfd20gPSB0cnVlOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3BtLmMKaW5kZXggYjVhMjI5ZGE5MGM3Li45OTYxZDdiMDYxZDggMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfcG0uYwpAQCAtMjE5MSwxNCArMjE5MSwxNSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9m aXh1cF9zcHJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs1 XSkKIAkJd21bMF0gPSAxMzsKIH0KIAotc3RhdGljIHZvaWQgaW50ZWxfZml4dXBfY3VyX3dtX2xh dGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDE2X3Qgd21bNV0pCitzdGF0aWMgdm9p ZCBpbnRlbF9maXh1cF9jdXJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYsCisJCQkJICAgICAgIHVpbnQxNl90IHdtWzVdKQogewogCS8qIElMSyBjdXJzb3IgTFAw IGxhdGVuY3kgaXMgMTMwMCBucyAqLwotCWlmIChJU19HRU41KGRldikpCisJaWYgKElTX0dFTjUo ZGV2X3ByaXYpKQogCQl3bVswXSA9IDEzOwogCiAJLyogV2FEb3VibGVDdXJzb3JMUDNMYXRlbmN5 Oml2YiAqLwotCWlmIChJU19JVllCUklER0UoZGV2KSkKKwlpZiAoSVNfSVZZQlJJREdFKGRldl9w cml2KSkKIAkJd21bM10gKj0gMjsKIH0KIApAQCAtMjI5NCw3ICsyMjk1LDcgQEAgc3RhdGljIHZv aWQgaWxrX3NldHVwX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkgICAgICAg c2l6ZW9mKGRldl9wcml2LT53bS5wcmlfbGF0ZW5jeSkpOwogCiAJaW50ZWxfZml4dXBfc3ByX3dt X2xhdGVuY3koZGV2LCBkZXZfcHJpdi0+d20uc3ByX2xhdGVuY3kpOwotCWludGVsX2ZpeHVwX2N1 cl93bV9sYXRlbmN5KGRldiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKKwlpbnRlbF9maXh1 cF9jdXJfd21fbGF0ZW5jeShkZXZfcHJpdiwgZGV2X3ByaXYtPndtLmN1cl9sYXRlbmN5KTsKIAog CWludGVsX3ByaW50X3dtX2xhdGVuY3koZGV2LCAiUHJpbWFyeSIsIGRldl9wcml2LT53bS5wcmlf bGF0ZW5jeSk7CiAJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJTcHJpdGUiLCBkZXZfcHJp di0+d20uc3ByX2xhdGVuY3kpOwpAQCAtMjUyMiw3ICsyNTIzLDcgQEAgc3RhdGljIHZvaWQgaWxr X3dtX21lcmdlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJaW50IGxhc3RfZW5hYmxlZF9sZXZl bCA9IG1heF9sZXZlbDsKIAogCS8qIElMSy9TTkIvSVZCOiBMUDErIHdhdGVybWFya3Mgb25seSB3 LyBzaW5nbGUgcGlwZSAqLwotCWlmICgoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNiB8fCBJU19J VllCUklER0UoZGV2KSkgJiYKKwlpZiAoKElOVEVMX0dFTihkZXZfcHJpdikgPD0gNiB8fCBJU19J VllCUklER0UoZGV2X3ByaXYpKSAmJgogCSAgICBjb25maWctPm51bV9waXBlc19hY3RpdmUgPiAx KQogCQlsYXN0X2VuYWJsZWRfbGV2ZWwgPSAwOwogCkBAIC00NjI1LDcgKzQ2MjYsNyBAQCB2b2lk IGlsa193bV9nZXRfaHdfc3RhdGUoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlpZiAoSVNfSEFT V0VMTChkZXYpIHx8IElTX0JST0FEV0VMTChkZXYpKQogCQlody0+cGFydGl0aW9uaW5nID0gKEk5 MTVfUkVBRChXTV9NSVNDKSAmIFdNX01JU0NfREFUQV9QQVJUSVRJT05fNV82KSA/CiAJCQlJTlRF TF9EREJfUEFSVF81XzYgOiBJTlRFTF9EREJfUEFSVF8xXzI7Ci0JZWxzZSBpZiAoSVNfSVZZQlJJ REdFKGRldikpCisJZWxzZSBpZiAoSVNfSVZZQlJJREdFKGRldl9wcml2KSkKIAkJaHctPnBhcnRp dGlvbmluZyA9IChJOTE1X1JFQUQoRElTUF9BUkJfQ1RMMikgJiBESVNQX0RBVEFfUEFSVElUSU9O XzVfNikgPwogCQkJSU5URUxfRERCX1BBUlRfNV82IDogSU5URUxfRERCX1BBUlRfMV8yOwogCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDczYTUyMWZkZjFiZC4uZDBmNzk4Y2U2 YmIyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMTA4NCw3ICsxMDg0LDcg QEAgaW50ZWxfcGxhbmVfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBlbnVtIHBpcGUgcGlw ZSwgaW50IHBsYW5lKQogCiAJY2FzZSA3OgogCWNhc2UgODoKLQkJaWYgKElTX0lWWUJSSURHRShk ZXYpKSB7CisJCWlmIChJU19JVllCUklER0UodG9faTkxNShkZXYpKSkgewogCQkJaW50ZWxfcGxh bmUtPmNhbl9zY2FsZSA9IHRydWU7CiAJCQlpbnRlbF9wbGFuZS0+bWF4X2Rvd25zY2FsZSA9IDI7 CiAJCX0gZWxzZSB7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaW50ZWwtZ2Z4Cg==