From: Tvrtko Ursulin Subject: [PATCH 20/22] drm/i915: Make IS_VALLEYVIEW only take dev_priv Date: Wed, 5 Oct 2016 13:33:47 +0100 Message-ID: <1475670829-14025-21-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-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 551006E844 for ; Wed, 5 Oct 2016 12:34:21 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id b201so19205397wmb.1 for ; Wed, 05 Oct 2016 05:34:21 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDk0 NCBieXRlcyBvZiAucm9kYXRhIHN0cmluZ3MgYW5kIDEyOCBieXRlcyBvZiAudGV4dC4KClNpZ25l ZC1vZmYtYnk6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+Ci0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCAgICAgICAgIHwgMiArLQogZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYyAgIHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ncHVfZXJyb3IuYyAgIHwgNCArKy0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9jcnQuYyAgICAgICAgfCA2ICsrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jICAgIHwgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwLmMgICAg ICAgICB8IDggKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAg ICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3BtLmMgICAgICAgICB8IDIgKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8IDMgKy0tCiA5IGZpbGVz IGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oCmluZGV4IDk5ZTUwNDcwM2VkZC4uMWVjNTU2MGVhZGQzIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmgKQEAgLTI2NjEsNyArMjY2MSw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFi bGUgewogI2RlZmluZSBJU19JVkJfR1QxKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3ByaXYp ID09IDB4MDE1NiB8fCBcCiAJCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDAxNTIgfHwg XAogCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMTVhKQotI2RlZmluZSBJU19WQUxM RVlWSUVXKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfdmFsbGV5dmlldykKKyNkZWZpbmUgSVNf VkFMTEVZVklFVyhkZXZfcHJpdikJKGRldl9wcml2LT5pbmZvLmlzX3ZhbGxleXZpZXcpCiAjZGVm aW5lIElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpCShkZXZfcHJpdi0+aW5mby5pc19jaGVycnl2aWV3 KQogI2RlZmluZSBJU19IQVNXRUxMKGRldl9wcml2KQkoZGV2X3ByaXYtPmluZm8uaXNfaGFzd2Vs bCkKICNkZWZpbmUgSVNfQlJPQURXRUxMKGRldl9wcml2KQkoZGV2X3ByaXYtPmluZm8uaXNfYnJv YWR3ZWxsKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2Uu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX2ZlbmNlLmMKaW5kZXggOGRmMWZhNzIz NGU4Li5kMjY3Njg1NjcyNTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX2ZlbmNlLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fZmVuY2UuYwpA QCAtNDQ4LDcgKzQ0OCw3IEBAIGk5MTVfZ2VtX2RldGVjdF9iaXRfNl9zd2l6emxlKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpCiAJdWludDMyX3Qgc3dpenpsZV94ID0gSTkxNV9CSVRfNl9TV0laWkxF X1VOS05PV047CiAJdWludDMyX3Qgc3dpenpsZV95ID0gSTkxNV9CSVRfNl9TV0laWkxFX1VOS05P V047CiAKLQlpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPj0gOCB8fCBJU19WQUxMRVlWSUVXKGRl dikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSA4IHx8IElTX1ZBTExFWVZJRVcoZGV2 X3ByaXYpKSB7CiAJCS8qCiAJCSAqIE9uIEJEVyssIHN3aXp6bGluZyBpcyBub3QgdXNlZC4gV2Ug bGVhdmUgdGhlIENQVSBtZW1vcnkKIAkJICogY29udHJvbGxlciBpbiBjaGFyZ2Ugb2Ygb3B0aW1p emluZyBtZW1vcnkgYWNjZXNzZXMgd2l0aG91dApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMKaW5kZXggNmM3YjBmMDM0MWI1Li5kODA3YjNmOWE0M2IgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtMTM1MSw3ICsxMzUxLDcgQEAgc3RhdGljIHZvaWQgaTkx NV9jYXB0dXJlX3JlZ19zdGF0ZShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJ ICovCiAKIAkvKiAxOiBSZWdpc3RlcnMgc3BlY2lmaWMgdG8gYSBzaW5nbGUgZ2VuZXJhdGlvbiAq LwotCWlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKKwlpZiAoSVNfVkFMTEVZVklFVyhkZXZfcHJp dikpIHsKIAkJZXJyb3ItPmd0aWVyWzBdID0gSTkxNV9SRUFEKEdUSUVSKTsKIAkJZXJyb3ItPmll ciA9IEk5MTVfUkVBRChWTFZfSUVSKTsKIAkJZXJyb3ItPmZvcmNld2FrZSA9IEk5MTVfUkVBRF9G VyhGT1JDRVdBS0VfVkxWKTsKQEAgLTE0MDAsNyArMTQwMCw3IEBAIHN0YXRpYyB2b2lkIGk5MTVf Y2FwdHVyZV9yZWdfc3RhdGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAogCQll cnJvci0+Z3RpZXJbMF0gPSBJOTE1X1JFQUQoR1RJRVIpOwogCX0gZWxzZSBpZiAoSVNfR0VOMihk ZXYpKSB7CiAJCWVycm9yLT5pZXIgPSBJOTE1X1JFQUQxNihJRVIpOwotCX0gZWxzZSBpZiAoIUlT X1ZBTExFWVZJRVcoZGV2KSkgeworCX0gZWxzZSBpZiAoIUlTX1ZBTExFWVZJRVcoZGV2X3ByaXYp KSB7CiAJCWVycm9yLT5pZXIgPSBJOTE1X1JFQUQoSUVSKTsKIAl9CiAJZXJyb3ItPmVpciA9IEk5 MTVfUkVBRChFSVIpOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0 LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jcnQuYwppbmRleCAwMjNmZDg0ZjhmN2Iu LmRmNzVhMzQzZTgyNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0 LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY3J0LmMKQEAgLTI1Myw3ICsyNTMs NyBAQCBpbnRlbF9jcnRfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCiAJaWYgKEhBU19QQ0hfTFBUKGRldl9wcml2KSkKIAkJbWF4X2Nsb2NrID0gMTgwMDAwOwot CWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKKwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRl dl9wcml2KSkKIAkJLyoKIAkJICogMjcwIE1IeiBkdWUgdG8gY3VycmVudCBEUExMIGxpbWl0cywK IAkJICogREFDIGxpbWl0IHN1cHBvc2VkbHkgMzU1IE1Iei4KQEAgLTQyMyw3ICs0MjMsNyBAQCBz dGF0aWMgYm9vbCBpbnRlbF9jcnRfZGV0ZWN0X2hvdHBsdWcoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3RvcikKIAlpZiAoSEFTX1BDSF9TUExJVChkZXZfcHJpdikpCiAJCXJldHVybiBpbnRl bF9pcm9ubGFrZV9jcnRfZGV0ZWN0X2hvdHBsdWcoY29ubmVjdG9yKTsKIAotCWlmIChJU19WQUxM RVlWSUVXKGRldikpCisJaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQogCQlyZXR1cm4gdmFs bGV5dmlld19jcnRfZGV0ZWN0X2hvdHBsdWcoY29ubmVjdG9yKTsKIAogCS8qCkBAIC04NTAsNyAr ODUwLDcgQEAgdm9pZCBpbnRlbF9jcnRfaW5pdChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAJ aWYgKEhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpKQogCQlhZHBhX3JlZyA9IFBDSF9BRFBBOwotCWVs c2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKKwllbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9w cml2KSkKIAkJYWRwYV9yZWcgPSBWTFZfQURQQTsKIAllbHNlCiAJCWFkcGFfcmVnID0gQURQQTsK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRleCAyMzU2YjNjYTk3MDUuLjA1NDBh ZmMzZmVmNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwpAQCAtNTg3Myw3ICs1 ODczLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfdXBkYXRlX21heF9jZGNsayhzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2KQogCQkJZGV2X3ByaXYtPm1heF9jZGNsa19mcmVxID0gNjc1MDAwOwogCX0gZWxz ZSBpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpIHsKIAkJZGV2X3ByaXYtPm1heF9jZGNsa19m cmVxID0gMzIwMDAwOwotCX0gZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJfSBlbHNl IGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewogCQlkZXZfcHJpdi0+bWF4X2NkY2xrX2Zy ZXEgPSA0MDAwMDA7CiAJfSBlbHNlIHsKIAkJLyogb3RoZXJ3aXNlIGFzc3VtZSBjZGNsayBpcyBm aXhlZCAqLwpAQCAtNjgzNyw3ICs2ODM3LDcgQEAgc3RhdGljIHZvaWQgaTl4eF9jcnRjX2Rpc2Fi bGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKm9sZF9jcnRjX3N0YXRlLAogCWlmICghaW50ZWxf Y3J0Y19oYXNfdHlwZShpbnRlbF9jcnRjLT5jb25maWcsIElOVEVMX09VVFBVVF9EU0kpKSB7CiAJ CWlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkKIAkJCWNodl9kaXNhYmxlX3BsbChkZXZfcHJp diwgcGlwZSk7Ci0JCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2KSkKKwkJZWxzZSBpZiAoSVNf VkFMTEVZVklFVyhkZXZfcHJpdikpCiAJCQl2bHZfZGlzYWJsZV9wbGwoZGV2X3ByaXYsIHBpcGUp OwogCQllbHNlCiAJCQlpOXh4X2Rpc2FibGVfcGxsKGludGVsX2NydGMpOwpAQCAtODkwMyw3ICs4 OTAzLDcgQEAgc3RhdGljIGJvb2wgaTl4eF9nZXRfcGlwZV9jb25maWcoc3RydWN0IGludGVsX2Ny dGMgKmNydGMsCiAKIAlpZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCiAJCWNodl9jcnRjX2Ns b2NrX2dldChjcnRjLCBwaXBlX2NvbmZpZyk7Ci0JZWxzZSBpZiAoSVNfVkFMTEVZVklFVyhkZXYp KQorCWVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKQogCQl2bHZfY3J0Y19jbG9ja19n ZXQoY3J0YywgcGlwZV9jb25maWcpOwogCWVsc2UKIAkJaTl4eF9jcnRjX2Nsb2NrX2dldChjcnRj LCBwaXBlX2NvbmZpZyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cC5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAuYwppbmRleCAxZTFjY2YwOTJlMTEu LmEyYzRkNWEwYjcwNCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHAu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcC5jCkBAIC0xMzUwLDcgKzEzNTAs NyBAQCBpbnRlbF9kcF9zZXRfY2xvY2soc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJ fSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewogCQlkaXZpc29yID0gY2h2X2Rw bGw7CiAJCWNvdW50ID0gQVJSQVlfU0laRShjaHZfZHBsbCk7Ci0JfSBlbHNlIGlmIChJU19WQUxM RVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CiAJ CWRpdmlzb3IgPSB2bHZfZHBsbDsKIAkJY291bnQgPSBBUlJBWV9TSVpFKHZsdl9kcGxsKTsKIAl9 CkBAIC0xNzkwLDcgKzE3OTAsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kcF9wcmVwYXJlKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCQkJdHJhbnNfZHAgJj0gflRSQU5TX0RQX0VOSF9G UkFNSU5HOwogCQlJOTE1X1dSSVRFKFRSQU5TX0RQX0NUTChjcnRjLT5waXBlKSwgdHJhbnNfZHAp OwogCX0gZWxzZSB7Ci0JCWlmICghSEFTX1BDSF9TUExJVChkZXZfcHJpdikgJiYgIUlTX1ZBTExF WVZJRVcoZGV2KSAmJgorCQlpZiAoIUhBU19QQ0hfU1BMSVQoZGV2X3ByaXYpICYmICFJU19WQUxM RVlWSUVXKGRldl9wcml2KSAmJgogCQkgICAgIUlTX0NIRVJSWVZJRVcoZGV2X3ByaXYpICYmCiAJ CSAgICBwaXBlX2NvbmZpZy0+bGltaXRlZF9jb2xvcl9yYW5nZSkKIAkJCWludGVsX2RwLT5EUCB8 PSBEUF9DT0xPUl9SQU5HRV8xNl8yMzU7CkBAIC0zMzUxLDcgKzMzNTEsNyBAQCBpbnRlbF9kcF9z ZXRfc2lnbmFsX2xldmVscyhzdHJ1Y3QgaW50ZWxfZHAgKmludGVsX2RwKQogCQkJbWFzayA9IERE SV9CVUZfRU1QX01BU0s7CiAJfSBlbHNlIGlmIChJU19DSEVSUllWSUVXKGRldl9wcml2KSkgewog CQlzaWduYWxfbGV2ZWxzID0gY2h2X3NpZ25hbF9sZXZlbHMoaW50ZWxfZHApOwotCX0gZWxzZSBp ZiAoSVNfVkFMTEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9w cml2KSkgewogCQlzaWduYWxfbGV2ZWxzID0gdmx2X3NpZ25hbF9sZXZlbHMoaW50ZWxfZHApOwog CX0gZWxzZSBpZiAoSVNfR0VONyhkZXYpICYmIHBvcnQgPT0gUE9SVF9BKSB7CiAJCXNpZ25hbF9s ZXZlbHMgPSBnZW43X2VkcF9zaWduYWxfbGV2ZWxzKHRyYWluX3NldCk7CkBAIC01ODAxLDcgKzU4 MDEsNyBAQCBib29sIGludGVsX2RwX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJaW50 ZWxfZW5jb2Rlci0+ZW5hYmxlID0gdmx2X2VuYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+cG9z dF9kaXNhYmxlID0gY2h2X3Bvc3RfZGlzYWJsZV9kcDsKIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9w bGxfZGlzYWJsZSA9IGNodl9kcF9wb3N0X3BsbF9kaXNhYmxlOwotCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewog CQlpbnRlbF9lbmNvZGVyLT5wcmVfcGxsX2VuYWJsZSA9IHZsdl9kcF9wcmVfcGxsX2VuYWJsZTsK IAkJaW50ZWxfZW5jb2Rlci0+cHJlX2VuYWJsZSA9IHZsdl9wcmVfZW5hYmxlX2RwOwogCQlpbnRl bF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxlX2RwOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfaGRtaS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfaGRt aS5jCmluZGV4IGM4MjQzZGM0ZDJiOS4uNTAxMzM0MjQyZDM4IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfaGRtaS5jCkBAIC0xOTY1LDcgKzE5NjUsNyBAQCB2b2lkIGludGVsX2hkbWlfaW5pdChzdHJ1 Y3QgZHJtX2RldmljZSAqZGV2LAogCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2bHZfZW5hYmxl X2hkbWk7CiAJCWludGVsX2VuY29kZXItPnBvc3RfZGlzYWJsZSA9IGNodl9oZG1pX3Bvc3RfZGlz YWJsZTsKIAkJaW50ZWxfZW5jb2Rlci0+cG9zdF9wbGxfZGlzYWJsZSA9IGNodl9oZG1pX3Bvc3Rf cGxsX2Rpc2FibGU7Ci0JfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2Ug aWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7CiAJCWludGVsX2VuY29kZXItPnByZV9wbGxf ZW5hYmxlID0gdmx2X2hkbWlfcHJlX3BsbF9lbmFibGU7CiAJCWludGVsX2VuY29kZXItPnByZV9l bmFibGUgPSB2bHZfaGRtaV9wcmVfZW5hYmxlOwogCQlpbnRlbF9lbmNvZGVyLT5lbmFibGUgPSB2 bHZfZW5hYmxlX2hkbWk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9w bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCBmMDgyYzA2NWVlZGIu LjU0ZTZlZDA2NThjZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0u YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC03NzU4LDcgKzc3NTgs NyBAQCB2b2lkIGludGVsX2luaXRfcG0oc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAl9IGVsc2Ug aWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7CiAJCXZsdl9zZXR1cF93bV9sYXRlbmN5KGRl dik7CiAJCWRldl9wcml2LT5kaXNwbGF5LnVwZGF0ZV93bSA9IHZsdl91cGRhdGVfd207Ci0JfSBl bHNlIGlmIChJU19WQUxMRVlWSUVXKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVco ZGV2X3ByaXYpKSB7CiAJCXZsdl9zZXR1cF93bV9sYXRlbmN5KGRldik7CiAJCWRldl9wcml2LT5k aXNwbGF5LnVwZGF0ZV93bSA9IHZsdl91cGRhdGVfd207CiAJfSBlbHNlIGlmIChJU19QSU5FVklF VyhkZXYpKSB7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKaW5kZXggM2E2 ZTFhOTNhZWQ5Li5lZTU2YTg3NTZjMDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50 aW1lX3BtLmMKQEAgLTI1ODksNyArMjU4OSw2IEBAIHN0YXRpYyB2b2lkIHZsdl9jbW5sYW5lX3dh KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICAqLwogdm9pZCBpbnRlbF9wb3dl cl9kb21haW5zX2luaXRfaHcoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBib29s IHJlc3VtZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gJmRldl9wcml2LT5kcm07CiAJ c3RydWN0IGk5MTVfcG93ZXJfZG9tYWlucyAqcG93ZXJfZG9tYWlucyA9ICZkZXZfcHJpdi0+cG93 ZXJfZG9tYWluczsKIAogCXBvd2VyX2RvbWFpbnMtPmluaXRpYWxpemluZyA9IHRydWU7CkBAIC0y NjAyLDcgKzI2MDEsNyBAQCB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wgcmVzdW1lKQogCQltdXRleF9sb2NrKCZw b3dlcl9kb21haW5zLT5sb2NrKTsKIAkJY2h2X3BoeV9jb250cm9sX2luaXQoZGV2X3ByaXYpOwog CQltdXRleF91bmxvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotCX0gZWxzZSBpZiAoSVNfVkFM TEVZVklFVyhkZXYpKSB7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkgewog CQltdXRleF9sb2NrKCZwb3dlcl9kb21haW5zLT5sb2NrKTsKIAkJdmx2X2NtbmxhbmVfd2EoZGV2 X3ByaXYpOwogCQltdXRleF91bmxvY2soJnBvd2VyX2RvbWFpbnMtPmxvY2spOwotLSAKMi43LjQK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdm eCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=