From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 10/19] drm/i915: Make IS_HASWELL only take dev_priv Date: Tue, 11 Oct 2016 14:21:43 +0100 Message-ID: <1476192112-25336-11-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-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C3416E668 for ; Tue, 11 Oct 2016 13:22:19 +0000 (UTC) Received: by mail-lf0-x241.google.com with SMTP id b75so3721328lfg.3 for ; Tue, 11 Oct 2016 06:22:19 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDI0 MzIgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKdjI6IEFkZCBwYXJhbnRoZXNlcyBhcm91bmQg ZGV2X3ByaXYuIChWaWxsZSBTeXJqYWxhKQoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYyAgICAg IHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jICB8ICA0ICsrLS0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmggICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2NvbG9yLmMgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2RkaS5jICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMg fCAyMyArKysrKysrKysrLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf cHNyLmMgICAgIHwgIDYgKysrLS0tCiA5IGZpbGVzIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyks IDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IDEzZTQwOTU1NGZj Yy4uZDZjM2E0YmIyOWFhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NjEsNyArMjY2 MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogCQkJCSBJTlRFTF9ERVZJRChkZXZf cHJpdikgPT0gMHgwMTVhKQogI2RlZmluZSBJU19WQUxMRVlWSUVXKGRldikJKElOVEVMX0lORk8o ZGV2KS0+aXNfdmFsbGV5dmlldykKICNkZWZpbmUgSVNfQ0hFUlJZVklFVyhkZXYpCShJTlRFTF9J TkZPKGRldiktPmlzX2NoZXJyeXZpZXcpCi0jZGVmaW5lIElTX0hBU1dFTEwoZGV2KQkoSU5URUxf SU5GTyhkZXYpLT5pc19oYXN3ZWxsKQorI2RlZmluZSBJU19IQVNXRUxMKGRldl9wcml2KQkoKGRl dl9wcml2KS0+aW5mby5pc19oYXN3ZWxsKQogI2RlZmluZSBJU19CUk9BRFdFTEwoZGV2X3ByaXYp CSgoZGV2X3ByaXYpLT5pbmZvLmlzX2Jyb2Fkd2VsbCkKICNkZWZpbmUgSVNfU0tZTEFLRShkZXYp CShJTlRFTF9JTkZPKGRldiktPmlzX3NreWxha2UpCiAjZGVmaW5lIElTX0JST1hUT04oZGV2KQkJ KElOVEVMX0lORk8oZGV2KS0+aXNfYnJveHRvbikKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4 IGFlZmI4OGY5ODdiMi4uOGMzNjI4OTk2NzRhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAg LTQzNjAsNyArNDM2MCw3IEBAIGk5MTVfZ2VtX2luaXRfaHcoc3RydWN0IGRybV9kZXZpY2UgKmRl dikKIAlpZiAoSEFTX0VEUkFNKGRldikgJiYgSU5URUxfR0VOKGRldl9wcml2KSA8IDkpCiAJCUk5 MTVfV1JJVEUoSFNXX0lESUNSLCBJOTE1X1JFQUQoSFNXX0lESUNSKSB8IElESUhBU0hNU0soMHhm KSk7CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkK IAkJSTkxNV9XUklURShNSV9QUkVESUNBVEVfUkVTVUxUXzIsIElTX0hTV19HVDMoZGV2X3ByaXYp ID8KIAkJCSAgIExPV0VSX1NMSUNFX0VOQUJMRUQgOiBMT1dFUl9TTElDRV9ESVNBQkxFRCk7CiAK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZ3R0LmMKaW5kZXggMGY4ZjA3M2M1ODljLi4zMjQ2ZDUx YzdiOGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2d0dC5jCkBAIC0xNzQ2LDcgKzE3NDYs NyBAQCBzdGF0aWMgdm9pZCBnZW43X3BwZ3R0X2VuYWJsZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KQogCUk5MTVfV1JJVEUoR0FDX0VDT19CSVRTLCBlY29iaXRzIHwgRUNPQklUU19QUEdUVF9DQUNI RTY0Qik7CiAKIAllY29jaGsgPSBJOTE1X1JFQUQoR0FNX0VDT0NISyk7Ci0JaWYgKElTX0hBU1dF TEwoZGV2KSkgeworCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSkgewogCQllY29jaGsgfD0gRUNP Q0hLX1BQR1RUX1dCX0hTVzsKIAl9IGVsc2UgewogCQllY29jaGsgfD0gRUNPQ0hLX1BQR1RUX0xM Q19JVkI7CkBAIC0yMDU4LDcgKzIwNTgsNyBAQCBzdGF0aWMgaW50IGdlbjZfcHBndHRfaW5pdChz dHJ1Y3QgaTkxNV9od19wcGd0dCAqcHBndHQpCiAJcHBndHQtPmJhc2UucHRlX2VuY29kZSA9IGdn dHQtPmJhc2UucHRlX2VuY29kZTsKIAlpZiAoaW50ZWxfdmdwdV9hY3RpdmUoZGV2X3ByaXYpIHx8 IElTX0dFTjYoZGV2KSkKIAkJcHBndHQtPnN3aXRjaF9tbSA9IGdlbjZfbW1fc3dpdGNoOwotCWVs c2UgaWYgKElTX0hBU1dFTEwoZGV2KSkKKwllbHNlIGlmIChJU19IQVNXRUxMKGRldl9wcml2KSkK IAkJcHBndHQtPnN3aXRjaF9tbSA9IGhzd19tbV9zd2l0Y2g7CiAJZWxzZSBpZiAoSVNfR0VONyhk ZXYpKQogCQlwcGd0dC0+c3dpdGNoX21tID0gZ2VuN19tbV9zd2l0Y2g7CmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9pcnEuYwppbmRleCA1ZmIzYjFjOWE1MmMuLjQ3MzM3YWFiYzMyNiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2lycS5jCkBAIC0zNTk0LDggKzM1OTQsOCBAQCBzdGF0aWMgdm9pZCBnZW41X2d0X2lycV9w b3N0aW5zdGFsbChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCWRldl9wcml2LT5ndF9pcnFfbWFz ayA9IH4wOwogCWlmIChIQVNfTDNfRFBGKGRldikpIHsKIAkJLyogTDMgcGFyaXR5IGludGVycnVw dCBpcyBhbHdheXMgdW5tYXNrZWQuICovCi0JCWRldl9wcml2LT5ndF9pcnFfbWFzayA9IH5HVF9Q QVJJVFlfRVJST1IoZGV2KTsKLQkJZ3RfaXJxcyB8PSBHVF9QQVJJVFlfRVJST1IoZGV2KTsKKwkJ ZGV2X3ByaXYtPmd0X2lycV9tYXNrID0gfkdUX1BBUklUWV9FUlJPUihkZXZfcHJpdik7CisJCWd0 X2lycXMgfD0gR1RfUEFSSVRZX0VSUk9SKGRldl9wcml2KTsKIAl9CiAKIAlndF9pcnFzIHw9IEdU X1JFTkRFUl9VU0VSX0lOVEVSUlVQVDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcmVnLmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IGFjYzc2 N2E1MmQ4ZS4uOGI2MTY2OWFmNjI4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTIwOTQs OSArMjA5NCw5IEBAIGVudW0gc2tsX2Rpc3BfcG93ZXJfd2VsbHMgewogI2RlZmluZSBQTV9WRUJP WF9DU19FUlJPUl9JTlRFUlJVUFQJCSgxIDw8IDEyKSAvKiBoc3crICovCiAjZGVmaW5lIFBNX1ZF Qk9YX1VTRVJfSU5URVJSVVBUCQkJKDEgPDwgMTApIC8qIGhzdysgKi8KIAotI2RlZmluZSBHVF9Q QVJJVFlfRVJST1IoZGV2KSBcCisjZGVmaW5lIEdUX1BBUklUWV9FUlJPUihkZXZfcHJpdikgXAog CShHVF9SRU5ERVJfTDNfUEFSSVRZX0VSUk9SX0lOVEVSUlVQVCB8IFwKLQkgKElTX0hBU1dFTEwo ZGV2KSA/IEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBUX1MxIDogMCkpCisJIChJ U19IQVNXRUxMKGRldl9wcml2KSA/IEdUX1JFTkRFUl9MM19QQVJJVFlfRVJST1JfSU5URVJSVVBU X1MxIDogMCkpCiAKIC8qIFRoZXNlIGFyZSBhbGwgdGhlICJvbGQiIGludGVycnVwdHMgKi8KICNk ZWZpbmUgSUxLX0JTRF9VU0VSX0lOVEVSUlVQVAkJCQkoMTw8NSkKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NvbG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jb2xvci5jCmluZGV4IGJlNzZlZjg4Njc4Yy4uZGE3NmE3OTk0MTFhIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jb2xvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2NvbG9yLmMKQEAgLTMyNiw3ICszMjYsNyBAQCBzdGF0aWMgdm9pZCBoYXN3ZWxs X2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJICogV29ya2Fy b3VuZCA6IERvIG5vdCByZWFkIG9yIHdyaXRlIHRoZSBwaXBlIHBhbGV0dGUvZ2FtbWEgZGF0YSB3 aGlsZQogCSAqIEdBTU1BX01PREUgaXMgY29uZmlndXJlZCBmb3Igc3BsaXQgZ2FtbWEgYW5kIElQ U19DVEwgaGFzIElQUyBlbmFibGVkLgogCSAqLwotCWlmIChJU19IQVNXRUxMKGRldikgJiYgaW50 ZWxfY3J0Y19zdGF0ZS0+aXBzX2VuYWJsZWQgJiYKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikg JiYgaW50ZWxfY3J0Y19zdGF0ZS0+aXBzX2VuYWJsZWQgJiYKIAkgICAgKGludGVsX2NydGNfc3Rh dGUtPmdhbW1hX21vZGUgPT0gR0FNTUFfTU9ERV9NT0RFX1NQTElUKSkgewogCQloc3dfZGlzYWJs ZV9pcHMoaW50ZWxfY3J0Yyk7CiAJCXJlZW5hYmxlX2lwcyA9IHRydWU7CkBAIC01MzcsNyArNTM3 LDcgQEAgdm9pZCBpbnRlbF9jb2xvcl9pbml0KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKIAlpZiAo SVNfQ0hFUlJZVklFVyhkZXYpKSB7CiAJCWRldl9wcml2LT5kaXNwbGF5LmxvYWRfY3NjX21hdHJp eCA9IGNoZXJyeXZpZXdfbG9hZF9jc2NfbWF0cml4OwogCQlkZXZfcHJpdi0+ZGlzcGxheS5sb2Fk X2x1dHMgPSBjaGVycnl2aWV3X2xvYWRfbHV0czsKLQl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2 KSkgeworCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPmRp c3BsYXkubG9hZF9jc2NfbWF0cml4ID0gaTl4eF9sb2FkX2NzY19tYXRyaXg7CiAJCWRldl9wcml2 LT5kaXNwbGF5LmxvYWRfbHV0cyA9IGhhc3dlbGxfbG9hZF9sdXRzOwogCX0gZWxzZSBpZiAoSVNf QlJPQURXRUxMKGRldl9wcml2KSB8fCBJU19TS1lMQUtFKGRldl9wcml2KSB8fApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZGkuYwppbmRleCAzNWYwYjdjOWQwYTYuLmNkNzEyOGI4OWI0ZCAxMDA2NDQKLS0t IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGRpLmMKQEAgLTExODksNyArMTE4OSw3IEBAIHZvaWQgaW50ZWxfZGRpX2Vu YWJsZV90cmFuc2NvZGVyX2Z1bmMoc3RydWN0IGRybV9jcnRjICpjcnRjKQogCQkJICogZURQIHdo ZW4gbm90IHVzaW5nIHRoZSBwYW5lbCBmaXR0ZXIsIGFuZCB3aGVuIG5vdAogCQkJICogdXNpbmcg bW90aW9uIGJsdXIgbWl0aWdhdGlvbiAod2hpY2ggd2UgZG9uJ3QKIAkJCSAqIHN1cHBvcnQpLiAq LwotCQkJaWYgKElTX0hBU1dFTEwoZGV2KSAmJgorCQkJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYp ICYmCiAJCQkgICAgKGludGVsX2NydGMtPmNvbmZpZy0+cGNoX3BmaXQuZW5hYmxlZCB8fAogCQkJ ICAgICBpbnRlbF9jcnRjLT5jb25maWctPnBjaF9wZml0LmZvcmNlX3RocnUpKQogCQkJCXRlbXAg fD0gVFJBTlNfRERJX0VEUF9JTlBVVF9BX09OT0ZGOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCmluZGV4IGQxNTlhMzE1MDk5Zi4uMDhmNmNkMmZkNjAwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01NTAzLDcgKzU1MDMsNyBAQCBzdGF0aWMgdm9pZCBoYXN3 ZWxsX2NydGNfZW5hYmxlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpwaXBlX2NvbmZpZywKIAkv KiBJZiB3ZSBjaGFuZ2UgdGhlIHJlbGF0aXZlIG9yZGVyIGJldHdlZW4gcGlwZS9wbGFuZXMgZW5h YmxpbmcsIHdlIG5lZWQKIAkgKiB0byBjaGFuZ2UgdGhlIHdvcmthcm91bmQuICovCiAJaHN3X3dv cmthcm91bmRfcGlwZSA9IHBpcGVfY29uZmlnLT5oc3dfd29ya2Fyb3VuZF9waXBlOwotCWlmIChJ U19IQVNXRUxMKGRldikgJiYgaHN3X3dvcmthcm91bmRfcGlwZSAhPSBJTlZBTElEX1BJUEUpIHsK KwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgJiYgaHN3X3dvcmthcm91bmRfcGlwZSAhPSBJTlZB TElEX1BJUEUpIHsKIAkJaW50ZWxfd2FpdF9mb3JfdmJsYW5rKGRldiwgaHN3X3dvcmthcm91bmRf cGlwZSk7CiAJCWludGVsX3dhaXRfZm9yX3ZibGFuayhkZXYsIGhzd193b3JrYXJvdW5kX3BpcGUp OwogCX0KQEAgLTgzMDEsNyArODMwMSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldF9waXBlX3Rp bWluZ3Moc3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCiAJICogcHJvZ3JhbW1lZCB3aXRo IHRoZSBWVE9UQUxfRURQIHZhbHVlLiBTYW1lIGZvciBWVE9UQUxfQy4gVGhpcyBpcwogCSAqIGRv Y3VtZW50ZWQgb24gdGhlIERESV9GVU5DX0NUTCByZWdpc3RlciBkZXNjcmlwdGlvbiwgRURQIElu cHV0IFNlbGVjdAogCSAqIGJpdHMuICovCi0JaWYgKElTX0hBU1dFTEwoZGV2KSAmJiBjcHVfdHJh bnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCAmJgorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAm JiBjcHVfdHJhbnNjb2RlciA9PSBUUkFOU0NPREVSX0VEUCAmJgogCSAgICAocGlwZSA9PSBQSVBF X0IgfHwgcGlwZSA9PSBQSVBFX0MpKQogCQlJOTE1X1dSSVRFKFZUT1RBTChwaXBlKSwgSTkxNV9S RUFEKFZUT1RBTChjcHVfdHJhbnNjb2RlcikpKTsKIApAQCAtMTAwMjgsNyArMTAwMjgsNyBAQCBz dGF0aWMgdm9pZCBhc3NlcnRfY2FuX2Rpc2FibGVfbGNwbGwoc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmRldl9wcml2KQogCUk5MTVfU1RBVEVfV0FSTihJOTE1X1JFQUQoUFBfU1RBVFVTKDApKSAm IFBQX09OLCAiUGFuZWwgcG93ZXIgb25cbiIpOwogCUk5MTVfU1RBVEVfV0FSTihJOTE1X1JFQUQo QkxDX1BXTV9DUFVfQ1RMMikgJiBCTE1fUFdNX0VOQUJMRSwKIAkgICAgICJDUFUgUFdNMSBlbmFi bGVkXG4iKTsKLQlpZiAoSVNfSEFTV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9wcml2 KSkKIAkJSTkxNV9TVEFURV9XQVJOKEk5MTVfUkVBRChIU1dfQkxDX1BXTTJfQ1RMKSAmIEJMTV9Q V01fRU5BQkxFLAogCQkgICAgICJDUFUgUFdNMiBlbmFibGVkXG4iKTsKIAlJOTE1X1NUQVRFX1dB Uk4oSTkxNV9SRUFEKEJMQ19QV01fUENIX0NUTDEpICYgQkxNX1BDSF9QV01fRU5BQkxFLApAQCAt MTAwNDgsOSArMTAwNDgsNyBAQCBzdGF0aWMgdm9pZCBhc3NlcnRfY2FuX2Rpc2FibGVfbGNwbGwo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiBzdGF0aWMgdWludDMyX3QgaHN3 X3JlYWRfZGNvbXAoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKLQotCWlmIChJU19IQVNXRUxMKGRl dikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlyZXR1cm4gSTkxNV9SRUFEKERfQ09N UF9IU1cpOwogCWVsc2UKIAkJcmV0dXJuIEk5MTVfUkVBRChEX0NPTVBfQkRXKTsKQEAgLTEwMDU4 LDkgKzEwMDU2LDcgQEAgc3RhdGljIHVpbnQzMl90IGhzd19yZWFkX2Rjb21wKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAogc3RhdGljIHZvaWQgaHN3X3dyaXRlX2Rjb21wKHN0 cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwgdWludDMyX3QgdmFsKQogewotCXN0cnVj dCBkcm1fZGV2aWNlICpkZXYgPSAmZGV2X3ByaXYtPmRybTsKLQotCWlmIChJU19IQVNXRUxMKGRl dikpIHsKKwlpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKIAkJbXV0ZXhfbG9jaygmZGV2X3By aXYtPnJwcy5od19sb2NrKTsKIAkJaWYgKHNhbmR5YnJpZGdlX3Bjb2RlX3dyaXRlKGRldl9wcml2 LCBHRU42X1BDT0RFX1dSSVRFX0RfQ09NUCwKIAkJCQkJICAgIHZhbCkpCkBAIC0xMDczNyw3ICsx MDczMyw3IEBAIHN0YXRpYyBib29sIGhhc3dlbGxfZ2V0X3BpcGVfY29uZmlnKHN0cnVjdCBpbnRl bF9jcnRjICpjcnRjLAogCQkJaXJvbmxha2VfZ2V0X3BmaXRfY29uZmlnKGNydGMsIHBpcGVfY29u ZmlnKTsKIAl9CiAKLQlpZiAoSVNfSEFTV0VMTChkZXYpKQorCWlmIChJU19IQVNXRUxMKGRldl9w cml2KSkKIAkJcGlwZV9jb25maWctPmlwc19lbmFibGVkID0gaHN3X2NydGNfc3VwcG9ydHNfaXBz KGNydGMpICYmCiAJCQkoSTkxNV9SRUFEKElQU19DVEwpICYgSVBTX0VOQUJMRSk7CiAKQEAgLTEz MTk3LDYgKzEzMTkzLDcgQEAgaW50ZWxfcGlwZV9jb25maWdfY29tcGFyZShzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqcGlwZV9jb25maWcsCiAJ CQkgIGJvb2wgYWRqdXN0KQogeworCXN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiA9 IHRvX2k5MTUoZGV2KTsKIAlib29sIHJldCA9IHRydWU7CiAKICNkZWZpbmUgSU5URUxfRVJSX09S X0RCR19LTVMoZm10LCAuLi4pIFwKQEAgLTEzMzQyLDcgKzEzMzM5LDcgQEAgaW50ZWxfcGlwZV9j b25maWdfY29tcGFyZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCiAJUElQRV9DT05GX0NIRUNL X0kocGl4ZWxfbXVsdGlwbGllcik7CiAJUElQRV9DT05GX0NIRUNLX0koaGFzX2hkbWlfc2luayk7 Ci0JaWYgKChJTlRFTF9JTkZPKGRldiktPmdlbiA8IDggJiYgIUlTX0hBU1dFTEwoZGV2KSkgfHwK KwlpZiAoKElOVEVMX0dFTihkZXZfcHJpdikgPCA4ICYmICFJU19IQVNXRUxMKGRldl9wcml2KSkg fHwKIAkgICAgSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2KSkKIAkJUElQ RV9DT05GX0NIRUNLX0kobGltaXRlZF9jb2xvcl9yYW5nZSk7CiAJUElQRV9DT05GX0NIRUNLX0ko aGFzX2luZm9mcmFtZSk7CkBAIC0xMzM4Myw3ICsxMzM4MCw3IEBAIGludGVsX3BpcGVfY29uZmln X2NvbXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiAKIAkvKiBCRFcrIGRvbid0IGV4 cG9zZSBhIHN5bmNocm9ub3VzIHdheSB0byByZWFkIHRoZSBzdGF0ZSAqLwotCWlmIChJU19IQVNX RUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQlQSVBFX0NPTkZfQ0hFQ0tf SShpcHNfZW5hYmxlZCk7CiAKIAlQSVBFX0NPTkZfQ0hFQ0tfSShkb3VibGVfd2lkZSk7CkBAIC0x NzI2Miw3ICsxNzI1OSw3IEBAIGludGVsX2Rpc3BsYXlfcHJpbnRfZXJyb3Jfc3RhdGUoc3RydWN0 IGRybV9pOTE1X2Vycm9yX3N0YXRlX2J1ZiAqbSwKIAkJCWVycl9wcmludGYobSwgIiAgU0laRTog JTA4eFxuIiwgZXJyb3ItPnBsYW5lW2ldLnNpemUpOwogCQkJZXJyX3ByaW50ZihtLCAiICBQT1M6 ICUwOHhcbiIsIGVycm9yLT5wbGFuZVtpXS5wb3MpOwogCQl9Ci0JCWlmIChJTlRFTF9JTkZPKGRl diktPmdlbiA8PSA3ICYmICFJU19IQVNXRUxMKGRldikpCisJCWlmIChJTlRFTF9HRU4oZGV2X3By aXYpIDw9IDcgJiYgIUlTX0hBU1dFTEwoZGV2X3ByaXYpKQogCQkJZXJyX3ByaW50ZihtLCAiICBB RERSOiAlMDh4XG4iLCBlcnJvci0+cGxhbmVbaV0uYWRkcik7CiAJCWlmIChJTlRFTF9JTkZPKGRl diktPmdlbiA+PSA0KSB7CiAJCQllcnJfcHJpbnRmKG0sICIgIFNVUkY6ICUwOHhcbiIsIGVycm9y LT5wbGFuZVtpXS5zdXJmYWNlKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcHNyLmMKaW5kZXggZDA2Njdm OWQ5MTc4Li40YTk3M2IzNDM0OGEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Bzci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bzci5jCkBAIC0yNjgs NyArMjY4LDcgQEAgc3RhdGljIHZvaWQgaHN3X3Bzcl9lbmFibGVfc291cmNlKHN0cnVjdCBpbnRl bF9kcCAqaW50ZWxfZHApCiAJdmFsIHw9IG1heF9zbGVlcF90aW1lIDw8IEVEUF9QU1JfTUFYX1NM RUVQX1RJTUVfU0hJRlQ7CiAJdmFsIHw9IGlkbGVfZnJhbWVzIDw8IEVEUF9QU1JfSURMRV9GUkFN RV9TSElGVDsKIAotCWlmIChJU19IQVNXRUxMKGRldikpCisJaWYgKElTX0hBU1dFTEwoZGV2X3By aXYpKQogCQl2YWwgfD0gRURQX1BTUl9NSU5fTElOS19FTlRSWV9USU1FXzhfTElORVM7CiAKIAlp ZiAoZGV2X3ByaXYtPnBzci5saW5rX3N0YW5kYnkpCkBAIC0zNjAsMTQgKzM2MCwxNCBAQCBzdGF0 aWMgYm9vbCBpbnRlbF9wc3JfbWF0Y2hfY29uZGl0aW9ucyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVs X2RwKQogCQlyZXR1cm4gZmFsc2U7CiAJfQogCi0JaWYgKElTX0hBU1dFTEwoZGV2KSAmJgorCWlm IChJU19IQVNXRUxMKGRldl9wcml2KSAmJgogCSAgICBJOTE1X1JFQUQoSFNXX1NURVJFT18zRF9D VEwoaW50ZWxfY3J0Yy0+Y29uZmlnLT5jcHVfdHJhbnNjb2RlcikpICYKIAkJICAgICAgUzNEX0VO QUJMRSkgewogCQlEUk1fREVCVUdfS01TKCJQU1IgY29uZGl0aW9uIGZhaWxlZDogU3RlcmVvIDNE IGlzIEVuYWJsZWRcbiIpOwogCQlyZXR1cm4gZmFsc2U7CiAJfQogCi0JaWYgKElTX0hBU1dFTEwo ZGV2KSAmJgorCWlmIChJU19IQVNXRUxMKGRldl9wcml2KSAmJgogCSAgICBhZGp1c3RlZF9tb2Rl LT5mbGFncyAmIERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFKSB7CiAJCURSTV9ERUJVR19LTVMoIlBT UiBjb25kaXRpb24gZmFpbGVkOiBJbnRlcmxhY2VkIGlzIEVuYWJsZWRcbiIpOwogCQlyZXR1cm4g ZmFsc2U7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4Cg==