From: Tvrtko Ursulin Subject: [CI 11/19] drm/i915: Make IS_KABYLAKE only take dev_priv Date: Thu, 13 Oct 2016 11:03:02 +0100 Message-ID: <1476352990-2504-11-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 B82366EA05 for ; Thu, 13 Oct 2016 10:03:29 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id x79so11857440lff.2 for ; Thu, 13 Oct 2016 03:03:29 -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.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:27 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDEz MjAgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKdjI6IEFkZCBwYXJhbnRoZXNlcyBhcm91bmQg ZGV2X3ByaXYuIChWaWxsZSBTeXJqYWxhKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhdmlkIFdlaW5laGFsbCA8 ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIg PGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkFja2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkFja2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMg ICAgICAgICB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVu LmMgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RkaS5jICAgICAgICB8IDE2 ICsrKysrKysrLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAg ICB8IDEwICsrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMg ICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIHwgIDIgKy0KIDggZmls ZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKaW5kZXggN2M1OTc0ZGU5ODliLi45MDc1ZDYxMWFmZGMgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwpAQCAtMjAzLDE3ICsyMDMsMTcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGV0 ZWN0X3BjaChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkJfSBlbHNlIGlmIChpZCA9PSBJTlRF TF9QQ0hfU1BUX0RFVklDRV9JRF9UWVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0gUENI X1NQVDsKIAkJCQlEUk1fREVCVUdfS01TKCJGb3VuZCBTdW5yaXNlUG9pbnQgUENIXG4iKTsKLQkJ CQlXQVJOX09OKCFJU19TS1lMQUtFKGRldikgJiYKLQkJCQkJIUlTX0tBQllMQUtFKGRldikpOwor CQkJCVdBUk5fT04oIUlTX1NLWUxBS0UoZGV2X3ByaXYpICYmCisJCQkJCSFJU19LQUJZTEFLRShk ZXZfcHJpdikpOwogCQkJfSBlbHNlIGlmIChpZCA9PSBJTlRFTF9QQ0hfU1BUX0xQX0RFVklDRV9J RF9UWVBFKSB7CiAJCQkJZGV2X3ByaXYtPnBjaF90eXBlID0gUENIX1NQVDsKIAkJCQlEUk1fREVC VUdfS01TKCJGb3VuZCBTdW5yaXNlUG9pbnQgTFAgUENIXG4iKTsKLQkJCQlXQVJOX09OKCFJU19T S1lMQUtFKGRldikgJiYKLQkJCQkJIUlTX0tBQllMQUtFKGRldikpOworCQkJCVdBUk5fT04oIUlT X1NLWUxBS0UoZGV2X3ByaXYpICYmCisJCQkJCSFJU19LQUJZTEFLRShkZXZfcHJpdikpOwogCQkJ fSBlbHNlIGlmIChpZCA9PSBJTlRFTF9QQ0hfS0JQX0RFVklDRV9JRF9UWVBFKSB7CiAJCQkJZGV2 X3ByaXYtPnBjaF90eXBlID0gUENIX0tCUDsKIAkJCQlEUk1fREVCVUdfS01TKCJGb3VuZCBLYWJ5 UG9pbnQgUENIXG4iKTsKLQkJCQlXQVJOX09OKCFJU19LQUJZTEFLRShkZXYpKTsKKwkJCQlXQVJO X09OKCFJU19LQUJZTEFLRShkZXZfcHJpdikpOwogCQkJfSBlbHNlIGlmICgoaWQgPT0gSU5URUxf UENIX1AyWF9ERVZJQ0VfSURfVFlQRSkgfHwKIAkJCQkgICAoaWQgPT0gSU5URUxfUENIX1AzWF9E RVZJQ0VfSURfVFlQRSkgfHwKIAkJCQkgICAoKGlkID09IElOVEVMX1BDSF9RRU1VX0RFVklDRV9J RF9UWVBFKSAmJgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOGNhN2VhNGVlZmFjLi4xNzAw NTc4ZDVkZGIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjY2OCw3ICsyNjY4LDcgQEAg c3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAjZGVmaW5lIElTX0JST0FEV0VMTChkZXZfcHJp dikJKChkZXZfcHJpdiktPmluZm8uaXNfYnJvYWR3ZWxsKQogI2RlZmluZSBJU19TS1lMQUtFKGRl dikJKElOVEVMX0lORk8oZGV2KS0+aXNfc2t5bGFrZSkKICNkZWZpbmUgSVNfQlJPWFRPTihkZXYp CQkoSU5URUxfSU5GTyhkZXYpLT5pc19icm94dG9uKQotI2RlZmluZSBJU19LQUJZTEFLRShkZXYp CShJTlRFTF9JTkZPKGRldiktPmlzX2thYnlsYWtlKQorI2RlZmluZSBJU19LQUJZTEFLRShkZXZf cHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfa2FieWxha2UpCiAjZGVmaW5lIElTX01PQklMRShk ZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19tb2JpbGUpCiAjZGVmaW5lIElTX0hTV19FQVJMWV9T RFYoZGV2X3ByaXYpIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBcCiAJCQkJICAgIChJTlRFTF9E RVZJRChkZXZfcHJpdikgJiAweEZGMDApID09IDB4MEMwMCkKQEAgLTI3MzUsOCArMjczNSw4IEBA IHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBLQkxfUkVWSURfRDAJCTB4Mwog I2RlZmluZSBLQkxfUkVWSURfRTAJCTB4NAogCi0jZGVmaW5lIElTX0tCTF9SRVZJRChwLCBzaW5j ZSwgdW50aWwpIFwKLQkoSVNfS0FCWUxBS0UocCkgJiYgSVNfUkVWSUQocCwgc2luY2UsIHVudGls KSkKKyNkZWZpbmUgSVNfS0JMX1JFVklEKGRldl9wcml2LCBzaW5jZSwgdW50aWwpIFwKKwkoSVNf S0FCWUxBS0UoZGV2X3ByaXYpICYmIElTX1JFVklEKGRldl9wcml2LCBzaW5jZSwgdW50aWwpKQog CiAvKgogICogVGhlIGdlblggZGVzaWduYXRpb24gdHlwaWNhbGx5IHJlZmVycyB0byB0aGUgcmVu ZGVyIGVuZ2luZSwgc28gcmVuZGVyCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5j CmluZGV4IGNiZWE2ZmI4M2NlNS4uMzUwODEyMGI4YzkwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2dlbV9zdG9sZW4uYwpAQCAtNDU2LDcgKzQ1Niw3IEBAIGludCBpOTE1X2dlbV9pbml0X3N0 b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlicmVhazsKIAlkZWZhdWx0OgogCQlpZiAo SVNfQlJPQURXRUxMKGRldl9wcml2KSB8fAotCQkgICAgSVNfU0tZTEFLRShkZXZfcHJpdikgfHwg SVNfS0FCWUxBS0UoZGV2KSkKKwkJICAgIElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllM QUtFKGRldl9wcml2KSkKIAkJCWJkd19nZXRfc3RvbGVuX3Jlc2VydmVkKGRldl9wcml2LCAmcmVz ZXJ2ZWRfYmFzZSwKIAkJCQkJCSZyZXNlcnZlZF9zaXplKTsKIAkJZWxzZQpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kZGkuYwppbmRleCBjZDcxMjhiODliNGQuLjA3MTY0ZTI1MGFkZiAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGRpLmMKQEAgLTEwMjAsMTMgKzEwMjAsMTMgQEAgc3RhdGljIHZvaWQgYnh0X2Rk aV9jbG9ja19nZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiB2b2lkIGludGVsX2Rk aV9jbG9ja19nZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgc3RydWN0IGlu dGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYg PSBlbmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdl biA8PSA4KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDgpCiAJCWhzd19kZGlfY2xvY2tf Z2V0KGVuY29kZXIsIHBpcGVfY29uZmlnKTsKLQllbHNlIGlmIChJU19TS1lMQUtFKGRldikgfHwg SVNfS0FCWUxBS0UoZGV2KSkKKwllbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19L QUJZTEFLRShkZXZfcHJpdikpCiAJCXNrbF9kZGlfY2xvY2tfZ2V0KGVuY29kZXIsIHBpcGVfY29u ZmlnKTsKLQllbHNlIGlmIChJU19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJPWFRPTihk ZXZfcHJpdikpCiAJCWJ4dF9kZGlfY2xvY2tfZ2V0KGVuY29kZXIsIHBpcGVfY29uZmlnKTsKIH0K IApAQCAtMTA4MSwxNCArMTA4MSwxNCBAQCBieHRfZGRpX3BsbF9zZWxlY3Qoc3RydWN0IGludGVs X2NydGMgKmludGVsX2NydGMsCiBib29sIGludGVsX2RkaV9wbGxfc2VsZWN0KHN0cnVjdCBpbnRl bF9jcnRjICppbnRlbF9jcnRjLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19z dGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFzZS5kZXY7 CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRlbF9jcnRj LT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIgPQogCQlp bnRlbF9kZGlfZ2V0X2NydGNfbmV3X2VuY29kZXIoY3J0Y19zdGF0ZSk7CiAKLQlpZiAoSVNfU0tZ TEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpCisJaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYp IHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkKIAkJcmV0dXJuIHNrbF9kZGlfcGxsX3NlbGVjdChp bnRlbF9jcnRjLCBjcnRjX3N0YXRlLAogCQkJCQkgIGludGVsX2VuY29kZXIpOwotCWVsc2UgaWYg KElTX0JST1hUT04oZGV2KSkKKwllbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkKIAkJcmV0 dXJuIGJ4dF9kZGlfcGxsX3NlbGVjdChpbnRlbF9jcnRjLCBjcnRjX3N0YXRlLAogCQkJCQkgIGlu dGVsX2VuY29kZXIpOwogCWVsc2UKQEAgLTE3NDIsNyArMTc0Miw3IEBAIHN0YXRpYyB2b2lkIGlu dGVsX2RkaV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIs CiAJCWludGVsX2VkcF9wYW5lbF9vZmYoaW50ZWxfZHApOwogCX0KIAotCWlmIChJU19TS1lMQUtF KGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwlpZiAoSVNfU0tZTEFLRShkZXZfcHJpdikgfHwg SVNfS0FCWUxBS0UoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKERQTExfQ1RSTDIsIChJOTE1X1JF QUQoRFBMTF9DVFJMMikgfAogCQkJCQlEUExMX0NUUkwyX0RESV9DTEtfT0ZGKHBvcnQpKSk7CiAJ ZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCmluZGV4IDRiNzY4MTliZTI0MC4uMmM3ODk5MDAwYjc0IDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01ODI4LDcgKzU4MjgsNyBAQCBzdGF0aWMgdm9pZCBp bnRlbF91cGRhdGVfbWF4X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCi0JaWYgKElTX1NL WUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKSB7CisJaWYgKElTX1NLWUxBS0UoZGV2X3By aXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewogCQl1MzIgbGltaXQgPSBJOTE1X1JFQUQo U0tMX0RGU00pICYgU0tMX0RGU01fQ0RDTEtfTElNSVRfTUFTSzsKIAkJaW50IG1heF9jZGNsaywg dmNvOwogCkBAIC0xMDY0Niw3ICsxMDY0Niw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfZ2V0X2Rk aV9wb3J0X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCiAJcG9ydCA9ICh0bXAgJiBU UkFOU19ERElfUE9SVF9NQVNLKSA+PiBUUkFOU19ERElfUE9SVF9TSElGVDsKIAotCWlmIChJU19T S1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwlpZiAoSVNfU0tZTEFLRShkZXZfcHJp dikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQogCQlza3lsYWtlX2dldF9kZGlfcGxsKGRldl9w cml2LCBwb3J0LCBwaXBlX2NvbmZpZyk7CiAJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKQogCQli eHRfZ2V0X2RkaV9wbGwoZGV2X3ByaXYsIHBvcnQsIHBpcGVfY29uZmlnKTsKQEAgLTEyODIxLDcg KzEyODIxLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLnBsbDks CiAJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5wbGwxMCwKIAkJCSAgICAgIHBp cGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLnBjc2R3MTIpOwotCX0gZWxzZSBpZiAoSVNfU0tZTEFL RShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1NLWUxBS0UoZGV2 X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewogCQlEUk1fREVCVUdfS01TKCJkcGxs X2h3X3N0YXRlOiAiCiAJCQkgICAgICAiY3RybDE6IDB4JXgsIGNmZ2NyMTogMHgleCwgY2ZnY3Iy OiAweCV4XG4iLAogCQkJICAgICAgcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuY3RybDEsCkBA IC0xNTQyMCw3ICsxNTQyMCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1dHMoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAkJICovCiAJCWZvdW5kID0gSTkxNV9SRUFEKERESV9CVUZf Q1RMKFBPUlRfQSkpICYgRERJX0lOSVRfRElTUExBWV9ERVRFQ1RFRDsKIAkJLyogV2FJZ25vcmVE RElBU3RyYXA6IHNrbCAqLwotCQlpZiAoZm91bmQgfHwgSVNfU0tZTEFLRShkZXYpIHx8IElTX0tB QllMQUtFKGRldikpCisJCWlmIChmb3VuZCB8fCBJU19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19L QUJZTEFLRShkZXZfcHJpdikpCiAJCQlpbnRlbF9kZGlfaW5pdChkZXYsIFBPUlRfQSk7CiAKIAkJ LyogRERJIEIsIEMgYW5kIEQgZGV0ZWN0aW9uIGlzIGluZGljYXRlZCBieSB0aGUgU0ZVU0VfU1RS QVAKQEAgLTE1NDM2LDcgKzE1NDM2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0 cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkvKgogCQkgKiBPbiBTS0wgd2UgZG9uJ3QgaGF2 ZSBhIHdheSB0byBkZXRlY3QgRERJLUUgc28gd2UgcmVseSBvbiBWQlQuCiAJCSAqLwotCQlpZiAo KElTX1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKSAmJgorCQlpZiAoKElTX1NLWUxB S0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgJiYKIAkJICAgIChkZXZfcHJp di0+dmJ0LmRkaV9wb3J0X2luZm9bUE9SVF9FXS5zdXBwb3J0c19kcCB8fAogCQkgICAgIGRldl9w cml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0VdLnN1cHBvcnRzX2R2aSB8fAogCQkgICAgIGRl dl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0VdLnN1cHBvcnRzX2hkbWkpKQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyBiL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKaW5kZXggYzM3Y2UxMjYzMTQyLi43Y2Y5ZDkxYzA3 NDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwpAQCAtMTg1MSw3ICsxODUx LDcgQEAgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJY29uc3Qgc3RydWN0IGRwbGxfaW5mbyAqZHBsbF9pbmZvOwogCWludCBpOwogCi0JaWYgKElT X1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKQorCWlmIChJU19TS1lMQUtFKGRldl9w cml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCWRwbGxfbWdyID0gJnNrbF9wbGxfbWdy OwogCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKIAkJZHBsbF9tZ3IgPSAmYnh0X3BsbF9tZ3I7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggN2FjZTk2YmU4MmE4 Li4zYzQ2NjA1YjU4ZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1 Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMK QEAgLTczNCw3ICs3MzQsNyBAQCB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJCWZ3X3BhdGggPSBJOTE1X0JYVF9HVUNfVUNPREU7CiAJCWd1Y19mdy0+Z3VjX2Z3 X21ham9yX3dhbnRlZCA9IEJYVF9GV19NQUpPUjsKIAkJZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2Fu dGVkID0gQlhUX0ZXX01JTk9SOwotCX0gZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2KSkgeworCX0g ZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1X0tCTF9H VUNfVUNPREU7CiAJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCA9IEtCTF9GV19NQUpPUjsK IAkJZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkID0gS0JMX0ZXX01JTk9SOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IDc3ZWYwM2NiNjE2My4uMDI1ZmJkNTIy ODE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMK KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0yNTk0LDcg KzI1OTQsNyBAQCB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wgcmVzdW1lKQogCiAJcG93ZXJfZG9tYWlucy0+aW5p dGlhbGl6aW5nID0gdHJ1ZTsKIAotCWlmIChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0Uo ZGV2KSkgeworCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJp dikpIHsKIAkJc2tsX2Rpc3BsYXlfY29yZV9pbml0KGRldl9wcml2LCByZXN1bWUpOwogCX0gZWxz ZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CiAJCWJ4dF9kaXNwbGF5X2NvcmVfaW5pdChkZXZfcHJp diwgcmVzdW1lKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK