From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 17/19] drm/i915: Make IS_VALLEYVIEW only take dev_priv Date: Tue, 11 Oct 2016 14:21:50 +0100 Message-ID: <1476192112-25336-18-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1476192112-25336-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-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 222936E66D for ; Tue, 11 Oct 2016 13:22:25 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id z190so1382889qkc.3 for ; Tue, 11 Oct 2016 06:22:25 -0700 (PDT) In-Reply-To: <1476192112-25336-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDk0 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIDEyOCBieXRlcyBvZiAudGV4dC4KCnYyOiBB ZGQgcGFyYW50aGVzZXMgYXJvdW5kIGRldl9wcml2LiAoVmlsbGUgU3lyamFsYSkKClNpZ25lZC1v ZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgMiArLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9ncHVfZXJyb3IuYyAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9j cnQuYyAgICAgICAgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jICAgIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAg ICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgICB8 IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgICB8IDIgKy0KIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8IDMgKy0tCiA5IGZpbGVzIGNo YW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCmluZGV4IDk2ODQ2ZWNmYzIyNC4uZjlmOWEyMThkNWZlIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKQEAgLTI2NTksNyArMjY1OSw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUg ewogI2RlZmluZSBJU19JVkJfR1QxKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09 IDB4MDE1NiB8fCBcCiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwgXAog CQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTVhKQotI2RlZmluZSBJU19WQUxMRVlW SUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfdmFsbGV5dmlldykKKyNkZWZpbmUgSVNfVkFM TEVZVklFVyhkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfdmFsbGV5dmlldykKICNkZWZp bmUgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfY2hlcnJ5dmll dykKICNkZWZpbmUgSVNfSEFTV0VMTChkZXZfcHJpdikJKChkZXZfcHJpdiktPmluZm8uaXNfaGFz d2VsbCkKICNkZWZpbmUgSVNfQlJPQURXRUxMKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5p c19icm9hZHdlbGwpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9m ZW5jZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYwppbmRleCA4ZGYx ZmE3MjM0ZTguLmQyNjc2ODU2NzI1MiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW1fZmVuY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9mZW5j ZS5jCkBAIC00NDgsNyArNDQ4LDcgQEAgaTkxNV9nZW1fZGV0ZWN0X2JpdF82X3N3aXp6bGUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldikKIAl1aW50MzJfdCBzd2l6emxlX3ggPSBJOTE1X0JJVF82X1NX SVpaTEVfVU5LTk9XTjsKIAl1aW50MzJfdCBzd2l6emxlX3kgPSBJOTE1X0JJVF82X1NXSVpaTEVf VU5LTk9XTjsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA4IHx8IElTX1ZBTExFWVZJ RVcoZGV2KSkgeworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDggfHwgSVNfVkFMTEVZVklF VyhkZXZfcHJpdikpIHsKIAkJLyoKIAkJICogT24gQkRXKywgc3dpenpsaW5nIGlzIG5vdCB1c2Vk LiBXZSBsZWF2ZSB0aGUgQ1BVIG1lbW9yeQogCQkgKiBjb250cm9sbGVyIGluIGNoYXJnZSBvZiBv cHRpbWl6aW5nIG1lbW9yeSBhY2Nlc3NlcyB3aXRob3V0CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9n cHVfZXJyb3IuYwppbmRleCBkNDE1MTdlMTE5NzguLjZlYjExZmQzMjZmZCAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC0xMzQ5LDcgKzEzNDksNyBAQCBzdGF0aWMgdm9p ZCBpOTE1X2NhcHR1cmVfcmVnX3N0YXRlKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp diwKIAkgKi8KIAogCS8qIDE6IFJlZ2lzdGVycyBzcGVjaWZpYyB0byBhIHNpbmdsZSBnZW5lcmF0 aW9uICovCi0JaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgeworCWlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSkgewogCQllcnJvci0+Z3RpZXJbMF0gPSBJOTE1X1JFQUQoR1RJRVIpOwogCQllcnJv ci0+aWVyID0gSTkxNV9SRUFEKFZMVl9JRVIpOwogCQllcnJvci0+Zm9yY2V3YWtlID0gSTkxNV9S RUFEX0ZXKEZPUkNFV0FLRV9WTFYpOwpAQCAtMTM5OCw3ICsxMzk4LDcgQEAgc3RhdGljIHZvaWQg aTkxNV9jYXB0dXJlX3JlZ19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs CiAJCWVycm9yLT5ndGllclswXSA9IEk5MTVfUkVBRChHVElFUik7CiAJfSBlbHNlIGlmIChJU19H RU4yKGRldikpIHsKIAkJZXJyb3ItPmllciA9IEk5MTVfUkVBRDE2KElFUik7Ci0JfSBlbHNlIGlm ICghSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmICghSVNfVkFMTEVZVklFVyhkZXZf cHJpdikpIHsKIAkJZXJyb3ItPmllciA9IEk5MTVfUkVBRChJRVIpOwogCX0KIAllcnJvci0+ZWly ID0gSTkxNV9SRUFEKEVJUik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCmluZGV4IGQ0NTY3ODZm NTgxMy4uZDkyYzNlZGYxMGZmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jcnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwpAQCAtMjUzLDcg KzI1Myw3IEBAIGludGVsX2NydF9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25u ZWN0b3IsCiAKIAlpZiAoSEFTX1BDSF9MUFQoZGV2X3ByaXYpKQogCQltYXhfY2xvY2sgPSAxODAw MDA7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX1ZBTExFWVZJ RVcoZGV2X3ByaXYpKQogCQkvKgogCQkgKiAyNzAgTUh6IGR1ZSB0byBjdXJyZW50IERQTEwgbGlt aXRzLAogCQkgKiBEQUMgbGltaXQgc3VwcG9zZWRseSAzNTUgTUh6LgpAQCAtNDIzLDcgKzQyMyw3 IEBAIHN0YXRpYyBib29sIGludGVsX2NydF9kZXRlY3RfaG90cGx1ZyhzdHJ1Y3QgZHJtX2Nvbm5l Y3RvciAqY29ubmVjdG9yKQogCWlmIChIQVNfUENIX1NQTElUKGRldl9wcml2KSkKIAkJcmV0dXJu IGludGVsX2lyb25sYWtlX2NydF9kZXRlY3RfaG90cGx1Zyhjb25uZWN0b3IpOwogCi0JaWYgKElT X1ZBTExFWVZJRVcoZGV2KSkKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpCiAJCXJldHVy biB2YWxsZXl2aWV3X2NydF9kZXRlY3RfaG90cGx1Zyhjb25uZWN0b3IpOwogCiAJLyoKQEAgLTg1 MCw3ICs4NTAsNyBAQCB2b2lkIGludGVsX2NydF9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAKIAlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCWFkcGFfcmVnID0gUENIX0FEUEE7 Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQorCWVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpKQogCQlhZHBhX3JlZyA9IFZMVl9BRFBBOwogCWVsc2UKIAkJYWRwYV9yZWcgPSBB RFBBOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGQ2MWExMmRiYmQ3Mi4u YzNmYjlmNzAwYzdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01ODc2 LDcgKzU4NzYsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF91cGRhdGVfbWF4X2NkY2xrKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2ZyZXEgPSA2NzUwMDA7CiAJ fSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWF4X2Nk Y2xrX2ZyZXEgPSAzMjAwMDA7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKKwl9 IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5tYXhfY2Rj bGtfZnJlcSA9IDQwMDAwMDsKIAl9IGVsc2UgewogCQkvKiBvdGhlcndpc2UgYXNzdW1lIGNkY2xr IGlzIGZpeGVkICovCkBAIC02ODQwLDcgKzY4NDAsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NydGNf ZGlzYWJsZShzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqb2xkX2NydGNfc3RhdGUsCiAJaWYgKCFp bnRlbF9jcnRjX2hhc190eXBlKGludGVsX2NydGMtPmNvbmZpZywgSU5URUxfT1VUUFVUX0RTSSkp IHsKIAkJaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQogCQkJY2h2X2Rpc2FibGVfcGxsKGRl dl9wcml2LCBwaXBlKTsKLQkJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKQorCQllbHNlIGlm IChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkKIAkJCXZsdl9kaXNhYmxlX3BsbChkZXZfcHJpdiwg cGlwZSk7CiAJCWVsc2UKIAkJCWk5eHhfZGlzYWJsZV9wbGwoaW50ZWxfY3J0Yyk7CkBAIC04OTA2 LDcgKzg5MDYsNyBAQCBzdGF0aWMgYm9vbCBpOXh4X2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAogCWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJY2h2X2Ny dGNfY2xvY2tfZ2V0KGNydGMsIHBpcGVfY29uZmlnKTsKLQllbHNlIGlmIChJU19WQUxMRVlWSUVX KGRldikpCisJZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpCiAJCXZsdl9jcnRjX2Ns b2NrX2dldChjcnRjLCBwaXBlX2NvbmZpZyk7CiAJZWxzZQogCQlpOXh4X2NydGNfY2xvY2tfZ2V0 KGNydGMsIHBpcGVfY29uZmlnKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RwLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCmluZGV4IDFlMWNjZjA5 MmUxMS4uYTJjNGQ1YTBiNzA0IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kcC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKQEAgLTEzNTAsNyAr MTM1MCw3IEBAIGludGVsX2RwX3NldF9jbG9jayhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2Rl ciwKIAl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWRpdmlzb3IgPSBj aHZfZHBsbDsKIAkJY291bnQgPSBBUlJBWV9TSVpFKGNodl9kcGxsKTsKLQl9IGVsc2UgaWYgKElT X1ZBTExFWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikp IHsKIAkJZGl2aXNvciA9IHZsdl9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUodmx2X2RwbGwp OwogCX0KQEAgLTE3OTAsNyArMTc5MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RwX3ByZXBhcmUo c3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQl0cmFuc19kcCAmPSB+VFJBTlNfRFBf RU5IX0ZSQU1JTkc7CiAJCUk5MTVfV1JJVEUoVFJBTlNfRFBfQ1RMKGNydGMtPnBpcGUpLCB0cmFu c19kcCk7CiAJfSBlbHNlIHsKLQkJaWYgKCFIQVNfUENIX1NQTElUKGRldl9wcml2KSAmJiAhSVNf VkFMTEVZVklFVyhkZXYpICYmCisJCWlmICghSEFTX1BDSF9TUExJVChkZXZfcHJpdikgJiYgIUlT X1ZBTExFWVZJRVcoZGV2X3ByaXYpICYmCiAJCSAgICAhSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikg JiYKIAkJICAgIHBpcGVfY29uZmlnLT5saW1pdGVkX2NvbG9yX3JhbmdlKQogCQkJaW50ZWxfZHAt PkRQIHw9IERQX0NPTE9SX1JBTkdFXzE2XzIzNTsKQEAgLTMzNTEsNyArMzM1MSw3IEBAIGludGVs X2RwX3NldF9zaWduYWxfbGV2ZWxzKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJCQltYXNr ID0gRERJX0JVRl9FTVBfTUFTSzsKIAl9IGVsc2UgaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYp KSB7CiAJCXNpZ25hbF9sZXZlbHMgPSBjaHZfc2lnbmFsX2xldmVscyhpbnRlbF9kcCk7Ci0JfSBl bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpKSB7CiAJCXNpZ25hbF9sZXZlbHMgPSB2bHZfc2lnbmFsX2xldmVscyhpbnRlbF9k cCk7CiAJfSBlbHNlIGlmIChJU19HRU43KGRldikgJiYgcG9ydCA9PSBQT1JUX0EpIHsKIAkJc2ln bmFsX2xldmVscyA9IGdlbjdfZWRwX3NpZ25hbF9sZXZlbHModHJhaW5fc2V0KTsKQEAgLTU4MDEs NyArNTgwMSw3IEBAIGJvb2wgaW50ZWxfZHBfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAog CQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2RwOwogCQlpbnRlbF9lbmNvZGVy LT5wb3N0X2Rpc2FibGUgPSBjaHZfcG9zdF9kaXNhYmxlX2RwOwogCQlpbnRlbF9lbmNvZGVyLT5w b3N0X3BsbF9kaXNhYmxlID0gY2h2X2RwX3Bvc3RfcGxsX2Rpc2FibGU7Ci0JfSBlbHNlIGlmIChJ U19WQUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYp KSB7CiAJCWludGVsX2VuY29kZXItPnByZV9wbGxfZW5hYmxlID0gdmx2X2RwX3ByZV9wbGxfZW5h YmxlOwogCQlpbnRlbF9lbmNvZGVyLT5wcmVfZW5hYmxlID0gdmx2X3ByZV9lbmFibGVfZHA7CiAJ CWludGVsX2VuY29kZXItPmVuYWJsZSA9IHZsdl9lbmFibGVfZHA7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9oZG1pLmMKaW5kZXggYzgyNDNkYzRkMmI5Li41MDEzMzQyNDJkMzggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9oZG1pLmMKQEAgLTE5NjUsNyArMTk2NSw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0 KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCWludGVsX2VuY29kZXItPmVuYWJsZSA9IHZsdl9l bmFibGVfaGRtaTsKIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9kaXNhYmxlID0gY2h2X2hkbWlfcG9z dF9kaXNhYmxlOwogCQlpbnRlbF9lbmNvZGVyLT5wb3N0X3BsbF9kaXNhYmxlID0gY2h2X2hkbWlf cG9zdF9wbGxfZGlzYWJsZTsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgeworCX0g ZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJpdikpIHsKIAkJaW50ZWxfZW5jb2Rlci0+cHJl X3BsbF9lbmFibGUgPSB2bHZfaGRtaV9wcmVfcGxsX2VuYWJsZTsKIAkJaW50ZWxfZW5jb2Rlci0+ cHJlX2VuYWJsZSA9IHZsdl9oZG1pX3ByZV9lbmFibGU7CiAJCWludGVsX2VuY29kZXItPmVuYWJs ZSA9IHZsdl9lbmFibGVfaGRtaTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDIxMDc0MzRh NDJlNC4uOWJhZmZhZTRmOWY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTc3NTgsNyAr Nzc1OCw3IEBAIHZvaWQgaW50ZWxfaW5pdF9wbShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCX0g ZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJdmx2X3NldHVwX3dtX2xhdGVu Y3koZGV2KTsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gdmx2X3VwZGF0ZV93bTsK LQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoSVNfVkFMTEVZ VklFVyhkZXZfcHJpdikpIHsKIAkJdmx2X3NldHVwX3dtX2xhdGVuY3koZGV2KTsKIAkJZGV2X3By aXYtPmRpc3BsYXkudXBkYXRlX3dtID0gdmx2X3VwZGF0ZV93bTsKIAl9IGVsc2UgaWYgKElTX1BJ TkVWSUVXKGRldikpIHsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1 bnRpbWVfcG0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYwppbmRl eCAzYTZlMWE5M2FlZDkuLmVlNTZhODc1NmMwNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3J1bnRpbWVfcG0uYwpAQCAtMjU4OSw3ICsyNTg5LDYgQEAgc3RhdGljIHZvaWQgdmx2X2Ntbmxh bmVfd2Eoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogICovCiB2b2lkIGludGVs X3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYs IGJvb2wgcmVzdW1lKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRy bTsKIAlzdHJ1Y3QgaTkxNV9wb3dlcl9kb21haW5zICpwb3dlcl9kb21haW5zID0gJmRldl9wcml2 LT5wb3dlcl9kb21haW5zOwogCiAJcG93ZXJfZG9tYWlucy0+aW5pdGlhbGl6aW5nID0gdHJ1ZTsK QEAgLTI2MDIsNyArMjYwMSw3IEBAIHZvaWQgaW50ZWxfcG93ZXJfZG9tYWluc19pbml0X2h3KHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgYm9vbCByZXN1bWUpCiAJCW11dGV4X2xv Y2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwogCQljaHZfcGh5X2NvbnRyb2xfaW5pdChkZXZfcHJp dik7CiAJCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7Ci0JfSBlbHNlIGlmIChJ U19WQUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYp KSB7CiAJCW11dGV4X2xvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwogCQl2bHZfY21ubGFuZV93 YShkZXZfcHJpdik7CiAJCW11dGV4X3VubG9jaygmcG93ZXJfZG9tYWlucy0+bG9jayk7Ci0tIAoy LjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50 ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==