From: Tvrtko Ursulin Subject: [PATCH v3 08/19] drm/i915: Make IS_IVYBRIDGE only take dev_priv Date: Fri, 14 Oct 2016 10:13:06 +0100 Message-ID: <1476436386-30847-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476352990-2504-8-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-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0CB16EBDE for ; Fri, 14 Oct 2016 09:13:25 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id x23so11338606lfi.1 for ; Fri, 14 Oct 2016 02:13:25 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:9b6d:e300:916a:6cab:ac67:71c2]) by smtp.gmail.com with ESMTPSA id kq7sm17232367wjb.0.2016.10.14.02.13.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Oct 2016 02:13:23 -0700 (PDT) In-Reply-To: <1476352990-2504-8-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 ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCnYzOiBSZWJhc2UuCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0 a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQg V2VpbmVoYWxsIDxkYXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFu aWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxh IDxqYW5pLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNo cmlzQGNocmlzLXdpbHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFy dGVuLmxhbmtob3JzdEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYyAgICAgICAgIHwgMTkgKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtLmMgICAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV9jb250ZXh0LmMgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j ICAgIHwgMTIgKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jICAg ICAgICAgfCAxMyArKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyAgICAgfCAgMiArLQogNyBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAyNCBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwppbmRleCBiYjE0ZTk1MjFjNWUuLmIx MTQyYWFmNTBlYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCkBAIC0xMTQsNyArMTE0LDcgQEAg c3RhdGljIGJvb2wgaTkxNV9lcnJvcl9pbmplY3RlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYpCiAJCSAgICAgIGZtdCwgIyNfX1ZBX0FSR1NfXykKIAogCi1zdGF0aWMgZW51bSBp bnRlbF9wY2ggaW50ZWxfdmlydF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCitz dGF0aWMgZW51bSBpbnRlbF9wY2ggaW50ZWxfdmlydF9kZXRlY3RfcGNoKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIHsKIAllbnVtIGludGVsX3BjaCByZXQgPSBQQ0hfTk9QOwog CkBAIC0xMjUsMTYgKzEyNSwxNiBAQCBzdGF0aWMgZW51bSBpbnRlbF9wY2ggaW50ZWxfdmlydF9k ZXRlY3RfcGNoKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJICogbWFrZSBhbiBlZHVjYXRlZCBn dWVzcyBhcyB0byB3aGljaCBQQ0ggaXMgcmVhbGx5IHRoZXJlLgogCSAqLwogCi0JaWYgKElTX0dF TjUoZGV2KSkgeworCWlmIChJU19HRU41KGRldl9wcml2KSkgewogCQlyZXQgPSBQQ0hfSUJYOwog CQlEUk1fREVCVUdfS01TKCJBc3N1bWluZyBJYmV4IFBlYWsgUENIXG4iKTsKLQl9IGVsc2UgaWYg KElTX0dFTjYoZGV2KSB8fCBJU19JVllCUklER0UoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfR0VO NihkZXZfcHJpdikgfHwgSVNfSVZZQlJJREdFKGRldl9wcml2KSkgewogCQlyZXQgPSBQQ0hfQ1BU OwogCQlEUk1fREVCVUdfS01TKCJBc3N1bWluZyBDb3VhclBvaW50IFBDSFxuIik7Ci0JfSBlbHNl IGlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpIHsKKwl9IGVsc2UgaWYg KElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKIAkJcmV0 ID0gUENIX0xQVDsKIAkJRFJNX0RFQlVHX0tNUygiQXNzdW1pbmcgTHlueFBvaW50IFBDSFxuIik7 Ci0JfSBlbHNlIGlmIChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkgeworCX0g ZWxzZSBpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7 CiAJCXJldCA9IFBDSF9TUFQ7CiAJCURSTV9ERUJVR19LTVMoIkFzc3VtaW5nIFN1bnJpc2VQb2lu dCBQQ0hcbiIpOwogCX0KQEAgLTE3OCwxMiArMTc4LDE0IEBAIHN0YXRpYyB2b2lkIGludGVsX2Rl dGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5U RUxfUENIX0NQVF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBD SF9DUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgQ291Z2FyUG9pbnQgUENIXG4iKTsKLQkJ CQlXQVJOX09OKCEoSVNfR0VONihkZXYpIHx8IElTX0lWWUJSSURHRShkZXYpKSk7CisJCQkJV0FS Tl9PTighKElTX0dFTjYoZGV2X3ByaXYpIHx8CisJCQkJCUlTX0lWWUJSSURHRShkZXZfcHJpdikp KTsKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX1BQVF9ERVZJQ0VfSURfVFlQRSkgewog CQkJCS8qIFBhbnRoZXJQb2ludCBpcyBDUFQgY29tcGF0aWJsZSAqLwogCQkJCWRldl9wcml2LT5w Y2hfdHlwZSA9IFBDSF9DUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgUGFudGhlclBvaW50 IFBDSFxuIik7Ci0JCQkJV0FSTl9PTighKElTX0dFTjYoZGV2KSB8fCBJU19JVllCUklER0UoZGV2 KSkpOworCQkJCVdBUk5fT04oIShJU19HRU42KGRldl9wcml2KSB8fAorCQkJCQlJU19JVllCUklE R0UoZGV2X3ByaXYpKSk7CiAJCQl9IGVsc2UgaWYgKGlkID09IElOVEVMX1BDSF9MUFRfREVWSUNF X0lEX1RZUEUpIHsKIAkJCQlkZXZfcHJpdi0+cGNoX3R5cGUgPSBQQ0hfTFBUOwogCQkJCURSTV9E RUJVR19LTVMoIkZvdW5kIEx5bnhQb2ludCBQQ0hcbiIpOwpAQCAtMjE3LDcgKzIxOSw4IEBAIHN0 YXRpYyB2b2lkIGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCQkJ ICAgIFBDSV9TVUJWRU5ET1JfSURfUkVESEFUX1FVTVJBTkVUICYmCiAJCQkJICAgIHBjaC0+c3Vi c3lzdGVtX2RldmljZSA9PQogCQkJCQkgICAgUENJX1NVQkRFVklDRV9JRF9RRU1VKSkgewotCQkJ CWRldl9wcml2LT5wY2hfdHlwZSA9IGludGVsX3ZpcnRfZGV0ZWN0X3BjaChkZXYpOworCQkJCWRl dl9wcml2LT5wY2hfdHlwZSA9CisJCQkJCWludGVsX3ZpcnRfZGV0ZWN0X3BjaChkZXZfcHJpdik7 CiAJCQl9IGVsc2UKIAkJCQljb250aW51ZTsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXgg YzA1ZDVjOGI2NDQ5Li43YWExYjhkNmIzOTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAt MjY1MSw3ICsyNjUxLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIElT X1BJTkVWSUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfcGluZXZpZXcpCiAjZGVmaW5lIElT X0czMyhkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19nMzMpCiAjZGVmaW5lIElTX0lST05MQUtF X00oZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMDQ2KQotI2RlZmluZSBJ U19JVllCUklER0UoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19pdnlicmlkZ2UpCisjZGVmaW5l IElTX0lWWUJSSURHRShkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfaXZ5YnJpZGdlKQog I2RlZmluZSBJU19JVkJfR1QxKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4 MDE1NiB8fCBcCiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwgXAogCQkJ CSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTVhKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMK aW5kZXggZWQyNDkwN2VkNDcxLi5hZWQ0ZDI4YWI3MWUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0u YwpAQCAtNDQzMiw3ICs0NDMyLDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2KQogCQkJICAgTE9XRVJfU0xJQ0VfRU5BQkxFRCA6IExPV0VSX1NMSUNFX0RJU0FCTEVE KTsKIAogCWlmIChIQVNfUENIX05PUChkZXZfcHJpdikpIHsKLQkJaWYgKElTX0lWWUJSSURHRShk ZXYpKSB7CisJCWlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKSB7CiAJCQl1MzIgdGVtcCA9IEk5 MTVfUkVBRChHRU43X01TR19DVEwpOwogCQkJdGVtcCAmPSB+KFdBSVRfRk9SX1BDSF9GTFJfQUNL IHwgV0FJVF9GT1JfUENIX1JFU0VUX0FDSyk7CiAJCQlJOTE1X1dSSVRFKEdFTjdfTVNHX0NUTCwg dGVtcCk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250ZXh0LmMKaW5kZXggNDgxZWM0 M2Y4MTgwLi41ZGNhMzJhYzFjNjcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX2NvbnRleHQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9jb250 ZXh0LmMKQEAgLTE5Miw3ICsxOTIsNyBAQCBpOTE1X2dlbV9hbGxvY19jb250ZXh0X29iaihzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LCBzaXplX3Qgc2l6ZSkKIAkgKiBUaGlzIGlzIG9ubHkgYXBwbGlj YWJsZSBmb3IgSXZ5IEJyaWRnZSBkZXZpY2VzIHNpbmNlCiAJICogbGF0ZXIgcGxhdGZvcm1zIGRv bid0IGhhdmUgTDMgY29udHJvbCBiaXRzIGluIHRoZSBQVEUuCiAJICovCi0JaWYgKElTX0lWWUJS SURHRShkZXYpKSB7CisJaWYgKElTX0lWWUJSSURHRSh0b19pOTE1KGRldikpKSB7CiAJCXJldCA9 IGk5MTVfZ2VtX29iamVjdF9zZXRfY2FjaGVfbGV2ZWwob2JqLCBJOTE1X0NBQ0hFX0wzX0xMQyk7 CiAJCS8qIEZhaWx1cmUgc2hvdWxkbid0IGV2ZXIgaGFwcGVuIHRoaXMgZWFybHkgKi8KIAkJaWYg KFdBUk5fT04ocmV0KSkgewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGI2 MGEzN2Y3ZGNhMS4uOTVhYjJjMDc1Y2UyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0zNzI3LDcgKzM3MjcsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9mZGlfbm9ybWFsX3Ry YWluKHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAkvKiBlbmFibGUgbm9ybWFsIHRyYWluICovCiAJ cmVnID0gRkRJX1RYX0NUTChwaXBlKTsKIAl0ZW1wID0gSTkxNV9SRUFEKHJlZyk7Ci0JaWYgKElT X0lWWUJSSURHRShkZXYpKSB7CisJaWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikpIHsKIAkJdGVt cCAmPSB+RkRJX0xJTktfVFJBSU5fTk9ORV9JVkI7CiAJCXRlbXAgfD0gRkRJX0xJTktfVFJBSU5f Tk9ORV9JVkIgfCBGRElfVFhfRU5IQU5DRV9GUkFNRV9FTkFCTEU7CiAJfSBlbHNlIHsKQEAgLTM3 NTIsNyArMzc1Miw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2ZkaV9ub3JtYWxfdHJhaW4oc3RydWN0 IGRybV9jcnRjICpjcnRjKQogCXVkZWxheSgxMDAwKTsKIAogCS8qIElWQiB3YW50cyBlcnJvciBj b3JyZWN0aW9uIGVuYWJsZWQgKi8KLQlpZiAoSVNfSVZZQlJJREdFKGRldikpCisJaWYgKElTX0lW WUJSSURHRShkZXZfcHJpdikpCiAJCUk5MTVfV1JJVEUocmVnLCBJOTE1X1JFQUQocmVnKSB8IEZE SV9GU19FUlJDX0VOQUJMRSB8CiAJCQkgICBGRElfRkVfRVJSQ19FTkFCTEUpOwogfQpAQCAtNDUz OCw3ICs0NTM4LDcgQEAgc3RhdGljIHZvaWQgaXJvbmxha2VfcGNoX2VuYWJsZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMpCiAKIAlhc3NlcnRfcGNoX3RyYW5zY29kZXJfZGlzYWJsZWQoZGV2X3ByaXYs IHBpcGUpOwogCi0JaWYgKElTX0lWWUJSSURHRShkZXYpKQorCWlmIChJU19JVllCUklER0UoZGV2 X3ByaXYpKQogCQlpdnlicmlkZ2VfdXBkYXRlX2ZkaV9iY19iaWZ1cmNhdGlvbihpbnRlbF9jcnRj KTsKIAogCS8qIFdyaXRlIHRoZSBUVSBzaXplIGJpdHMgYmVmb3JlIGZkaSBsaW5rIHRyYWluaW5n LCBzbyB0aGF0IGVycm9yCkBAIC00ODUyLDcgKzQ4NTIsNyBAQCBzdGF0aWMgdm9pZCBpcm9ubGFr ZV9wZml0X2VuYWJsZShzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YykKIAkJICogYXMgc29tZSBwcmUt cHJvZ3JhbW1lZCB2YWx1ZXMgYXJlIGJyb2tlbiwKIAkJICogZS5nLiB4MjAxLgogCQkgKi8KLQkJ aWYgKElTX0lWWUJSSURHRShkZXYpIHx8IElTX0hBU1dFTEwoZGV2KSkKKwkJaWYgKElTX0lWWUJS SURHRShkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCQlJOTE1X1dSSVRFKFBG X0NUTChwaXBlKSwgUEZfRU5BQkxFIHwgUEZfRklMVEVSX01FRF8zeDMgfAogCQkJCQkJIFBGX1BJ UEVfU0VMX0lWQihwaXBlKSk7CiAJCWVsc2UKQEAgLTEyMjQ5LDcgKzEyMjQ5LDcgQEAgc3RhdGlj IGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2NydGMgKmNydGMsCiAJCWlmIChm Yi0+bW9kaWZpZXJbMF0gIT0gb2xkX2ZiLT5tb2RpZmllclswXSkKIAkJCS8qIHZsdjogRElTUExB WV9GTElQIGZhaWxzIHRvIGNoYW5nZSB0aWxpbmcgKi8KIAkJCWVuZ2luZSA9IE5VTEw7Ci0JfSBl bHNlIGlmIChJU19JVllCUklER0UoZGV2KSB8fCBJU19IQVNXRUxMKGRldikpIHsKKwl9IGVsc2Ug aWYgKElTX0lWWUJSSURHRShkZXZfcHJpdikgfHwgSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKIAkJ ZW5naW5lID0gZGV2X3ByaXYtPmVuZ2luZVtCQ1NdOwogCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhk ZXYpLT5nZW4gPj0gNykgewogCQllbmdpbmUgPSBpOTE1X2dlbV9hY3RpdmVfZ2V0X2VuZ2luZSgm b2JqLT5sYXN0X3dyaXRlLApAQCAtMTI1MjUsNyArMTI1MjUsNyBAQCBpbnQgaW50ZWxfcGxhbmVf YXRvbWljX2NhbGNfY2hhbmdlcyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJ ICogY3N0YXRlLT51cGRhdGVfd20gd2FzIGFscmVhZHkgc2V0IGFib3ZlLCBzbyB0aGlzIGZsYWcg d2lsbAogCSAqIHRha2UgZWZmZWN0IHdoZW4gd2UgY29tbWl0IGFuZCBwcm9ncmFtIHdhdGVybWFy a3MuCiAJICovCi0JaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkgJiYg SVNfSVZZQlJJREdFKGRldikgJiYKKwlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVf T1ZFUkxBWSAmJiBJU19JVllCUklER0UoZGV2X3ByaXYpICYmCiAJICAgIG5lZWRzX3NjYWxpbmco dG9faW50ZWxfcGxhbmVfc3RhdGUocGxhbmVfc3RhdGUpKSAmJgogCSAgICAhbmVlZHNfc2NhbGlu ZyhvbGRfcGxhbmVfc3RhdGUpKQogCQlwaXBlX2NvbmZpZy0+ZGlzYWJsZV9scF93bSA9IHRydWU7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCAxNWFmNDc3ZDA5NzQuLjBiM2FiNzI1NGYwYSAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMTkxLDE0ICsyMTkxLDE1IEBAIHN0YXRpYyB2 b2lkIGludGVsX2ZpeHVwX3Nwcl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVp bnQxNl90IHdtWzVdKQogCQl3bVswXSA9IDEzOwogfQogCi1zdGF0aWMgdm9pZCBpbnRlbF9maXh1 cF9jdXJfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs1XSkK K3N0YXRpYyB2b2lkIGludGVsX2ZpeHVwX2N1cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdiwKKwkJCQkgICAgICAgdWludDE2X3Qgd21bNV0pCiB7CiAJLyogSUxL IGN1cnNvciBMUDAgbGF0ZW5jeSBpcyAxMzAwIG5zICovCi0JaWYgKElTX0dFTjUoZGV2KSkKKwlp ZiAoSVNfR0VONShkZXZfcHJpdikpCiAJCXdtWzBdID0gMTM7CiAKIAkvKiBXYURvdWJsZUN1cnNv ckxQM0xhdGVuY3k6aXZiICovCi0JaWYgKElTX0lWWUJSSURHRShkZXYpKQorCWlmIChJU19JVllC UklER0UoZGV2X3ByaXYpKQogCQl3bVszXSAqPSAyOwogfQogCkBAIC0yMjk0LDcgKzIyOTUsNyBA QCBzdGF0aWMgdm9pZCBpbGtfc2V0dXBfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCSAgICAgICBzaXplb2YoZGV2X3ByaXYtPndtLnByaV9sYXRlbmN5KSk7CiAKIAlpbnRlbF9m aXh1cF9zcHJfd21fbGF0ZW5jeShkZXYsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7Ci0JaW50 ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koZGV2LCBkZXZfcHJpdi0+d20uY3VyX2xhdGVuY3kpOwor CWludGVsX2ZpeHVwX2N1cl93bV9sYXRlbmN5KGRldl9wcml2LCBkZXZfcHJpdi0+d20uY3VyX2xh dGVuY3kpOwogCiAJaW50ZWxfcHJpbnRfd21fbGF0ZW5jeShkZXYsICJQcmltYXJ5IiwgZGV2X3By aXYtPndtLnByaV9sYXRlbmN5KTsKIAlpbnRlbF9wcmludF93bV9sYXRlbmN5KGRldiwgIlNwcml0 ZSIsIGRldl9wcml2LT53bS5zcHJfbGF0ZW5jeSk7CkBAIC0yNTIyLDcgKzI1MjMsNyBAQCBzdGF0 aWMgdm9pZCBpbGtfd21fbWVyZ2Uoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlpbnQgbGFzdF9l bmFibGVkX2xldmVsID0gbWF4X2xldmVsOwogCiAJLyogSUxLL1NOQi9JVkI6IExQMSsgd2F0ZXJt YXJrcyBvbmx5IHcvIHNpbmdsZSBwaXBlICovCi0JaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA8 PSA2IHx8IElTX0lWWUJSSURHRShkZXYpKSAmJgorCWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA8 PSA2IHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpICYmCiAJICAgIGNvbmZpZy0+bnVtX3BpcGVz X2FjdGl2ZSA+IDEpCiAJCWxhc3RfZW5hYmxlZF9sZXZlbCA9IDA7CiAKQEAgLTQ2MjUsNyArNDYy Niw3IEBAIHZvaWQgaWxrX3dtX2dldF9od19zdGF0ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CWlmIChJU19IQVNXRUxMKGRldikgfHwgSVNfQlJPQURXRUxMKGRldikpCiAJCWh3LT5wYXJ0aXRp b25pbmcgPSAoSTkxNV9SRUFEKFdNX01JU0MpICYgV01fTUlTQ19EQVRBX1BBUlRJVElPTl81XzYp ID8KIAkJCUlOVEVMX0REQl9QQVJUXzVfNiA6IElOVEVMX0REQl9QQVJUXzFfMjsKLQllbHNlIGlm IChJU19JVllCUklER0UoZGV2KSkKKwllbHNlIGlmIChJU19JVllCUklER0UoZGV2X3ByaXYpKQog CQlody0+cGFydGl0aW9uaW5nID0gKEk5MTVfUkVBRChESVNQX0FSQl9DVEwyKSAmIERJU1BfREFU QV9QQVJUSVRJT05fNV82KSA/CiAJCQlJTlRFTF9EREJfUEFSVF81XzYgOiBJTlRFTF9EREJfUEFS VF8xXzI7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNzNhNTIxZmRmMWJk Li5kMGY3OThjZTZiYjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0xMDg0 LDcgKzEwODQsNyBAQCBpbnRlbF9wbGFuZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIGVu dW0gcGlwZSBwaXBlLCBpbnQgcGxhbmUpCiAKIAljYXNlIDc6CiAJY2FzZSA4OgotCQlpZiAoSVNf SVZZQlJJREdFKGRldikpIHsKKwkJaWYgKElTX0lWWUJSSURHRSh0b19pOTE1KGRldikpKSB7CiAJ CQlpbnRlbF9wbGFuZS0+Y2FuX3NjYWxlID0gdHJ1ZTsKIAkJCWludGVsX3BsYW5lLT5tYXhfZG93 bnNjYWxlID0gMjsKIAkJfSBlbHNlIHsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK