From: Tvrtko Ursulin Subject: [CI 10/19] drm/i915: Make IS_HASWELL only take dev_priv Date: Thu, 13 Oct 2016 11:03:01 +0100 Message-ID: <1476352990-2504-10-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-qk0-x231.google.com (mail-qk0-x231.google.com [IPv6:2607:f8b0:400d:c09::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A6486EA04 for ; Thu, 13 Oct 2016 10:03:28 +0000 (UTC) Received: by mail-qk0-x231.google.com with SMTP id f128so75917858qkb.1 for ; Thu, 13 Oct 2016 03:03:28 -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:26 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDI0 MzIgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKdjI6IEFkZCBwYXJhbnRoZXNlcyBhcm91bmQg ZGV2X3ByaXYuIChWaWxsZSBTeXJqYWxhKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IERhdmlkIFdlaW5laGFsbCA8 ZGF2aWQud2VpbmVoYWxsQGxpbnV4LmludGVsLmNvbT4KQWNrZWQtYnk6IERhbmllbCBWZXR0ZXIg PGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CkFja2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1 bGFAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogQ2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13 aWxzb24uY28udWs+CkFja2VkLWJ5OiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9y c3RAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg ICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgfCAgMiAr LQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgIHwgIDQgKystLQogZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYyAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9yZWcuaCAgICAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYyAgIHwgIDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMg ICAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDIzICsr KysrKysrKystLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYyAg ICAgfCAgNiArKystLS0KIDkgZmlsZXMgY2hhbmdlZCwgMjQgaW5zZXJ0aW9ucygrKSwgMjcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggOGYyOTQ1ZjI1OGYxLi44Y2E3 ZWE0ZWVmYWMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjY2NCw3ICsyNjY0LDcgQEAg c3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9 PSAweDAxNWEpCiAjZGVmaW5lIElTX1ZBTExFWVZJRVcoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5p c192YWxsZXl2aWV3KQogI2RlZmluZSBJU19DSEVSUllWSUVXKGRldikJKElOVEVMX0lORk8oZGV2 KS0+aXNfY2hlcnJ5dmlldykKLSNkZWZpbmUgSVNfSEFTV0VMTChkZXYpCShJTlRFTF9JTkZPKGRl diktPmlzX2hhc3dlbGwpCisjZGVmaW5lIElTX0hBU1dFTEwoZGV2X3ByaXYpCSgoZGV2X3ByaXYp LT5pbmZvLmlzX2hhc3dlbGwpCiAjZGVmaW5lIElTX0JST0FEV0VMTChkZXZfcHJpdikJKChkZXZf cHJpdiktPmluZm8uaXNfYnJvYWR3ZWxsKQogI2RlZmluZSBJU19TS1lMQUtFKGRldikJKElOVEVM X0lORk8oZGV2KS0+aXNfc2t5bGFrZSkKICNkZWZpbmUgSVNfQlJPWFRPTihkZXYpCQkoSU5URUxf SU5GTyhkZXYpLT5pc19icm94dG9uKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9nZW0uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKaW5kZXggOGExNTg3 MjE4ZWNiLi43Y2ZjMDk3ZTRhNWIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwpAQCAtNDM4NCw3 ICs0Mzg0LDcgQEAgaTkxNV9nZW1faW5pdF9odyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWlm IChIQVNfRURSQU0oZGV2KSAmJiBJTlRFTF9HRU4oZGV2X3ByaXYpIDwgOSkKIAkJSTkxNV9XUklU RShIU1dfSURJQ1IsIEk5MTVfUkVBRChIU1dfSURJQ1IpIHwgSURJSEFTSE1TSygweGYpKTsKIAot CWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlJOTE1 X1dSSVRFKE1JX1BSRURJQ0FURV9SRVNVTFRfMiwgSVNfSFNXX0dUMyhkZXZfcHJpdikgPwogCQkJ ICAgTE9XRVJfU0xJQ0VfRU5BQkxFRCA6IExPV0VSX1NMSUNFX0RJU0FCTEVEKTsKIApkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2dlbV9ndHQuYwppbmRleCA4NDE1MmNhMzY3YTcuLjk4NzdhYjY4NjgyNiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKQEAgLTE3NDYsNyArMTc0Niw3IEBAIHN0 YXRpYyB2b2lkIGdlbjdfcHBndHRfZW5hYmxlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJSTkx NV9XUklURShHQUNfRUNPX0JJVFMsIGVjb2JpdHMgfCBFQ09CSVRTX1BQR1RUX0NBQ0hFNjRCKTsK IAogCWVjb2NoayA9IEk5MTVfUkVBRChHQU1fRUNPQ0hLKTsKLQlpZiAoSVNfSEFTV0VMTChkZXYp KSB7CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWVjb2NoayB8PSBFQ09DSEtfUFBH VFRfV0JfSFNXOwogCX0gZWxzZSB7CiAJCWVjb2NoayB8PSBFQ09DSEtfUFBHVFRfTExDX0lWQjsK QEAgLTIwNTgsNyArMjA1OCw3IEBAIHN0YXRpYyBpbnQgZ2VuNl9wcGd0dF9pbml0KHN0cnVjdCBp OTE1X2h3X3BwZ3R0ICpwcGd0dCkKIAlwcGd0dC0+YmFzZS5wdGVfZW5jb2RlID0gZ2d0dC0+YmFz ZS5wdGVfZW5jb2RlOwogCWlmIChpbnRlbF92Z3B1X2FjdGl2ZShkZXZfcHJpdikgfHwgSVNfR0VO NihkZXYpKQogCQlwcGd0dC0+c3dpdGNoX21tID0gZ2VuNl9tbV9zd2l0Y2g7Ci0JZWxzZSBpZiAo SVNfSEFTV0VMTChkZXYpKQorCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlwcGd0 dC0+c3dpdGNoX21tID0gaHN3X21tX3N3aXRjaDsKIAllbHNlIGlmIChJU19HRU43KGRldikpCiAJ CXBwZ3R0LT5zd2l0Y2hfbW0gPSBnZW43X21tX3N3aXRjaDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j CmluZGV4IDVkNGZkMzIxZGNiNy4uYWU0M2Q1ZWJkNzZhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJx LmMKQEAgLTM1OTQsOCArMzU5NCw4IEBAIHN0YXRpYyB2b2lkIGdlbjVfZ3RfaXJxX3Bvc3RpbnN0 YWxsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJZGV2X3ByaXYtPmd0X2lycV9tYXNrID0gfjA7 CiAJaWYgKEhBU19MM19EUEYoZGV2KSkgewogCQkvKiBMMyBwYXJpdHkgaW50ZXJydXB0IGlzIGFs d2F5cyB1bm1hc2tlZC4gKi8KLQkJZGV2X3ByaXYtPmd0X2lycV9tYXNrID0gfkdUX1BBUklUWV9F UlJPUihkZXYpOwotCQlndF9pcnFzIHw9IEdUX1BBUklUWV9FUlJPUihkZXYpOworCQlkZXZfcHJp di0+Z3RfaXJxX21hc2sgPSB+R1RfUEFSSVRZX0VSUk9SKGRldl9wcml2KTsKKwkJZ3RfaXJxcyB8 PSBHVF9QQVJJVFlfRVJST1IoZGV2X3ByaXYpOwogCX0KIAogCWd0X2lycXMgfD0gR1RfUkVOREVS X1VTRVJfSU5URVJSVVBUOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggNWY3YWVjYmJhNTQ5 Li4wMGVmYWExMzk3NGQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtMjA5Myw5ICsyMDkz LDkgQEAgZW51bSBza2xfZGlzcF9wb3dlcl93ZWxscyB7CiAjZGVmaW5lIFBNX1ZFQk9YX0NTX0VS Uk9SX0lOVEVSUlVQVAkJKDEgPDwgMTIpIC8qIGhzdysgKi8KICNkZWZpbmUgUE1fVkVCT1hfVVNF Ul9JTlRFUlJVUFQJCQkoMSA8PCAxMCkgLyogaHN3KyAqLwogCi0jZGVmaW5lIEdUX1BBUklUWV9F UlJPUihkZXYpIFwKKyNkZWZpbmUgR1RfUEFSSVRZX0VSUk9SKGRldl9wcml2KSBcCiAJKEdUX1JF TkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBUIHwgXAotCSAoSVNfSEFTV0VMTChkZXYpID8g R1RfUkVOREVSX0wzX1BBUklUWV9FUlJPUl9JTlRFUlJVUFRfUzEgOiAwKSkKKwkgKElTX0hBU1dF TEwoZGV2X3ByaXYpID8gR1RfUkVOREVSX0wzX1BBUklUWV9FUlJPUl9JTlRFUlJVUFRfUzEgOiAw KSkKIAogLyogVGhlc2UgYXJlIGFsbCB0aGUgIm9sZCIgaW50ZXJydXB0cyAqLwogI2RlZmluZSBJ TEtfQlNEX1VTRVJfSU5URVJSVVBUCQkJCSgxPDw1KQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfY29sb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9y LmMKaW5kZXggYmU3NmVmODg2NzhjLi5kYTc2YTc5OTQxMWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfY29sb3IuYwpAQCAtMzI2LDcgKzMyNiw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfbG9hZF9s dXRzKHN0cnVjdCBkcm1fY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSkKIAkgKiBXb3JrYXJvdW5kIDog RG8gbm90IHJlYWQgb3Igd3JpdGUgdGhlIHBpcGUgcGFsZXR0ZS9nYW1tYSBkYXRhIHdoaWxlCiAJ ICogR0FNTUFfTU9ERSBpcyBjb25maWd1cmVkIGZvciBzcGxpdCBnYW1tYSBhbmQgSVBTX0NUTCBo YXMgSVBTIGVuYWJsZWQuCiAJICovCi0JaWYgKElTX0hBU1dFTEwoZGV2KSAmJiBpbnRlbF9jcnRj X3N0YXRlLT5pcHNfZW5hYmxlZCAmJgorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBpbnRl bF9jcnRjX3N0YXRlLT5pcHNfZW5hYmxlZCAmJgogCSAgICAoaW50ZWxfY3J0Y19zdGF0ZS0+Z2Ft bWFfbW9kZSA9PSBHQU1NQV9NT0RFX01PREVfU1BMSVQpKSB7CiAJCWhzd19kaXNhYmxlX2lwcyhp bnRlbF9jcnRjKTsKIAkJcmVlbmFibGVfaXBzID0gdHJ1ZTsKQEAgLTUzNyw3ICs1MzcsNyBAQCB2 b2lkIGludGVsX2NvbG9yX2luaXQoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCWlmIChJU19DSEVS UllWSUVXKGRldikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubG9hZF9jc2NfbWF0cml4ID0gY2hl cnJ5dmlld19sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfbHV0cyA9 IGNoZXJyeXZpZXdfbG9hZF9sdXRzOwotCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXYpKSB7CisJ fSBlbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5s b2FkX2NzY19tYXRyaXggPSBpOXh4X2xvYWRfY3NjX21hdHJpeDsKIAkJZGV2X3ByaXYtPmRpc3Bs YXkubG9hZF9sdXRzID0gaGFzd2VsbF9sb2FkX2x1dHM7CiAJfSBlbHNlIGlmIChJU19CUk9BRFdF TEwoZGV2X3ByaXYpIHx8IElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RkaS5jCmluZGV4IDM1ZjBiN2M5ZDBhNi4uY2Q3MTI4Yjg5YjRkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kZGkuYwpAQCAtMTE4OSw3ICsxMTg5LDcgQEAgdm9pZCBpbnRlbF9kZGlfZW5hYmxlX3Ry YW5zY29kZXJfZnVuYyhzdHJ1Y3QgZHJtX2NydGMgKmNydGMpCiAJCQkgKiBlRFAgd2hlbiBub3Qg dXNpbmcgdGhlIHBhbmVsIGZpdHRlciwgYW5kIHdoZW4gbm90CiAJCQkgKiB1c2luZyBtb3Rpb24g Ymx1ciBtaXRpZ2F0aW9uICh3aGljaCB3ZSBkb24ndAogCQkJICogc3VwcG9ydCkuICovCi0JCQlp ZiAoSVNfSEFTV0VMTChkZXYpICYmCisJCQlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgJiYKIAkJ CSAgICAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5wY2hfcGZpdC5lbmFibGVkIHx8CiAJCQkgICAgIGlu dGVsX2NydGMtPmNvbmZpZy0+cGNoX3BmaXQuZm9yY2VfdGhydSkpCiAJCQkJdGVtcCB8PSBUUkFO U19ERElfRURQX0lOUFVUX0FfT05PRkY7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMK aW5kZXggNTk0MmRhYTYzMGZkLi40Yjc2ODE5YmUyNDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9kaXNwbGF5LmMKQEAgLTU1MDEsNyArNTUwMSw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxfY3J0 Y19lbmFibGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnLAogCS8qIElmIHdl IGNoYW5nZSB0aGUgcmVsYXRpdmUgb3JkZXIgYmV0d2VlbiBwaXBlL3BsYW5lcyBlbmFibGluZywg d2UgbmVlZAogCSAqIHRvIGNoYW5nZSB0aGUgd29ya2Fyb3VuZC4gKi8KIAloc3dfd29ya2Fyb3Vu ZF9waXBlID0gcGlwZV9jb25maWctPmhzd193b3JrYXJvdW5kX3BpcGU7Ci0JaWYgKElTX0hBU1dF TEwoZGV2KSAmJiBoc3dfd29ya2Fyb3VuZF9waXBlICE9IElOVkFMSURfUElQRSkgeworCWlmIChJ U19IQVNXRUxMKGRldl9wcml2KSAmJiBoc3dfd29ya2Fyb3VuZF9waXBlICE9IElOVkFMSURfUElQ RSkgewogCQlpbnRlbF93YWl0X2Zvcl92YmxhbmsoZGV2LCBoc3dfd29ya2Fyb3VuZF9waXBlKTsK IAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaHN3X3dvcmthcm91bmRfcGlwZSk7CiAJfQpA QCAtODI5OSw3ICs4Mjk5LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0X3BpcGVfdGltaW5ncyhz dHJ1Y3QgaW50ZWxfY3J0YyAqaW50ZWxfY3J0YykKIAkgKiBwcm9ncmFtbWVkIHdpdGggdGhlIFZU T1RBTF9FRFAgdmFsdWUuIFNhbWUgZm9yIFZUT1RBTF9DLiBUaGlzIGlzCiAJICogZG9jdW1lbnRl ZCBvbiB0aGUgRERJX0ZVTkNfQ1RMIHJlZ2lzdGVyIGRlc2NyaXB0aW9uLCBFRFAgSW5wdXQgU2Vs ZWN0CiAJICogYml0cy4gKi8KLQlpZiAoSVNfSEFTV0VMTChkZXYpICYmIGNwdV90cmFuc2NvZGVy ID09IFRSQU5TQ09ERVJfRURQICYmCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpICYmIGNwdV90 cmFuc2NvZGVyID09IFRSQU5TQ09ERVJfRURQICYmCiAJICAgIChwaXBlID09IFBJUEVfQiB8fCBw aXBlID09IFBJUEVfQykpCiAJCUk5MTVfV1JJVEUoVlRPVEFMKHBpcGUpLCBJOTE1X1JFQUQoVlRP VEFMKGNwdV90cmFuc2NvZGVyKSkpOwogCkBAIC0xMDAyNiw3ICsxMDAyNiw3IEBAIHN0YXRpYyB2 b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9sY3BsbChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYpCiAJSTkxNV9TVEFURV9XQVJOKEk5MTVfUkVBRChQUF9TVEFUVVMoMCkpICYgUFBfT04s ICJQYW5lbCBwb3dlciBvblxuIik7CiAJSTkxNV9TVEFURV9XQVJOKEk5MTVfUkVBRChCTENfUFdN X0NQVV9DVEwyKSAmIEJMTV9QV01fRU5BQkxFLAogCSAgICAgIkNQVSBQV00xIGVuYWJsZWRcbiIp OwotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlJ OTE1X1NUQVRFX1dBUk4oSTkxNV9SRUFEKEhTV19CTENfUFdNMl9DVEwpICYgQkxNX1BXTV9FTkFC TEUsCiAJCSAgICAgIkNQVSBQV00yIGVuYWJsZWRcbiIpOwogCUk5MTVfU1RBVEVfV0FSTihJOTE1 X1JFQUQoQkxDX1BXTV9QQ0hfQ1RMMSkgJiBCTE1fUENIX1BXTV9FTkFCTEUsCkBAIC0xMDA0Niw5 ICsxMDA0Niw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydF9jYW5fZGlzYWJsZV9sY3BsbChzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAKIHN0YXRpYyB1aW50MzJfdCBoc3dfcmVhZF9k Y29tcChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCi0JaWYgKElTX0hBU1dFTEwoZGV2KSkKKwlp ZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCXJldHVybiBJOTE1X1JFQUQoRF9DT01QX0hTVyk7 CiAJZWxzZQogCQlyZXR1cm4gSTkxNV9SRUFEKERfQ09NUF9CRFcpOwpAQCAtMTAwNTYsOSArMTAw NTQsNyBAQCBzdGF0aWMgdWludDMyX3QgaHN3X3JlYWRfZGNvbXAoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdm9pZCBoc3dfd3JpdGVfZGNvbXAoc3RydWN0IGRy bV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCB1aW50MzJfdCB2YWwpCiB7Ci0Jc3RydWN0IGRybV9k ZXZpY2UgKmRldiA9ICZkZXZfcHJpdi0+ZHJtOwotCi0JaWYgKElTX0hBU1dFTEwoZGV2KSkgewor CWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQltdXRleF9sb2NrKCZkZXZfcHJpdi0+cnBz Lmh3X2xvY2spOwogCQlpZiAoc2FuZHlicmlkZ2VfcGNvZGVfd3JpdGUoZGV2X3ByaXYsIEdFTjZf UENPREVfV1JJVEVfRF9DT01QLAogCQkJCQkgICAgdmFsKSkKQEAgLTEwNzM1LDcgKzEwNzMxLDcg QEAgc3RhdGljIGJvb2wgaGFzd2VsbF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2NydGMg KmNydGMsCiAJCQlpcm9ubGFrZV9nZXRfcGZpdF9jb25maWcoY3J0YywgcGlwZV9jb25maWcpOwog CX0KIAotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQog CQlwaXBlX2NvbmZpZy0+aXBzX2VuYWJsZWQgPSBoc3dfY3J0Y19zdXBwb3J0c19pcHMoY3J0Yykg JiYKIAkJCShJOTE1X1JFQUQoSVBTX0NUTCkgJiBJUFNfRU5BQkxFKTsKIApAQCAtMTMxOTUsNiAr MTMxOTEsNyBAQCBpbnRlbF9waXBlX2NvbmZpZ19jb21wYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYsCiAJCQkgIHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkJCSAgYm9v bCBhZGp1c3QpCiB7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkx NShkZXYpOwogCWJvb2wgcmV0ID0gdHJ1ZTsKIAogI2RlZmluZSBJTlRFTF9FUlJfT1JfREJHX0tN UyhmbXQsIC4uLikgXApAQCAtMTMzNDAsNyArMTMzMzcsNyBAQCBpbnRlbF9waXBlX2NvbmZpZ19j b21wYXJlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAKIAlQSVBFX0NPTkZfQ0hFQ0tfSShwaXhl bF9tdWx0aXBsaWVyKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaGRtaV9zaW5rKTsKLQlpZiAo KElOVEVMX0lORk8oZGV2KS0+Z2VuIDwgOCAmJiAhSVNfSEFTV0VMTChkZXYpKSB8fAorCWlmICgo SU5URUxfR0VOKGRldl9wcml2KSA8IDggJiYgIUlTX0hBU1dFTEwoZGV2X3ByaXYpKSB8fAogCSAg ICBJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKQogCQlQSVBFX0NPTkZf Q0hFQ0tfSShsaW1pdGVkX2NvbG9yX3JhbmdlKTsKIAlQSVBFX0NPTkZfQ0hFQ0tfSShoYXNfaW5m b2ZyYW1lKTsKQEAgLTEzMzgxLDcgKzEzMzc4LDcgQEAgaW50ZWxfcGlwZV9jb25maWdfY29tcGFy ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCX0KIAogCS8qIEJEVysgZG9uJ3QgZXhwb3NlIGEg c3luY2hyb25vdXMgd2F5IHRvIHJlYWQgdGhlIHN0YXRlICovCi0JaWYgKElTX0hBU1dFTEwoZGV2 KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCVBJUEVfQ09ORl9DSEVDS19JKGlwc19l bmFibGVkKTsKIAogCVBJUEVfQ09ORl9DSEVDS19JKGRvdWJsZV93aWRlKTsKQEAgLTE3MjYyLDcg KzE3MjU5LDcgQEAgaW50ZWxfZGlzcGxheV9wcmludF9lcnJvcl9zdGF0ZShzdHJ1Y3QgZHJtX2k5 MTVfZXJyb3Jfc3RhdGVfYnVmICptLAogCQkJZXJyX3ByaW50ZihtLCAiICBTSVpFOiAlMDh4XG4i LCBlcnJvci0+cGxhbmVbaV0uc2l6ZSk7CiAJCQllcnJfcHJpbnRmKG0sICIgIFBPUzogJTA4eFxu IiwgZXJyb3ItPnBsYW5lW2ldLnBvcyk7CiAJCX0KLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu IDw9IDcgJiYgIUlTX0hBU1dFTEwoZGV2KSkKKwkJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPD0g NyAmJiAhSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJCQllcnJfcHJpbnRmKG0sICIgIEFERFI6ICUw OHhcbiIsIGVycm9yLT5wbGFuZVtpXS5hZGRyKTsKIAkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID49IDQpIHsKIAkJCWVycl9wcmludGYobSwgIiAgU1VSRjogJTA4eFxuIiwgZXJyb3ItPnBsYW5l W2ldLnN1cmZhY2UpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wc3IuYwppbmRleCBkMDY2N2Y5ZDkxNzgu LjRhOTczYjM0MzQ4YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKQEAgLTI2OCw3ICsyNjgs NyBAQCBzdGF0aWMgdm9pZCBoc3dfcHNyX2VuYWJsZV9zb3VyY2Uoc3RydWN0IGludGVsX2RwICpp bnRlbF9kcCkKIAl2YWwgfD0gbWF4X3NsZWVwX3RpbWUgPDwgRURQX1BTUl9NQVhfU0xFRVBfVElN RV9TSElGVDsKIAl2YWwgfD0gaWRsZV9mcmFtZXMgPDwgRURQX1BTUl9JRExFX0ZSQU1FX1NISUZU OwogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSkKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpCiAJ CXZhbCB8PSBFRFBfUFNSX01JTl9MSU5LX0VOVFJZX1RJTUVfOF9MSU5FUzsKIAogCWlmIChkZXZf cHJpdi0+cHNyLmxpbmtfc3RhbmRieSkKQEAgLTM2MCwxNCArMzYwLDE0IEBAIHN0YXRpYyBib29s IGludGVsX3Bzcl9tYXRjaF9jb25kaXRpb25zKHN0cnVjdCBpbnRlbF9kcCAqaW50ZWxfZHApCiAJ CXJldHVybiBmYWxzZTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpICYmCisJaWYgKElTX0hB U1dFTEwoZGV2X3ByaXYpICYmCiAJICAgIEk5MTVfUkVBRChIU1dfU1RFUkVPXzNEX0NUTChpbnRl bF9jcnRjLT5jb25maWctPmNwdV90cmFuc2NvZGVyKSkgJgogCQkgICAgICBTM0RfRU5BQkxFKSB7 CiAJCURSTV9ERUJVR19LTVMoIlBTUiBjb25kaXRpb24gZmFpbGVkOiBTdGVyZW8gM0QgaXMgRW5h YmxlZFxuIik7CiAJCXJldHVybiBmYWxzZTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpICYm CisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpICYmCiAJICAgIGFkanVzdGVkX21vZGUtPmZsYWdz ICYgRFJNX01PREVfRkxBR19JTlRFUkxBQ0UpIHsKIAkJRFJNX0RFQlVHX0tNUygiUFNSIGNvbmRp dGlvbiBmYWlsZWQ6IEludGVybGFjZWQgaXMgRW5hYmxlZFxuIik7CiAJCXJldHVybiBmYWxzZTsK LS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK