From: Tvrtko Ursulin Subject: [PATCH 13/22] drm/i915: Make IS_HASWELL only take dev_priv Date: Wed, 5 Oct 2016 13:33:40 +0100 Message-ID: <1475670829-14025-14-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 9B81D6E83C for ; Wed, 5 Oct 2016 12:34:13 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id b184so24370677wma.3 for ; Wed, 05 Oct 2016 05:34:13 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDI0 MzIgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICB8ICA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8ICA0ICsrLS0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2NvbG9yLmMgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2RkaS5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMgfCAyMyArKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMgICAgIHwgIDYgKysrLS0tCiA5IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMo KyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGIzY2ZlZWJl YzgwNi4uYzUzNTM1OGRjN2ZiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NjMsNyAr MjY2Myw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCQkJCSBJTlRFTF9ERVZJRChk ZXZfcHJpdikgPT0gMHgwMTVhKQogI2RlZmluZSBJU19WQUxMRVlWSUVXKGRldikJKElOVEVMX0lO Rk8oZGV2KS0+aXNfdmFsbGV5dmlldykKICNkZWZpbmUgSVNfQ0hFUlJZVklFVyhkZXYpCShJTlRF TF9JTkZPKGRldiktPmlzX2NoZXJyeXZpZXcpCi0jZGVmaW5lIElTX0hBU1dFTEwoZGV2KQkoSU5U RUxfSU5GTyhkZXYpLT5pc19oYXN3ZWxsKQorI2RlZmluZSBJU19IQVNXRUxMKGRldl9wcml2KQko ZGV2X3ByaXYtPmluZm8uaXNfaGFzd2VsbCkKICNkZWZpbmUgSVNfQlJPQURXRUxMKGRldl9wcml2 KQkoZGV2X3ByaXYtPmluZm8uaXNfYnJvYWR3ZWxsKQogI2RlZmluZSBJU19TS1lMQUtFKGRldikJ KElOVEVMX0lORk8oZGV2KS0+aXNfc2t5bGFrZSkKICNkZWZpbmUgSVNfQlJPWFRPTihkZXYpCQko SU5URUxfSU5GTyhkZXYpLT5pc19icm94dG9uKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXgg NTA2NDgwOTQyOTQ2Li5mMTFhNjgxODk3NzQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAt NDM1Niw3ICs0MzU2LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCWlmIChIQVNfRURSQU0oZGV2KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSkKIAkJSTkx NV9XUklURShIU1dfSURJQ1IsIEk5MTVfUkVBRChIU1dfSURJQ1IpIHwgSURJSEFTSE1TSygweGYp KTsKIAotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQog CQlJOTE1X1dSSVRFKE1JX1BSRURJQ0FURV9SRVNVTFRfMiwgSVNfSFNXX0dUMyhkZXZfcHJpdikg PwogCQkJICAgTE9XRVJfU0xJQ0VfRU5BQkxFRCA6IExPV0VSX1NMSUNFX0RJU0FCTEVEKTsKIApk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCAwZjhmMDczYzU4OWMuLjMyNDZkNTFj N2I4ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE3NDYsNyArMTc0Niw3 IEBAIHN0YXRpYyB2b2lkIGdlbjdfcHBndHRfZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYp CiAJSTkxNV9XUklURShHQUNfRUNPX0JJVFMsIGVjb2JpdHMgfCBFQ09CSVRTX1BQR1RUX0NBQ0hF NjRCKTsKIAogCWVjb2NoayA9IEk5MTVfUkVBRChHQU1fRUNPQ0hLKTsKLQlpZiAoSVNfSEFTV0VM TChkZXYpKSB7CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWVjb2NoayB8PSBFQ09D SEtfUFBHVFRfV0JfSFNXOwogCX0gZWxzZSB7CiAJCWVjb2NoayB8PSBFQ09DSEtfUFBHVFRfTExD X0lWQjsKQEAgLTIwNTgsNyArMjA1OCw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0 cnVjdCBpOTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlwcGd0dC0+YmFzZS5wdGVfZW5jb2RlID0gZ2d0 dC0+YmFzZS5wdGVfZW5jb2RlOwogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJpdikgfHwg SVNfR0VONihkZXYpKQogCQlwcGd0dC0+c3dpdGNoX21tID0gZ2VuNl9tbV9zd2l0Y2g7Ci0JZWxz ZSBpZiAoSVNfSEFTV0VMTChkZXYpKQorCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQog CQlwcGd0dC0+c3dpdGNoX21tID0gaHN3X21tX3N3aXRjaDsKIAllbHNlIGlmIChJU19HRU43KGRl dikpCiAJCXBwZ3R0LT5zd2l0Y2hfbW0gPSBnZW43X21tX3N3aXRjaDsKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2lycS5jCmluZGV4IDVmYjNiMWM5YTUyYy4uNDczMzdhYWJjMzI2IDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfaXJxLmMKQEAgLTM1OTQsOCArMzU5NCw4IEBAIHN0YXRpYyB2b2lkIGdlbjVfZ3RfaXJxX3Bv c3RpbnN0YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2X3ByaXYtPmd0X2lycV9tYXNr ID0gfjA7CiAJaWYgKEhBU19MM19EUEYoZGV2KSkgewogCQkvKiBMMyBwYXJpdHkgaW50ZXJydXB0 IGlzIGFsd2F5cyB1bm1hc2tlZC4gKi8KLQkJZGV2X3ByaXYtPmd0X2lycV9tYXNrID0gfkdUX1BB UklUWV9FUlJPUihkZXYpOwotCQlndF9pcnFzIHw9IEdUX1BBUklUWV9FUlJPUihkZXYpOworCQlk ZXZfcHJpdi0+Z3RfaXJxX21hc2sgPSB+R1RfUEFSSVRZX0VSUk9SKGRldl9wcml2KTsKKwkJZ3Rf aXJxcyB8PSBHVF9QQVJJVFlfRVJST1IoZGV2X3ByaXYpOwogCX0KIAogCWd0X2lycXMgfD0gR1Rf UkVOREVSX1VTRVJfSU5URVJSVVBUOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggYWNjNzY3 YTUyZDhlLi44YjYxNjY5YWY2MjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMjA5NCw5 ICsyMDk0LDkgQEAgZW51bSBza2xfZGlzcF9wb3dlcl93ZWxscyB7CiAjZGVmaW5lIFBNX1ZFQk9Y X0NTX0VSUk9SX0lOVEVSUlVQVAkJKDEgPDwgMTIpIC8qIGhzdysgKi8KICNkZWZpbmUgUE1fVkVC T1hfVVNFUl9JTlRFUlJVUFQJCQkoMSA8PCAxMCkgLyogaHN3KyAqLwogCi0jZGVmaW5lIEdUX1BB UklUWV9FUlJPUihkZXYpIFwKKyNkZWZpbmUgR1RfUEFSSVRZX0VSUk9SKGRldl9wcml2KSBcCiAJ KEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBUIHwgXAotCSAoSVNfSEFTV0VMTChk ZXYpID8gR1RfUkVOREVSX0wzX1BBUklUWV9FUlJPUl9JTlRFUlJVUFRfUzEgOiAwKSkKKwkgKElT X0hBU1dFTEwoZGV2X3ByaXYpID8gR1RfUkVOREVSX0wzX1BBUklUWV9FUlJPUl9JTlRFUlJVUFRf UzEgOiAwKSkKIAogLyogVGhlc2UgYXJlIGFsbCB0aGUgIm9sZCIgaW50ZXJydXB0cyAqLwogI2Rl ZmluZSBJTEtfQlNEX1VTRVJfSU5URVJSVVBUCQkJCSgxPDw1KQpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2NvbG9yLmMKaW5kZXggYmU3NmVmODg2NzhjLi5kYTc2YTc5OTQxMWEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfY29sb3IuYwpAQCAtMzI2LDcgKzMyNiw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf bG9hZF9sdXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkgKiBXb3JrYXJv dW5kIDogRG8gbm90IHJlYWQgb3Igd3JpdGUgdGhlIHBpcGUgcGFsZXR0ZS9nYW1tYSBkYXRhIHdo aWxlCiAJICogR0FNTUFfTU9ERSBpcyBjb25maWd1cmVkIGZvciBzcGxpdCBnYW1tYSBhbmQgSVBT X0NUTCBoYXMgSVBTIGVuYWJsZWQuCiAJICovCi0JaWYgKElTX0hBU1dFTEwoZGV2KSAmJiBpbnRl bF9jcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCAmJgorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAm JiBpbnRlbF9jcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCAmJgogCSAgICAoaW50ZWxfY3J0Y19zdGF0 ZS0+Z2FtbWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfU1BMSVQpKSB7CiAJCWhzd19kaXNhYmxl X2lwcyhpbnRlbF9jcnRjKTsKIAkJcmVlbmFibGVfaXBzID0gdHJ1ZTsKQEAgLTUzNyw3ICs1Mzcs NyBAQCB2b2lkIGludGVsX2NvbG9yX2luaXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChJ U19DSEVSUllWSUVXKGRldikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4 ID0gY2hlcnJ5dmlld19sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRf bHV0cyA9IGNoZXJyeXZpZXdfbG9hZF9sdXRzOwotCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYp KSB7CisJfSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlz cGxheS5sb2FkX2NzY19tYXRyaXggPSBpOXh4X2xvYWRfY3NjX21hdHJpeDsKIAkJZGV2X3ByaXYt PmRpc3BsYXkubG9hZF9sdXRzID0gaGFzd2VsbF9sb2FkX2x1dHM7CiAJfSBlbHNlIGlmIChJU19C Uk9BRFdFTEwoZGV2X3ByaXYpIHx8IElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2RkaS5jCmluZGV4IDM1ZjBiN2M5ZDBhNi4uY2Q3MTI4Yjg5YjRkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwpAQCAtMTE4OSw3ICsxMTg5LDcgQEAgdm9pZCBpbnRlbF9kZGlfZW5h YmxlX3RyYW5zY29kZXJfZnVuYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCQkgKiBlRFAgd2hl biBub3QgdXNpbmcgdGhlIHBhbmVsIGZpdHRlciwgYW5kIHdoZW4gbm90CiAJCQkgKiB1c2luZyBt b3Rpb24gYmx1ciBtaXRpZ2F0aW9uICh3aGljaCB3ZSBkb24ndAogCQkJICogc3VwcG9ydCkuICov Ci0JCQlpZiAoSVNfSEFTV0VMTChkZXYpICYmCisJCQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikg JiYKIAkJCSAgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5lbmFibGVkIHx8CiAJCQkg ICAgIGludGVsX2NydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSkpCiAJCQkJdGVtcCB8 PSBUUkFOU19ERElfRURQX0lOUFVUX0FfT05PRkY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggMDFhN2EyYzFjYjVjLi43MjYwM2NjMjhkOTIgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTU1MDAsNyArNTUwMCw3IEBAIHN0YXRpYyB2b2lkIGhhc3dl bGxfY3J0Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCS8q IElmIHdlIGNoYW5nZSB0aGUgcmVsYXRpdmUgb3JkZXIgYmV0d2VlbiBwaXBlL3BsYW5lcyBlbmFi bGluZywgd2UgbmVlZAogCSAqIHRvIGNoYW5nZSB0aGUgd29ya2Fyb3VuZC4gKi8KIAloc3dfd29y a2Fyb3VuZF9waXBlID0gcGlwZV9jb25maWctPmhzd193b3JrYXJvdW5kX3BpcGU7Ci0JaWYgKElT X0hBU1dFTEwoZGV2KSAmJiBoc3dfd29ya2Fyb3VuZF9waXBlICE9IElOVkFMSURfUElQRSkgewor CWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBoc3dfd29ya2Fyb3VuZF9waXBlICE9IElOVkFM SURfUElQRSkgewogCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBoc3dfd29ya2Fyb3VuZF9w aXBlKTsKIAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaHN3X3dvcmthcm91bmRfcGlwZSk7 CiAJfQpAQCAtODI5OCw3ICs4Mjk4LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0X3BpcGVfdGlt aW5ncyhzdHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAkgKiBwcm9ncmFtbWVkIHdpdGgg dGhlIFZUT1RBTF9FRFAgdmFsdWUuIFNhbWUgZm9yIFZUT1RBTF9DLiBUaGlzIGlzCiAJICogZG9j dW1lbnRlZCBvbiB0aGUgRERJX0ZVTkNfQ1RMIHJlZ2lzdGVyIGRlc2NyaXB0aW9uLCBFRFAgSW5w dXQgU2VsZWN0CiAJICogYml0cy4gKi8KLQlpZiAoSVNfSEFTV0VMTChkZXYpICYmIGNwdV90cmFu c2NvZGVyID09IFRSQU5TQ09ERVJfRURQICYmCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpICYm IGNwdV90cmFuc2NvZGVyID09IFRSQU5TQ09ERVJfRURQICYmCiAJICAgIChwaXBlID09IFBJUEVf QiB8fCBwaXBlID09IFBJUEVfQykpCiAJCUk5MTVfV1JJVEUoVlRPVEFMKHBpcGUpLCBJOTE1X1JF QUQoVlRPVEFMKGNwdV90cmFuc2NvZGVyKSkpOwogCkBAIC0xMDAyNSw3ICsxMDAyNSw3IEBAIHN0 YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9sY3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYpCiAJSTkxNV9TVEFURV9XQVJOKEk5MTVfUkVBRChQUF9TVEFUVVMoMCkpICYg UFBfT04sICJQYW5lbCBwb3dlciBvblxuIik7CiAJSTkxNV9TVEFURV9XQVJOKEk5MTVfUkVBRChC TENfUFdNX0NQVV9DVEwyKSAmIEJMTV9QV01fRU5BQkxFLAogCSAgICAgIkNQVSBQV00xIGVuYWJs ZWRcbiIpOwotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp KQogCQlJOTE1X1NUQVRFX1dBUk4oSTkxNV9SRUFEKEhTV19CTENfUFdNMl9DVEwpICYgQkxNX1BX TV9FTkFCTEUsCiAJCSAgICAgIkNQVSBQV00yIGVuYWJsZWRcbiIpOwogCUk5MTVfU1RBVEVfV0FS TihJOTE1X1JFQUQoQkxDX1BXTV9QQ0hfQ1RMMSkgJiBCTE1fUENIX1BXTV9FTkFCTEUsCkBAIC0x MDA0NSw5ICsxMDA0NSw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9sY3BsbChz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB1aW50MzJfdCBoc3df cmVhZF9kY29tcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCi0JaWYgKElTX0hBU1dFTEwoZGV2 KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCXJldHVybiBJOTE1X1JFQUQoRF9DT01Q X0hTVyk7CiAJZWxzZQogCQlyZXR1cm4gSTkxNV9SRUFEKERfQ09NUF9CRFcpOwpAQCAtMTAwNTUs OSArMTAwNTMsNyBAQCBzdGF0aWMgdWludDMyX3QgaHN3X3JlYWRfZGNvbXAoc3RydWN0IGRybV9p OTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdm9pZCBoc3dfd3JpdGVfZGNvbXAoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCB2YWwpCiB7Ci0Jc3RydWN0 IGRybV9kZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCi0JaWYgKElTX0hBU1dFTEwoZGV2 KSkgeworCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQltdXRleF9sb2NrKCZkZXZfcHJp di0+cnBzLmh3X2xvY2spOwogCQlpZiAoc2FuZHlicmlkZ2VfcGNvZGVfd3JpdGUoZGV2X3ByaXYs IEdFTjZfUENPREVfV1JJVEVfRF9DT01QLAogCQkJCQkgICAgdmFsKSkKQEAgLTEwNzM0LDcgKzEw NzMwLDcgQEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVs X2NydGMgKmNydGMsCiAJCQlpcm9ubGFrZV9nZXRfcGZpdF9jb25maWcoY3J0YywgcGlwZV9jb25m aWcpOwogCX0KIAotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3By aXYpKQogCQlwaXBlX2NvbmZpZy0+aXBzX2VuYWJsZWQgPSBoc3dfY3J0Y19zdXBwb3J0c19pcHMo Y3J0YykgJiYKIAkJCShJOTE1X1JFQUQoSVBTX0NUTCkgJiBJUFNfRU5BQkxFKTsKIApAQCAtMTMx OTQsNiArMTMxOTAsNyBAQCBpbnRlbF9waXBlX2NvbmZpZ19jb21wYXJlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsCiAJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJ CSAgYm9vbCBhZGp1c3QpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0g dG9faTkxNShkZXYpOwogCWJvb2wgcmV0ID0gdHJ1ZTsKIAogI2RlZmluZSBJTlRFTF9FUlJfT1Jf REJHX0tNUyhmbXQsIC4uLikgXApAQCAtMTMzMzksNyArMTMzMzYsNyBAQCBpbnRlbF9waXBlX2Nv bmZpZ19jb21wYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlQSVBFX0NPTkZfQ0hFQ0tf SShwaXhlbF9tdWx0aXBsaWVyKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaGRtaV9zaW5rKTsK LQlpZiAoKElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOCAmJiAhSVNfSEFTV0VMTChkZXYpKSB8fAor CWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA8IDggJiYgIUlTX0hBU1dFTEwoZGV2X3ByaXYpKSB8 fAogCSAgICBJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQogCQlQSVBF X0NPTkZfQ0hFQ0tfSShsaW1pdGVkX2NvbG9yX3JhbmdlKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSSho YXNfaW5mb2ZyYW1lKTsKQEAgLTEzMzgwLDcgKzEzMzc3LDcgQEAgaW50ZWxfcGlwZV9jb25maWdf Y29tcGFyZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCS8qIEJEVysgZG9uJ3QgZXhw b3NlIGEgc3luY2hyb25vdXMgd2F5IHRvIHJlYWQgdGhlIHN0YXRlICovCi0JaWYgKElTX0hBU1dF TEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCVBJUEVfQ09ORl9DSEVDS19J KGlwc19lbmFibGVkKTsKIAogCVBJUEVfQ09ORl9DSEVDS19JKGRvdWJsZV93aWRlKTsKQEAgLTE3 MjU5LDcgKzE3MjU2LDcgQEAgaW50ZWxfZGlzcGxheV9wcmludF9lcnJvcl9zdGF0ZShzdHJ1Y3Qg ZHJtX2k5MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJZXJyX3ByaW50ZihtLCAiICBTSVpFOiAl MDh4XG4iLCBlcnJvci0+cGxhbmVbaV0uc2l6ZSk7CiAJCQllcnJfcHJpbnRmKG0sICIgIFBPUzog JTA4eFxuIiwgZXJyb3ItPnBsYW5lW2ldLnBvcyk7CiAJCX0KLQkJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuIDw9IDcgJiYgIUlTX0hBU1dFTEwoZGV2KSkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPD0gNyAmJiAhSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCQllcnJfcHJpbnRmKG0sICIgIEFE RFI6ICUwOHhcbiIsIGVycm9yLT5wbGFuZVtpXS5hZGRyKTsKIAkJaWYgKElOVEVMX0lORk8oZGV2 KS0+Z2VuID49IDQpIHsKIAkJCWVycl9wcmludGYobSwgIiAgU1VSRjogJTA4eFxuIiwgZXJyb3It PnBsYW5lW2ldLnN1cmZhY2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCBkMDY2N2Y5 ZDkxNzguLjRhOTczYjM0MzQ4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfcHNyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTI2OCw3 ICsyNjgsNyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVs X2RwICppbnRlbF9kcCkKIAl2YWwgfD0gbWF4X3NsZWVwX3RpbWUgPDwgRURQX1BTUl9NQVhfU0xF RVBfVElNRV9TSElGVDsKIAl2YWwgfD0gaWRsZV9mcmFtZXMgPDwgRURQX1BTUl9JRExFX0ZSQU1F X1NISUZUOwogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJp dikpCiAJCXZhbCB8PSBFRFBfUFNSX01JTl9MSU5LX0VOVFJZX1RJTUVfOF9MSU5FUzsKIAogCWlm IChkZXZfcHJpdi0+cHNyLmxpbmtfc3RhbmRieSkKQEAgLTM2MCwxNCArMzYwLDE0IEBAIHN0YXRp YyBib29sIGludGVsX3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxf ZHApCiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpICYmCisJaWYg KElTX0hBU1dFTEwoZGV2X3ByaXYpICYmCiAJICAgIEk5MTVfUkVBRChIU1dfU1RFUkVPXzNEX0NU TChpbnRlbF9jcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyKSkgJgogCQkgICAgICBTM0RfRU5B QkxFKSB7CiAJCURSTV9ERUJVR19LTVMoIlBTUiBjb25kaXRpb24gZmFpbGVkOiBTdGVyZW8gM0Qg aXMgRW5hYmxlZFxuIik7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChk ZXYpICYmCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpICYmCiAJICAgIGFkanVzdGVkX21vZGUt PmZsYWdzICYgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpIHsKIAkJRFJNX0RFQlVHX0tNUygiUFNS IGNvbmRpdGlvbiBmYWlsZWQ6IEludGVybGFjZWQgaXMgRW5hYmxlZFxuIik7CiAJCXJldHVybiBm YWxzZTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK