From: Tvrtko Ursulin Subject: [CI 15/19] drm/i915: Make IS_G4X only take dev_priv Date: Thu, 13 Oct 2016 11:03:06 +0100 Message-ID: <1476352990-2504-15-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-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DE2C6EA05 for ; Thu, 13 Oct 2016 10:03:33 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id b75so11686800lfg.3 for ; Thu, 13 Oct 2016 03:03:33 -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.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Oct 2016 03:03:30 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDQ3 MiBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MuCgp2MjogQWRkIHBhcmFudGhlc2VzIGFyb3VuZCBk ZXZfcHJpdi4gKFZpbGxlIFN5cmphbGEpCgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8 dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogRGF2aWQgV2VpbmVoYWxsIDxk YXZpZC53ZWluZWhhbGxAbGludXguaW50ZWwuY29tPgpBY2tlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQWNrZWQtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3Vs YUBsaW51eC5pbnRlbC5jb20+CkFja2VkLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdp bHNvbi5jby51az4KQWNrZWQtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3Jz dEBsaW51eC5pbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAg ICAgICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMgfCAg NSArKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMgICAgfCAgNCArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYyAgICAgICB8ICAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICB8IDQwICsrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAgICAgIHwg IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgIHwgIDQgKystLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgfCAgNCArKy0tCiA4IGZpbGVz IGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKyksIDMwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IGVjMzUzNmQwYzM0My4uZmU5NGUxMWZiM2QzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTI2NTIsNyArMjY1Miw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFi bGUgewogI2RlZmluZSBJU19CUk9BRFdBVEVSKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfYnJv YWR3YXRlcikKICNkZWZpbmUgSVNfQ1JFU1RMSU5FKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNf Y3Jlc3RsaW5lKQogI2RlZmluZSBJU19HTTQ1KGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3By aXYpID09IDB4MkE0MikKLSNkZWZpbmUgSVNfRzRYKGRldikJCShJTlRFTF9JTkZPKGRldiktPmlz X2c0eCkKKyNkZWZpbmUgSVNfRzRYKGRldl9wcml2KQkoKGRldl9wcml2KS0+aW5mby5pc19nNHgp CiAjZGVmaW5lIElTX1BJTkVWSUVXX0coZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikg PT0gMHhhMDAxKQogI2RlZmluZSBJU19QSU5FVklFV19NKGRldl9wcml2KQkoSU5URUxfREVWSUQo ZGV2X3ByaXYpID09IDB4YTAxMSkKICNkZWZpbmUgSVNfUElORVZJRVcoZGV2KQkoSU5URUxfSU5G TyhkZXYpLT5pc19waW5ldmlldykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fc3RvbGVuLmMK aW5kZXggMzUwODEyMGI4YzkwLi5kMWI0MGJjZTAyNDkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZ2VtX3N0b2xlbi5jCkBAIC0yMDQsNyArMjA0LDggQEAgc3RhdGljIHVuc2lnbmVkIGxvbmcg aTkxNV9zdG9sZW5fdG9fcGh5c2ljYWwoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJcmV0dXJu IDA7CiAKIAkvKiBtYWtlIHN1cmUgd2UgZG9uJ3QgY2xvYmJlciB0aGUgR1RUIGlmIGl0J3Mgd2l0 aGluIHN0b2xlbiBtZW1vcnkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPD0gNCAmJiAh SVNfRzMzKGRldikgJiYgIUlTX0c0WChkZXYpKSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg PD0gNCAmJiAhSVNfRzMzKGRldl9wcml2KSAmJgorCSAgICAhSVNfRzRYKGRldl9wcml2KSkgewog CQlzdHJ1Y3QgewogCQkJdTMyIHN0YXJ0LCBlbmQ7CiAJCX0gc3RvbGVuWzJdID0gewpAQCAtNDM3 LDcgKzQzOCw3IEBAIGludCBpOTE1X2dlbV9pbml0X3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCWNhc2UgMzoKIAkJYnJlYWs7CiAJY2FzZSA0OgotCQlpZiAoSVNfRzRYKGRldikpCisJ CWlmIChJU19HNFgoZGV2X3ByaXYpKQogCQkJZzR4X2dldF9zdG9sZW5fcmVzZXJ2ZWQoZGV2X3By aXYsICZyZXNlcnZlZF9iYXNlLAogCQkJCQkJJnJlc2VydmVkX3NpemUpOwogCQlicmVhazsKZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9zdXNwZW5kLmMKaW5kZXggYTBhZjE3MDA2MmIxLi43ODcwODU2ZmNj ZDAgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfc3VzcGVuZC5jCkBAIC0zOCw3ICszOCw3IEBAIHN0 YXRpYyB2b2lkIGk5MTVfc2F2ZV9kaXNwbGF5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCWRl dl9wcml2LT5yZWdmaWxlLnNhdmVEU1BBUkIgPSBJOTE1X1JFQUQoRFNQQVJCKTsKIAogCS8qIHNh dmUgRkJDIGludGVydmFsICovCi0JaWYgKEhBU19GQkMoZGV2KSAmJiBJTlRFTF9JTkZPKGRldikt PmdlbiA8PSA0ICYmICFJU19HNFgoZGV2KSkKKwlpZiAoSEFTX0ZCQyhkZXZfcHJpdikgJiYgSU5U RUxfR0VOKGRldl9wcml2KSA8PSA0ICYmICFJU19HNFgoZGV2X3ByaXYpKQogCQlkZXZfcHJpdi0+ cmVnZmlsZS5zYXZlRkJDX0NPTlRST0wgPSBJOTE1X1JFQUQoRkJDX0NPTlRST0wpOwogfQogCkBA IC01NCw3ICs1NCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVfcmVzdG9yZV9kaXNwbGF5KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJaW50ZWxfZmJjX2dsb2JhbF9kaXNhYmxlKGRldl9wcml2KTsKIAog CS8qIHJlc3RvcmUgRkJDIGludGVydmFsICovCi0JaWYgKEhBU19GQkMoZGV2KSAmJiBJTlRFTF9J TkZPKGRldiktPmdlbiA8PSA0ICYmICFJU19HNFgoZGV2KSkKKwlpZiAoSEFTX0ZCQyhkZXZfcHJp dikgJiYgSU5URUxfR0VOKGRldl9wcml2KSA8PSA0ICYmICFJU19HNFgoZGV2X3ByaXYpKQogCQlJ OTE1X1dSSVRFKEZCQ19DT05UUk9MLCBkZXZfcHJpdi0+cmVnZmlsZS5zYXZlRkJDX0NPTlRST0wp OwogCiAJaTkxNV9yZWRpc2FibGVfdmdhKGRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jcnQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NydC5jCmlu ZGV4IGQ0Mzg4YzAzYjRkYS4uZDQ1Njc4NmY1ODEzIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9jcnQuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQu YwpAQCAtNzcxLDcgKzc3MSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxfY3J0X2dldF9tb2RlcyhzdHJ1 Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQogCiAJaTJjID0gaW50ZWxfZ21idXNfZ2V0X2Fk YXB0ZXIoZGV2X3ByaXYsIGRldl9wcml2LT52YnQuY3J0X2RkY19waW4pOwogCXJldCA9IGludGVs X2NydF9kZGNfZ2V0X21vZGVzKGNvbm5lY3RvciwgaTJjKTsKLQlpZiAocmV0IHx8ICFJU19HNFgo ZGV2KSkKKwlpZiAocmV0IHx8ICFJU19HNFgoZGV2X3ByaXYpKQogCQlnb3RvIG91dDsKIAogCS8q IFRyeSB0byBwcm9iZSBkaWdpdGFsIHBvcnQgZm9yIG91dHB1dCBpbiBEVkktSSAtPiBWR0EgbW9k ZS4gKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAzZDJiZDU1MDRhYjQu LjA0ZjhhNzNhNDYzMiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtMzA3 MSw3ICszMDcxLDcgQEAgc3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgZHJtX3BsYW5lICpwcmltYXJ5LAogCSAgICBmYi0+bW9kaWZpZXJbMF0gPT0gSTkxNV9GT1JN QVRfTU9EX1hfVElMRUQpCiAJCWRzcGNudHIgfD0gRElTUFBMQU5FX1RJTEVEOwogCi0JaWYgKElT X0c0WChkZXYpKQorCWlmIChJU19HNFgoZGV2X3ByaXYpKQogCQlkc3BjbnRyIHw9IERJU1BQTEFO RV9UUklDS0xFX0ZFRURfRElTQUJMRTsKIAogCWludGVsX2FkZF9mYl9vZmZzZXRzKCZ4LCAmeSwg cGxhbmVfc3RhdGUsIDApOwpAQCAtNzIyNCw3ICs3MjI0LDcgQEAgc3RhdGljIGludCBpbnRlbF9j cnRjX2NvbXB1dGVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCS8qIENhbnRpZ2Er IGNhbm5vdCBoYW5kbGUgbW9kZXMgd2l0aCBhIGhzeW5jIGZyb250IHBvcmNoIG9mIDAuCiAJICog V2FQcnVuZU1vZGVXaXRoSW5jb3JyZWN0SHN5bmNPZmZzZXQ6Y3RnLGVsayxpbGssc25iLGl2Yix2 bHYsaHN3LgogCSAqLwotCWlmICgoSU5URUxfSU5GTyhkZXYpLT5nZW4gPiA0IHx8IElTX0c0WChk ZXYpKSAmJgorCWlmICgoSU5URUxfR0VOKGRldl9wcml2KSA+IDQgfHwgSVNfRzRYKGRldl9wcml2 KSkgJiYKIAkJYWRqdXN0ZWRfbW9kZS0+Y3J0Y19oc3luY19zdGFydCA9PSBhZGp1c3RlZF9tb2Rl LT5jcnRjX2hkaXNwbGF5KQogCQlyZXR1cm4gLUVJTlZBTDsKIApAQCAtNzUzOCw3ICs3NTM4LDcg QEAgc3RhdGljIHVuc2lnbmVkIGludCBpbnRlbF9ocGxsX3ZjbyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2KQogCS8qIEZJWE1FIG90aGVyIGNoaXBzZXRzPyAqLwogCWlmIChJU19HTTQ1KGRldl9wcml2 KSkKIAkJdmNvX3RhYmxlID0gY3RnX3ZjbzsKLQllbHNlIGlmIChJU19HNFgoZGV2KSkKKwllbHNl IGlmIChJU19HNFgoZGV2X3ByaXYpKQogCQl2Y29fdGFibGUgPSBlbGtfdmNvOwogCWVsc2UgaWYg KElTX0NSRVNUTElORShkZXYpKQogCQl2Y29fdGFibGUgPSBjbF92Y287CkBAIC04MTcyLDcgKzgx NzIsNyBAQCBzdGF0aWMgdm9pZCBpOXh4X2NvbXB1dGVfZHBsbChzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKIAkJZHBsbCB8PSAoMSA8PCAoY2xvY2stPnAxIC0gMSkpIDw8IERQTExfRlBBMDFfUDFf UE9TVF9ESVZfU0hJRlRfUElORVZJRVc7CiAJZWxzZSB7CiAJCWRwbGwgfD0gKDEgPDwgKGNsb2Nr LT5wMSAtIDEpKSA8PCBEUExMX0ZQQTAxX1AxX1BPU1RfRElWX1NISUZUOwotCQlpZiAoSVNfRzRY KGRldikgJiYgcmVkdWNlZF9jbG9jaykKKwkJaWYgKElTX0c0WChkZXZfcHJpdikgJiYgcmVkdWNl ZF9jbG9jaykKIAkJCWRwbGwgfD0gKDEgPDwgKHJlZHVjZWRfY2xvY2stPnAxIC0gMSkpIDw8IERQ TExfRlBBMV9QMV9QT1NUX0RJVl9TSElGVDsKIAl9CiAJc3dpdGNoIChjbG9jay0+cDIpIHsKQEAg LTg0MTQsNyArODQxNCw4IEBAIHN0YXRpYyB2b2lkIGk5eHhfc2V0X3BpcGVjb25mKHN0cnVjdCBp bnRlbF9jcnRjICppbnRlbF9jcnRjKQogCQlwaXBlY29uZiB8PSBQSVBFQ09ORl9ET1VCTEVfV0lE RTsKIAogCS8qIG9ubHkgZzR4IGFuZCBsYXRlciBoYXZlIGZhbmN5IGJwYy9kaXRoZXIgY29udHJv bHMgKi8KLQlpZiAoSVNfRzRYKGRldikgfHwgSVNfVkFMTEVZVklFVyhkZXYpIHx8IElTX0NIRVJS WVZJRVcoZGV2KSkgeworCWlmIChJU19HNFgoZGV2X3ByaXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpIHx8CisJICAgIElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCS8qIEJzcGVjIGNs YWltcyB0aGF0IHdlIGNhbid0IHVzZSBkaXRoZXJpbmcgZm9yIDMwYnBwIHBpcGVzLiAqLwogCQlp ZiAoaW50ZWxfY3J0Yy0+Y29uZmlnLT5kaXRoZXIgJiYgaW50ZWxfY3J0Yy0+Y29uZmlnLT5waXBl X2JwcCAhPSAzMCkKIAkJCXBpcGVjb25mIHw9IFBJUEVDT05GX0RJVEhFUl9FTiB8CkBAIC04ODMx LDcgKzg4MzIsOCBAQCBzdGF0aWMgYm9vbCBpOXh4X2dldF9waXBlX2NvbmZpZyhzdHJ1Y3QgaW50 ZWxfY3J0YyAqY3J0YywKIAlpZiAoISh0bXAgJiBQSVBFQ09ORl9FTkFCTEUpKQogCQlnb3RvIG91 dDsKIAotCWlmIChJU19HNFgoZGV2KSB8fCBJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZ VklFVyhkZXYpKSB7CisJaWYgKElTX0c0WChkZXZfcHJpdikgfHwgSVNfVkFMTEVZVklFVyhkZXZf cHJpdikgfHwKKwkgICAgSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJc3dpdGNoICh0bXAg JiBQSVBFQ09ORl9CUENfTUFTSykgewogCQljYXNlIFBJUEVDT05GXzZCUEM6CiAJCQlwaXBlX2Nv bmZpZy0+cGlwZV9icHAgPSAxODsKQEAgLTExNTgwLDcgKzExNTgyLDcgQEAgc3RhdGljIGJvb2wg X19wYWdlZmxpcF9maW5pc2hlZF9jcyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkgKiByZWFs bHkgbmVlZGVkIHRoZXJlLiBCdXQgc2luY2UgY3RnIGhhcyB0aGUgcmVnaXN0ZXJzLAogCSAqIGlu Y2x1ZGUgaXQgaW4gdGhlIGNoZWNrIGFueXdheS4KIAkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXYp LT5nZW4gPCA1ICYmICFJU19HNFgoZGV2KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDUg JiYgIUlTX0c0WChkZXZfcHJpdikpCiAJCXJldHVybiB0cnVlOwogCiAJLyoKQEAgLTEyMjQzLDcg KzEyMjQ1LDcgQEAgc3RhdGljIGludCBpbnRlbF9jcnRjX3BhZ2VfZmxpcChzdHJ1Y3QgZHJtX2Ny dGMgKmNydGMsCiAKIAlhdG9taWNfaW5jKCZpbnRlbF9jcnRjLT51bnBpbl93b3JrX2NvdW50KTsK IAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1IHx8IElTX0c0WChkZXYpKQorCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDUgfHwgSVNfRzRYKGRldl9wcml2KSkKIAkJd29yay0+Zmxp cF9jb3VudCA9IEk5MTVfUkVBRChQSVBFX0ZMSVBDT1VOVF9HNFgocGlwZSkpICsgMTsKIAogCWlm IChJU19WQUxMRVlWSUVXKGRldikgfHwgSVNfQ0hFUlJZVklFVyhkZXYpKSB7CkBAIC0xMjcwMywx NSArMTI3MDUsMTYgQEAgc3RhdGljIGludAogY29tcHV0ZV9iYXNlbGluZV9waXBlX2JwcChzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVf Y29uZmlnKQogewotCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKKwlz dHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGNydGMtPmJhc2UuZGV2 KTsKIAlzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGU7CiAJc3RydWN0IGRybV9jb25uZWN0 b3IgKmNvbm5lY3RvcjsKIAlzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubmVjdG9yX3N0 YXRlOwogCWludCBicHAsIGk7CiAKLQlpZiAoKElTX0c0WChkZXYpIHx8IElTX1ZBTExFWVZJRVco ZGV2KSB8fCBJU19DSEVSUllWSUVXKGRldikpKQorCWlmICgoSVNfRzRYKGRldl9wcml2KSB8fCBJ U19WQUxMRVlWSUVXKGRldl9wcml2KSB8fAorCSAgICBJU19DSEVSUllWSUVXKGRldl9wcml2KSkp CiAJCWJwcCA9IDEwKjM7Ci0JZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gNSkKKwll bHNlIGlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDUpCiAJCWJwcCA9IDEyKjM7CiAJZWxzZQog CQlicHAgPSA4KjM7CkBAIC0xMzQwMiw3ICsxMzQwNSw3IEBAIGludGVsX3BpcGVfY29uZmlnX2Nv bXBhcmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAlQSVBFX0NPTkZfQ0hFQ0tfWChkc2lfcGxs LmN0cmwpOwogCVBJUEVfQ09ORl9DSEVDS19YKGRzaV9wbGwuZGl2KTsKIAotCWlmIChJU19HNFgo ZGV2KSB8fCBJTlRFTF9JTkZPKGRldiktPmdlbiA+PSA1KQorCWlmIChJU19HNFgoZGV2X3ByaXYp IHx8IElOVEVMX0dFTihkZXZfcHJpdikgPj0gNSkKIAkJUElQRV9DT05GX0NIRUNLX0kocGlwZV9i cHApOwogCiAJUElQRV9DT05GX0NIRUNLX0NMT0NLX0ZVWlpZKGJhc2UuYWRqdXN0ZWRfbW9kZS5j cnRjX2Nsb2NrKTsKQEAgLTE0OTY0LDcgKzE0OTY3LDcgQEAgc3RhdGljIHN0cnVjdCBkcm1fcGxh bmUgKmludGVsX3ByaW1hcnlfcGxhbmVfY3JlYXRlKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CQkJCSAgICAgICBpbnRlbF9wcmltYXJ5X2Zvcm1hdHMsIG51bV9mb3JtYXRzLAogCQkJCQkgICAg ICAgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwKIAkJCQkJICAgICAgICJwbGFuZSAxJWMiLCBwaXBl X25hbWUocGlwZSkpOwotCWVsc2UgaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID49IDUgfHwgSVNf RzRYKGRldikpCisJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA1IHx8IElTX0c0WChk ZXZfcHJpdikpCiAJCXJldCA9IGRybV91bml2ZXJzYWxfcGxhbmVfaW5pdChkZXYsICZwcmltYXJ5 LT5iYXNlLCAwLAogCQkJCQkgICAgICAgJmludGVsX3BsYW5lX2Z1bmNzLAogCQkJCQkgICAgICAg aW50ZWxfcHJpbWFyeV9mb3JtYXRzLCBudW1fZm9ybWF0cywKQEAgLTE1NTI1LDEyICsxNTUyOCwx MiBAQCBzdGF0aWMgdm9pZCBpbnRlbF9zZXR1cF9vdXRwdXRzKHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpCiAJCWlmIChJOTE1X1JFQUQoR0VOM19TRFZPQikgJiBTRFZPX0RFVEVDVEVEKSB7CiAJCQlE Uk1fREVCVUdfS01TKCJwcm9iaW5nIFNEVk9CXG4iKTsKIAkJCWZvdW5kID0gaW50ZWxfc2R2b19p bml0KGRldiwgR0VOM19TRFZPQiwgUE9SVF9CKTsKLQkJCWlmICghZm91bmQgJiYgSVNfRzRYKGRl dikpIHsKKwkJCWlmICghZm91bmQgJiYgSVNfRzRYKGRldl9wcml2KSkgewogCQkJCURSTV9ERUJV R19LTVMoInByb2JpbmcgSERNSSBvbiBTRFZPQlxuIik7CiAJCQkJaW50ZWxfaGRtaV9pbml0KGRl diwgR0VONF9IRE1JQiwgUE9SVF9CKTsKIAkJCX0KIAotCQkJaWYgKCFmb3VuZCAmJiBJU19HNFgo ZGV2KSkKKwkJCWlmICghZm91bmQgJiYgSVNfRzRYKGRldl9wcml2KSkKIAkJCQlpbnRlbF9kcF9p bml0KGRldiwgRFBfQiwgUE9SVF9CKTsKIAkJfQogCkBAIC0xNTU0MywxNiArMTU1NDYsMTUgQEAg c3RhdGljIHZvaWQgaW50ZWxfc2V0dXBfb3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQog CiAJCWlmICghZm91bmQgJiYgKEk5MTVfUkVBRChHRU4zX1NEVk9DKSAmIFNEVk9fREVURUNURUQp KSB7CiAKLQkJCWlmIChJU19HNFgoZGV2KSkgeworCQkJaWYgKElTX0c0WChkZXZfcHJpdikpIHsK IAkJCQlEUk1fREVCVUdfS01TKCJwcm9iaW5nIEhETUkgb24gU0RWT0NcbiIpOwogCQkJCWludGVs X2hkbWlfaW5pdChkZXYsIEdFTjRfSERNSUMsIFBPUlRfQyk7CiAJCQl9Ci0JCQlpZiAoSVNfRzRY KGRldikpCisJCQlpZiAoSVNfRzRYKGRldl9wcml2KSkKIAkJCQlpbnRlbF9kcF9pbml0KGRldiwg RFBfQywgUE9SVF9DKTsKIAkJfQogCi0JCWlmIChJU19HNFgoZGV2KSAmJgotCQkgICAgKEk5MTVf UkVBRChEUF9EKSAmIERQX0RFVEVDVEVEKSkKKwkJaWYgKElTX0c0WChkZXZfcHJpdikgJiYgKEk5 MTVfUkVBRChEUF9EKSAmIERQX0RFVEVDVEVEKSkKIAkJCWludGVsX2RwX2luaXQoZGV2LCBEUF9E LCBQT1JUX0QpOwogCX0gZWxzZSBpZiAoSVNfR0VOMihkZXYpKQogCQlpbnRlbF9kdm9faW5pdChk ZXYpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKaW5kZXggYjZjOGIyNWVlMWQ0Li5kZmM5M2NjMTFh MTMgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwpAQCAtMTM0MSw3ICsxMzQxLDcgQEAgaW50ZWxf ZHBfc2V0X2Nsb2NrKHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCWNvbnN0IHN0cnVj dCBkcF9saW5rX2RwbGwgKmRpdmlzb3IgPSBOVUxMOwogCWludCBpLCBjb3VudCA9IDA7CiAKLQlp ZiAoSVNfRzRYKGRldikpIHsKKwlpZiAoSVNfRzRYKGRldl9wcml2KSkgewogCQlkaXZpc29yID0g Z2VuNF9kcGxsOwogCQljb3VudCA9IEFSUkFZX1NJWkUoZ2VuNF9kcGxsKTsKIAl9IGVsc2UgaWYg KEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKaW5k ZXggZjY1NjI0NTFjNDdlLi5jN2Q5Y2RkZjRlM2UgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1p LmMKQEAgLTE4ODksNyArMTg4OSw3IEBAIHZvaWQgaW50ZWxfaGRtaV9pbml0X2Nvbm5lY3Rvcihz dHJ1Y3QgaW50ZWxfZGlnaXRhbF9wb3J0ICppbnRlbF9kaWdfcG9ydCwKIAkJaW50ZWxfaGRtaS0+ d3JpdGVfaW5mb2ZyYW1lID0gdmx2X3dyaXRlX2luZm9mcmFtZTsKIAkJaW50ZWxfaGRtaS0+c2V0 X2luZm9mcmFtZXMgPSB2bHZfc2V0X2luZm9mcmFtZXM7CiAJCWludGVsX2hkbWktPmluZm9mcmFt ZV9lbmFibGVkID0gdmx2X2luZm9mcmFtZV9lbmFibGVkOwotCX0gZWxzZSBpZiAoSVNfRzRYKGRl dikpIHsKKwl9IGVsc2UgaWYgKElTX0c0WChkZXZfcHJpdikpIHsKIAkJaW50ZWxfaGRtaS0+d3Jp dGVfaW5mb2ZyYW1lID0gZzR4X3dyaXRlX2luZm9mcmFtZTsKIAkJaW50ZWxfaGRtaS0+c2V0X2lu Zm9mcmFtZXMgPSBnNHhfc2V0X2luZm9mcmFtZXM7CiAJCWludGVsX2hkbWktPmluZm9mcmFtZV9l bmFibGVkID0gZzR4X2luZm9mcmFtZV9lbmFibGVkOwpAQCAtMTk5Niw3ICsxOTk2LDcgQEAgdm9p ZCBpbnRlbF9oZG1pX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkgKiB0byB3b3JrIG9u IHJlYWwgaGFyZHdhcmUuIEFuZCBzaW5jZSBnNHggY2FuIHNlbmQgaW5mb2ZyYW1lcyB0bwogCSAq IG9ubHkgb25lIHBvcnQgYW55d2F5LCBub3RoaW5nIGlzIGxvc3QgYnkgYWxsb3dpbmcgaXQuCiAJ ICovCi0JaWYgKElTX0c0WChkZXYpKQorCWlmIChJU19HNFgoZGV2X3ByaXYpKQogCQlpbnRlbF9l bmNvZGVyLT5jbG9uZWFibGUgfD0gMSA8PCBJTlRFTF9PVVRQVVRfSERNSTsKIAogCWludGVsX2Rp Z19wb3J0LT5wb3J0ID0gcG9ydDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCmluZGV4IDU1YzljNzQz NjI2NS4uOGIxMTVkZmU2NTQ2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMKQEAgLTMyNiw3ICsz MjYsNyBAQCB2b2lkIGludGVsX3NldF9tZW1vcnlfY3hzcihzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0 ZSAqZGV2X3ByaXYsIGJvb2wgZW5hYmxlKQogCQlJOTE1X1dSSVRFKEZXX0JMQ19TRUxGX1ZMViwg ZW5hYmxlID8gRldfQ1NQV1JEV05FTiA6IDApOwogCQlQT1NUSU5HX1JFQUQoRldfQkxDX1NFTEZf VkxWKTsKIAkJZGV2X3ByaXYtPndtLnZsdi5jeHNyID0gZW5hYmxlOwotCX0gZWxzZSBpZiAoSVNf RzRYKGRldikgfHwgSVNfQ1JFU1RMSU5FKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX0c0WChkZXZf cHJpdikgfHwgSVNfQ1JFU1RMSU5FKGRldl9wcml2KSkgewogCQlJOTE1X1dSSVRFKEZXX0JMQ19T RUxGLCBlbmFibGUgPyBGV19CTENfU0VMRl9FTiA6IDApOwogCQlQT1NUSU5HX1JFQUQoRldfQkxD X1NFTEYpOwogCX0gZWxzZSBpZiAoSVNfUElORVZJRVcoZGV2KSkgewpAQCAtNzc4NCw3ICs3Nzg0 LDcgQEAgdm9pZCBpbnRlbF9pbml0X3BtKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlkZXZf cHJpdi0+ZGlzcGxheS51cGRhdGVfd20gPSBOVUxMOwogCQl9IGVsc2UKIAkJCWRldl9wcml2LT5k aXNwbGF5LnVwZGF0ZV93bSA9IHBpbmV2aWV3X3VwZGF0ZV93bTsKLQl9IGVsc2UgaWYgKElTX0c0 WChkZXYpKSB7CisJfSBlbHNlIGlmIChJU19HNFgoZGV2X3ByaXYpKSB7CiAJCWRldl9wcml2LT5k aXNwbGF5LnVwZGF0ZV93bSA9IGc0eF91cGRhdGVfd207CiAJfSBlbHNlIGlmIChJU19HRU40KGRl dikpIHsKIAkJZGV2X3ByaXYtPmRpc3BsYXkudXBkYXRlX3dtID0gaTk2NV91cGRhdGVfd207Ci0t IAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K SW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==