From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [RFC v2] drm/i915: Eliminate devid sprinkle Date: Thu, 22 Feb 2018 09:05:14 +0000 Message-ID: <20180222090514.9713-1-tvrtko.ursulin@linux.intel.com> References: <20180222080907.14716-1-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 D344C6EC7A for ; Thu, 22 Feb 2018 09:05:24 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id q83so2441504wme.5 for ; Thu, 22 Feb 2018 01:05:24 -0800 (PST) In-Reply-To: <20180222080907.14716-1-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 Cc: Jani Nikula List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkludHJvZHVj ZSBzdWJwbGF0Zm9ybSBtYXNrIHRvIGVsaW1pbmF0ZSB0aHJvdWdob3V0IHRoZSBjb2RlIGRldmlk IGNoZWNraW5nCnNwcmlua2xlLCBtb3N0bHkgY291cnRlc3kgb2YgSVNfKl9VTFtUWF0gbWFjcm9z LgoKU3VicGxhdGZvcm0gbWFzayBpbml0aWFsaXphdGlvbiBpcyBtb3ZlZCBlaXRoZXIgdG8gc3Rh dGljIHRhYmxlcyAoSXJvbmxha2UKTSkgb3IgcnVudGltZSBkZXZpY2UgaW5mbyBpbml0IChQaW5l dmlldywgSGFzd2VsbCwgQnJvYWR3ZWxsLCBTa3lsYWtlLApLYWJ5bGFrZSwgQ29mZmVlbGFrZSBh bmQgQ2Fubm9ubGFrZSkuCgogICB0ZXh0ICAgIGRhdGEgICAgIGJzcyAgICAgZGVjICAgICBoZXgg ZmlsZW5hbWUKMTY3MzYzMCAgIDU5NjkxICAgIDUwNjQgMTczODM4NSAgMWE4NjkxIGk5MTUua28u MAoxNjczNTM2ICAgNTk2OTEgICAgNTA2NCAxNzM4MjkxICAxYTg2MzMgaTkxNS5rby4xCgp2Mjog Rml4ZWQgSVNfU1VCUExBVEZPUk0uIFVwZGF0ZWQgY29tbWl0IG1zZy4KClNpZ25lZC1vZmYtYnk6 IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClN1Z2dlc3RlZC1ieTog Q2hyaXMgV2lsc29uIDxjaHJpc0BjaHJpcy13aWxzb24uY28udWs+CkNjOiBDaHJpcyBXaWxzb24g PGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KQ2M6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBp bnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICB8 ICAzICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgIHwgNTggKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bj aS5jICAgICAgICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9p bmZvLmMgfCA2MSArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLQogZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaCB8IDIzICsrKysrKysrKysrLQogNSBmaWxlcyBj aGFuZ2VkLCAxMTAgaW5zZXJ0aW9ucygrKSwgMzggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKaW5kZXggYWFhODYxYjUxMDI0Li5jYTYyNDI4NWM5NmUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuYwpAQCAtOTA1LDcgKzkwNSw4IEBAIHN0YXRpYyBpbnQgaTkxNV9kcml2ZXJfaW5p dF9lYXJseShzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJZGV2aWNlX2luZm8t PmRldmljZV9pZCA9IGRldl9wcml2LT5kcm0ucGRldi0+ZGV2aWNlOwogCiAJQlVJTERfQlVHX09O KElOVEVMX01BWF9QTEFURk9STVMgPgotCQkgICAgIHNpemVvZihkZXZpY2VfaW5mby0+cGxhdGZv cm1fbWFzaykgKiBCSVRTX1BFUl9CWVRFKTsKKwkJICAgICBzaXplb2YoZGV2aWNlX2luZm8tPnBs YXRmb3JtX3N1YnBsYXRmb3JtX21hc2spICoKKwkJICAgICBCSVRTX1BFUl9CWVRFIC0gSU5URUxf U1VCUExBVEZPUk1fQklUUyk7CiAJQlVHX09OKGRldmljZV9pbmZvLT5nZW4gPiBzaXplb2YoZGV2 aWNlX2luZm8tPmdlbl9tYXNrKSAqIEJJVFNfUEVSX0JZVEUpOwogCXNwaW5fbG9ja19pbml0KCZk ZXZfcHJpdi0+aXJxX2xvY2spOwogCXNwaW5fbG9ja19pbml0KCZkZXZfcHJpdi0+Z3B1X2Vycm9y LmxvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaCBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggODJhMTA2YjFiZGJjLi44MDhkOTU3 Y2U5YmEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKKysrIGIv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjU4Nyw3ICsyNTg3LDExIEBAIGlu dGVsX2luZm8oY29uc3Qgc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogI2RlZmlu ZSBJU19SRVZJRChwLCBzaW5jZSwgdW50aWwpIFwKIAkoSU5URUxfUkVWSUQocCkgPj0gKHNpbmNl KSAmJiBJTlRFTF9SRVZJRChwKSA8PSAodW50aWwpKQogCi0jZGVmaW5lIElTX1BMQVRGT1JNKGRl dl9wcml2LCBwKSAoKGRldl9wcml2KS0+aW5mby5wbGF0Zm9ybV9tYXNrICYgQklUKHApKQorI2Rl ZmluZSBJU19QTEFURk9STShkZXZfcHJpdiwgcCkgKChkZXZfcHJpdiktPmluZm8ucGxhdGZvcm1f c3VicGxhdGZvcm1fbWFzayAmIEJJVChwKSkKKyNkZWZpbmUgSVNfU1VCUExBVEZPUk0oZGV2X3By aXYsIHAsIHMpIFwKKwkoSVNfUExBVEZPUk0oZGV2X3ByaXYsIHApICYmIFwKKwkgKChkZXZfcHJp diktPmluZm8ucGxhdGZvcm1fc3VicGxhdGZvcm1fbWFzayAmIFwKKwkgQklUKDMyIC0gSU5URUxf U1VCUExBVEZPUk1fQklUUyArIElOVEVMX1NVQlBMQVRGT1JNXyMjcykpKQogCiAjZGVmaW5lIElT X0k4MzAoZGV2X3ByaXYpCUlTX1BMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9JODMwKQogI2RlZmlu ZSBJU19JODQ1RyhkZXZfcHJpdikJSVNfUExBVEZPUk0oZGV2X3ByaXYsIElOVEVMX0k4NDVHKQpA QCAtMjYwMiwxMSArMjYwNiwxNSBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBkcm1faTkxNV9w cml2YXRlICpkZXZfcHJpdikKICNkZWZpbmUgSVNfRzQ1KGRldl9wcml2KQlJU19QTEFURk9STShk ZXZfcHJpdiwgSU5URUxfRzQ1KQogI2RlZmluZSBJU19HTTQ1KGRldl9wcml2KQlJU19QTEFURk9S TShkZXZfcHJpdiwgSU5URUxfR000NSkKICNkZWZpbmUgSVNfRzRYKGRldl9wcml2KQkoSVNfRzQ1 KGRldl9wcml2KSB8fCBJU19HTTQ1KGRldl9wcml2KSkKLSNkZWZpbmUgSVNfUElORVZJRVdfRyhk ZXZfcHJpdikJKElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweGEwMDEpCi0jZGVmaW5lIElTX1BJ TkVWSUVXX00oZGV2X3ByaXYpCShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHhhMDExKQorI2Rl ZmluZSBJU19QSU5FVklFV19HKGRldl9wcml2KQlcCisJSVNfU1VCUExBVEZPUk0oZGV2X3ByaXYs IElOVEVMX1BJTkVWSUVXLCBQSU5FVklFV19HKQorI2RlZmluZSBJU19QSU5FVklFV19NKGRldl9w cml2KQlcCisJSVNfU1VCUExBVEZPUk0oZGV2X3ByaXYsIElOVEVMX1BJTkVWSUVXLCBQSU5FVklF V19NKQogI2RlZmluZSBJU19QSU5FVklFVyhkZXZfcHJpdikJSVNfUExBVEZPUk0oZGV2X3ByaXYs IElOVEVMX1BJTkVWSUVXKQogI2RlZmluZSBJU19HMzMoZGV2X3ByaXYpCUlTX1BMQVRGT1JNKGRl dl9wcml2LCBJTlRFTF9HMzMpCi0jZGVmaW5lIElTX0lST05MQUtFX00oZGV2X3ByaXYpCShJTlRF TF9ERVZJRChkZXZfcHJpdikgPT0gMHgwMDQ2KQorI2RlZmluZSBJU19JUk9OTEFLRShkZXZfcHJp dikJSVNfUExBVEZPUk0oZGV2X3ByaXYsIElOVEVMX0lST05MQUtFKQorI2RlZmluZSBJU19JUk9O TEFLRV9NKGRldl9wcml2KQlcCisJSVNfU1VCUExBVEZPUk0oZGV2X3ByaXYsIElOVEVMX0lST05M QUtFLCBJUk9OTEFLRV9NKQogI2RlZmluZSBJU19JVllCUklER0UoZGV2X3ByaXYpCUlTX1BMQVRG T1JNKGRldl9wcml2LCBJTlRFTF9JVllCUklER0UpCiAjZGVmaW5lIElTX0lWQl9HVDEoZGV2X3By aXYpCShJU19JVllCUklER0UoZGV2X3ByaXYpICYmIFwKIAkJCQkgKGRldl9wcml2KS0+aW5mby5n dCA9PSAxKQpAQCAtMjYyNCwzOCArMjYzMiwxOSBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBk cm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikKICNkZWZpbmUgSVNfTU9CSUxFKGRldl9wcml2KQko KGRldl9wcml2KS0+aW5mby5pc19tb2JpbGUpCiAjZGVmaW5lIElTX0hTV19FQVJMWV9TRFYoZGV2 X3ByaXYpIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBcCiAJCQkJICAgIChJTlRFTF9ERVZJRChk ZXZfcHJpdikgJiAweEZGMDApID09IDB4MEMwMCkKLSNkZWZpbmUgSVNfQkRXX1VMVChkZXZfcHJp dikJKElTX0JST0FEV0VMTChkZXZfcHJpdikgJiYgXAotCQkJCSAoKElOVEVMX0RFVklEKGRldl9w cml2KSAmIDB4ZikgPT0gMHg2IHx8CVwKLQkJCQkgKElOVEVMX0RFVklEKGRldl9wcml2KSAmIDB4 ZikgPT0gMHhiIHx8CVwKLQkJCQkgKElOVEVMX0RFVklEKGRldl9wcml2KSAmIDB4ZikgPT0gMHhl KSkKLS8qIFVMWCBtYWNoaW5lcyBhcmUgYWxzbyBjb25zaWRlcmVkIFVMVC4gKi8KLSNkZWZpbmUg SVNfQkRXX1VMWChkZXZfcHJpdikJKElTX0JST0FEV0VMTChkZXZfcHJpdikgJiYgXAotCQkJCSAo SU5URUxfREVWSUQoZGV2X3ByaXYpICYgMHhmKSA9PSAweGUpCisjZGVmaW5lIElTX0JEV19VTFQo ZGV2X3ByaXYpCUlTX1NVQlBMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9CUk9BRFdFTEwsIFVMVCkK KyNkZWZpbmUgSVNfQkRXX1VMWChkZXZfcHJpdikJSVNfU1VCUExBVEZPUk0oZGV2X3ByaXYsIElO VEVMX0JST0FEV0VMTCwgVUxYKQogI2RlZmluZSBJU19CRFdfR1QzKGRldl9wcml2KQkoSVNfQlJP QURXRUxMKGRldl9wcml2KSAmJiBcCiAJCQkJIChkZXZfcHJpdiktPmluZm8uZ3QgPT0gMykKLSNk ZWZpbmUgSVNfSFNXX1VMVChkZXZfcHJpdikJKElTX0hBU1dFTEwoZGV2X3ByaXYpICYmIFwKLQkJ CQkgKElOVEVMX0RFVklEKGRldl9wcml2KSAmIDB4RkYwMCkgPT0gMHgwQTAwKQorI2RlZmluZSBJ U19IU1dfVUxUKGRldl9wcml2KQlJU19TVUJQTEFURk9STShkZXZfcHJpdiwgSU5URUxfSEFTV0VM TCwgVUxUKQogI2RlZmluZSBJU19IU1dfR1QzKGRldl9wcml2KQkoSVNfSEFTV0VMTChkZXZfcHJp dikgJiYgXAogCQkJCSAoZGV2X3ByaXYpLT5pbmZvLmd0ID09IDMpCiAvKiBVTFggbWFjaGluZXMg YXJlIGFsc28gY29uc2lkZXJlZCBVTFQuICovCi0jZGVmaW5lIElTX0hTV19VTFgoZGV2X3ByaXYp CShJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHgwQTBFIHx8IFwKLQkJCQkgSU5URUxfREVWSUQo ZGV2X3ByaXYpID09IDB4MEExRSkKLSNkZWZpbmUgSVNfU0tMX1VMVChkZXZfcHJpdikJKElOVEVM X0RFVklEKGRldl9wcml2KSA9PSAweDE5MDYgfHwgXAotCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJp dikgPT0gMHgxOTEzIHx8IFwKLQkJCQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MTkxNiB8 fCBcCi0JCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDE5MjEgfHwgXAotCQkJCSBJTlRF TF9ERVZJRChkZXZfcHJpdikgPT0gMHgxOTI2KQotI2RlZmluZSBJU19TS0xfVUxYKGRldl9wcml2 KQkoSU5URUxfREVWSUQoZGV2X3ByaXYpID09IDB4MTkwRSB8fCBcCi0JCQkJIElOVEVMX0RFVklE KGRldl9wcml2KSA9PSAweDE5MTUgfHwgXAotCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0g MHgxOTFFKQotI2RlZmluZSBJU19LQkxfVUxUKGRldl9wcml2KQkoSU5URUxfREVWSUQoZGV2X3By aXYpID09IDB4NTkwNiB8fCBcCi0JCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDU5MTMg fHwgXAotCQkJCSBJTlRFTF9ERVZJRChkZXZfcHJpdikgPT0gMHg1OTE2IHx8IFwKLQkJCQkgSU5U RUxfREVWSUQoZGV2X3ByaXYpID09IDB4NTkyMSB8fCBcCi0JCQkJIElOVEVMX0RFVklEKGRldl9w cml2KSA9PSAweDU5MjYpCi0jZGVmaW5lIElTX0tCTF9VTFgoZGV2X3ByaXYpCShJTlRFTF9ERVZJ RChkZXZfcHJpdikgPT0gMHg1OTBFIHx8IFwKLQkJCQkgSU5URUxfREVWSUQoZGV2X3ByaXYpID09 IDB4NTkxNSB8fCBcCi0JCQkJIElOVEVMX0RFVklEKGRldl9wcml2KSA9PSAweDU5MUUpCisjZGVm aW5lIElTX0hTV19VTFgoZGV2X3ByaXYpCUlTX1NVQlBMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9I QVNXRUxMLCBVTFgpCisjZGVmaW5lIElTX1NLTF9VTFQoZGV2X3ByaXYpCUlTX1NVQlBMQVRGT1JN KGRldl9wcml2LCBJTlRFTF9TS1lMQUtFLCBVTFQpCisjZGVmaW5lIElTX1NLTF9VTFgoZGV2X3By aXYpCUlTX1NVQlBMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9TS1lMQUtFLCBVTFgpCisjZGVmaW5l IElTX0tCTF9VTFQoZGV2X3ByaXYpCUlTX1NVQlBMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9LQUJZ TEFLRSwgVUxUKQorI2RlZmluZSBJU19LQkxfVUxYKGRldl9wcml2KQlJU19TVUJQTEFURk9STShk ZXZfcHJpdiwgSU5URUxfS0FCWUxBS0UsIFVMWCkKICNkZWZpbmUgSVNfU0tMX0dUMihkZXZfcHJp dikJKElTX1NLWUxBS0UoZGV2X3ByaXYpICYmIFwKIAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9 PSAyKQogI2RlZmluZSBJU19TS0xfR1QzKGRldl9wcml2KQkoSVNfU0tZTEFLRShkZXZfcHJpdikg JiYgXApAQCAtMjY2NiwxNCArMjY1NSwxMyBAQCBpbnRlbF9pbmZvKGNvbnN0IHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdikKIAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9PSAyKQog I2RlZmluZSBJU19LQkxfR1QzKGRldl9wcml2KQkoSVNfS0FCWUxBS0UoZGV2X3ByaXYpICYmIFwK IAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9PSAzKQotI2RlZmluZSBJU19DRkxfVUxUKGRldl9w cml2KQkoSVNfQ09GRkVFTEFLRShkZXZfcHJpdikgJiYgXAotCQkJCSAoSU5URUxfREVWSUQoZGV2 X3ByaXYpICYgMHgwMEYwKSA9PSAweDAwQTApCisjZGVmaW5lIElTX0NGTF9VTFQoZGV2X3ByaXYp CUlTX1NVQlBMQVRGT1JNKGRldl9wcml2LCBJTlRFTF9DT0ZGRUVMQUtFLCBVTFQpCiAjZGVmaW5l IElTX0NGTF9HVDIoZGV2X3ByaXYpCShJU19DT0ZGRUVMQUtFKGRldl9wcml2KSAmJiBcCiAJCQkJ IChkZXZfcHJpdiktPmluZm8uZ3QgPT0gMikKICNkZWZpbmUgSVNfQ0ZMX0dUMyhkZXZfcHJpdikJ KElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpICYmIFwKIAkJCQkgKGRldl9wcml2KS0+aW5mby5ndCA9 PSAzKQotI2RlZmluZSBJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpICAgKElTX0NBTk5PTkxB S0UoZGV2X3ByaXYpICYmIFwKLQkJCQkJKElOVEVMX0RFVklEKGRldl9wcml2KSAmIDB4MDAwNCkg PT0gMHgwMDA0KQorI2RlZmluZSBJU19DTkxfV0lUSF9QT1JUX0YoZGV2X3ByaXYpIFwKKwlJU19T VUJQTEFURk9STShkZXZfcHJpdiwgSU5URUxfQ0FOTk9OTEFLRSwgUE9SVEYpCiAKICNkZWZpbmUg SVNfQUxQSEFfU1VQUE9SVChpbnRlbF9pbmZvKSAoKGludGVsX2luZm8pLT5pc19hbHBoYV9zdXBw b3J0KQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYwppbmRleCAxZWFhYmYyOGQ3YjcuLjllMjk2N2Y3 YzU4MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wY2kuYworKysgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BjaS5jCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVk ZSAiaTkxNV9zZWxmdGVzdC5oIgogCiAjZGVmaW5lIFBMQVRGT1JNKHgpIC5wbGF0Zm9ybSA9ICh4 KSwgLnBsYXRmb3JtX21hc2sgPSBCSVQoeCkKKyNkZWZpbmUgU1VCUExBVEZPUk0oeCkgLnN1YnBs YXRmb3JtX21hc2sgPSBCSVQoSU5URUxfU1VCUExBVEZPUk1fIyN4KQogI2RlZmluZSBHRU4oeCkg LmdlbiA9ICh4KSwgLmdlbl9tYXNrID0gQklUKCh4KSAtIDEpCiAKICNkZWZpbmUgR0VOX0RFRkFV TFRfUElQRU9GRlNFVFMgXApAQCAtMjM0LDYgKzIzNSw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qg aW50ZWxfZGV2aWNlX2luZm8gaW50ZWxfaXJvbmxha2VfZF9pbmZvID0gewogc3RhdGljIGNvbnN0 IHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyBpbnRlbF9pcm9ubGFrZV9tX2luZm8gPSB7CiAJR0VO NV9GRUFUVVJFUywKIAlQTEFURk9STShJTlRFTF9JUk9OTEFLRSksCisJU1VCUExBVEZPUk0oSVJP TkxBS0VfTSksCiAJLmlzX21vYmlsZSA9IDEsIC5oYXNfZmJjID0gMSwKIH07CiAKQEAgLTYwNSw2 ICs2MDcsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGludGVsX2RldmljZV9pbmZvIGludGVsX2lj ZWxha2VfMTFfaW5mbyA9IHsKIAogI3VuZGVmIEdFTgogI3VuZGVmIFBMQVRGT1JNCisjdW5kZWYg U1VCUExBVEZPUk0KIAogLyoKICAqIE1ha2Ugc3VyZSBhbnkgZGV2aWNlIG1hdGNoZXMgaGVyZSBh cmUgZnJvbSBtb3N0IHNwZWNpZmljIHRvIG1vc3QKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k ZXZpY2VfaW5mby5jCmluZGV4IDI5OGY4OTk2Y2M1NC4uNWJlYjJjYmRlM2I1IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2RldmljZV9pbmZvLmMKQEAgLTExMSwxMCArMTExLDExIEBAIHZv aWQgaW50ZWxfZGV2aWNlX2luZm9fZHVtcChjb25zdCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2luZm8g KmluZm8sCiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0KIAkJY29udGFpbmVy X29mKGluZm8sIHN0cnVjdCBkcm1faTkxNV9wcml2YXRlLCBpbmZvKTsKIAotCWRybV9wcmludGYo cCwgInBjaWlkPTB4JTA0eCByZXY9MHglMDJ4IHBsYXRmb3JtPSVzIGdlbj0laVxuIiwKKwlkcm1f cHJpbnRmKHAsICJwY2lpZD0weCUwNHggcmV2PTB4JTAyeCBwbGF0Zm9ybT0lcyAoc3VicGxhdGZv cm09JXgpIGdlbj0laVxuIiwKIAkJICAgSU5URUxfREVWSUQoZGV2X3ByaXYpLAogCQkgICBJTlRF TF9SRVZJRChkZXZfcHJpdiksCiAJCSAgIGludGVsX3BsYXRmb3JtX25hbWUoaW5mby0+cGxhdGZv cm0pLAorCQkgICBpbmZvLT5zdWJwbGF0Zm9ybV9tYXNrLAogCQkgICBpbmZvLT5nZW4pOwogCiAJ aW50ZWxfZGV2aWNlX2luZm9fZHVtcF9mbGFncyhpbmZvLCBwKTsKQEAgLTQ1OCw2ICs0NTksNjIg QEAgc3RhdGljIHUzMiByZWFkX3RpbWVzdGFtcF9mcmVxdWVuY3koc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogCXJldHVybiAwOwogfQogCitzdGF0aWMgdm9pZCBpbnRlbF9kZXZp Y2VfaW5mb19zdWJwbGF0Zm9ybV9pbml0KHN0cnVjdCBpbnRlbF9kZXZpY2VfaW5mbyAqaW5mbykK K3sKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSA9CisJCWNvbnRhaW5lcl9vZihpbmZv LCBzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSwgaW5mbyk7CisJdTE2IGRldmlkID0gSU5URUxfREVW SUQoaTkxNSk7CisKKwlpZiAoSVNfUElORVZJRVcoaTkxNSkpIHsKKwkJaWYgKGRldmlkID09IDB4 YTAwMSkKKwkJCWluZm8tPnN1YnBsYXRmb3JtX21hc2sgPSBJTlRFTF9TVUJQTEFURk9STV9QSU5F VklFV19HOworCQllbHNlIGlmIChkZXZpZCA9PSAweGEwMTEpCisJCQlpbmZvLT5zdWJwbGF0Zm9y bV9tYXNrID0gSU5URUxfU1VCUExBVEZPUk1fUElORVZJRVdfTTsKKwl9IGVsc2UgaWYgKElTX0hB U1dFTEwoaTkxNSkpIHsKKwkJaWYgKChkZXZpZCAmIDB4RkYwMCkgPT0gMHgwQTAwKQorCQkJaW5m by0+c3VicGxhdGZvcm1fbWFzayA9IElOVEVMX1NVQlBMQVRGT1JNX1VMVDsKKwkJLyogVUxYIG1h Y2hpbmVzIGFyZSBhbHNvIGNvbnNpZGVyZWQgVUxULiAqLworCQlpZiAoZGV2aWQgPT0gMHgwQTBF IHx8IGRldmlkID09IDB4MEExRSkKKwkJCWluZm8tPnN1YnBsYXRmb3JtX21hc2sgfD0gSU5URUxf U1VCUExBVEZPUk1fVUxYOworCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGk5MTUpKSB7CisJCWlm ICgoZGV2aWQgJiAweGYpID09IDB4NiB8fAorCQkgICAgKGRldmlkICYgMHhmKSA9PSAweGIgfHwK KwkJICAgIChkZXZpZCAmIDB4ZikgPT0gMHhlKQorCQkJaW5mby0+c3VicGxhdGZvcm1fbWFzayA9 IElOVEVMX1NVQlBMQVRGT1JNX1VMVDsKKwkJLyogVUxYIG1hY2hpbmVzIGFyZSBhbHNvIGNvbnNp ZGVyZWQgVUxULiAqLworCQlpZiAoKGRldmlkICYgMHhmKSA9PSAweGUpCisJCQlpbmZvLT5zdWJw bGF0Zm9ybV9tYXNrIHw9IElOVEVMX1NVQlBMQVRGT1JNX1VMWDsKKwl9IGVsc2UgaWYgKElTX1NL WUxBS0UoaTkxNSkpIHsKKwkJaWYgKGRldmlkID09IDB4MTkwNiB8fAorCQkgICAgZGV2aWQgPT0g MHgxOTEzIHx8CisJCSAgICBkZXZpZCA9PSAweDE5MTYgfHwKKwkJICAgIGRldmlkID09IDB4MTky MSB8fAorCQkgICAgZGV2aWQgPT0gMHgxOTI2KQorCQkJaW5mby0+c3VicGxhdGZvcm1fbWFzayA9 IElOVEVMX1NVQlBMQVRGT1JNX1VMVDsKKwkJZWxzZSBpZiAoZGV2aWQgPT0gMHgxOTBFIHx8CisJ CQkgZGV2aWQgPT0gMHgxOTE1IHx8CisJCQkgZGV2aWQgPT0gMHgxOTFFKQorCQkJaW5mby0+c3Vi cGxhdGZvcm1fbWFzayA9IElOVEVMX1NVQlBMQVRGT1JNX1VMWDsKKwl9IGVsc2UgaWYgKElTX0tB QllMQUtFKGk5MTUpKSB7CisJCWlmIChkZXZpZCA9PSAweDU5MDYgfHwKKwkJICAgIGRldmlkID09 IDB4NTkxMyB8fAorCQkgICAgZGV2aWQgPT0gMHg1OTE2IHx8CisJCSAgICBkZXZpZCA9PSAweDU5 MjEgfHwKKwkJICAgIGRldmlkICA9PSAweDU5MjYpCisJCQlpbmZvLT5zdWJwbGF0Zm9ybV9tYXNr ID0gSU5URUxfU1VCUExBVEZPUk1fVUxUOworCQllbHNlIGlmIChkZXZpZCA9PSAweDU5MEUgfHwK KwkJCSBkZXZpZCA9PSAweDU5MTUgfHwKKwkJCSBkZXZpZCA9PSAweDU5MUUpCisJCQlpbmZvLT5z dWJwbGF0Zm9ybV9tYXNrID0gSU5URUxfU1VCUExBVEZPUk1fVUxYOworCX0gZWxzZSBpZiAoSVNf Q09GRkVFTEFLRShpOTE1KSkgeworCQlpZiAoKGRldmlkICYgMHgwMEYwKSA9PSAweDAwQTApCisJ CQlpbmZvLT5zdWJwbGF0Zm9ybV9tYXNrID0gSU5URUxfU1VCUExBVEZPUk1fVUxUOworCX0gZWxz ZSBpZiAoSVNfQ0FOTk9OTEFLRShpOTE1KSkgeworCQlpZiAoKGRldmlkICYgMHgwMDA0KSA9PSAw eDAwMDQpCisJCQlpbmZvLT5zdWJwbGF0Zm9ybV9tYXNrID0gSU5URUxfU1VCUExBVEZPUk1fUE9S VEY7CisJfQorfQorCiAvKioKICAqIGludGVsX2RldmljZV9pbmZvX3J1bnRpbWVfaW5pdCAtIGlu aXRpYWxpemUgcnVudGltZSBpbmZvCiAgKiBAaW5mbzogaW50ZWwgZGV2aWNlIGluZm8gc3RydWN0 CkBAIC00ODAsNiArNTM3LDggQEAgdm9pZCBpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2luaXQo c3RydWN0IGludGVsX2RldmljZV9pbmZvICppbmZvKQogCQljb250YWluZXJfb2YoaW5mbywgc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUsIGluZm8pOwogCWVudW0gcGlwZSBwaXBlOwogCisJaW50ZWxf ZGV2aWNlX2luZm9fc3VicGxhdGZvcm1faW5pdChpbmZvKTsKKwogCWlmIChJTlRFTF9HRU4oZGV2 X3ByaXYpID49IDEwKSB7CiAJCWZvcl9lYWNoX3BpcGUoZGV2X3ByaXYsIHBpcGUpCiAJCQlpbmZv LT5udW1fc2NhbGVyc1twaXBlXSA9IDI7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kZXZpY2VfaW5mby5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNl X2luZm8uaAppbmRleCA3MWZkZmIwNDUxZWYuLjdiNjIxMTA2MWZiYSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGV2aWNlX2luZm8uaAorKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kZXZpY2VfaW5mby5oCkBAIC03NCw2ICs3NCwyMCBAQCBlbnVtIGludGVs X3BsYXRmb3JtIHsKIAlJTlRFTF9NQVhfUExBVEZPUk1TCiB9OwogCisvKiBTdWJwbGF0Zm9ybSBm bGFncyBzaGFyZSB0aGUgc2FtZSBuYW1lc3BhY2UgcGVyIHBhcmVudCBwbGF0Zm9ybS4gKi8KKwor I2RlZmluZSBJTlRFTF9TVUJQTEFURk9STV9CSVRTICgyKQorCisjZGVmaW5lIElOVEVMX1NVQlBM QVRGT1JNX0lST05MQUtFX00gKDApCisKKyNkZWZpbmUgSU5URUxfU1VCUExBVEZPUk1fUElORVZJ RVdfRyAoMCkKKyNkZWZpbmUgSU5URUxfU1VCUExBVEZPUk1fUElORVZJRVdfTSAoMSkKKworI2Rl ZmluZSBJTlRFTF9TVUJQTEFURk9STV9VTFQgKDApCisjZGVmaW5lIElOVEVMX1NVQlBMQVRGT1JN X1VMWCAoMSkKKworI2RlZmluZSBJTlRFTF9TVUJQTEFURk9STV9QT1JURiAoMCkKKwogI2RlZmlu ZSBERVZfSU5GT19GT1JfRUFDSF9GTEFHKGZ1bmMpIFwKIAlmdW5jKGlzX21vYmlsZSk7IFwKIAlm dW5jKGlzX2xwKTsgXApAQCAtMTM1LDcgKzE0OSwxNCBAQCBzdHJ1Y3QgaW50ZWxfZGV2aWNlX2lu Zm8gewogCXU4IHJpbmdfbWFzazsgLyogUmluZ3Mgc3VwcG9ydGVkIGJ5IHRoZSBIVyAqLwogCiAJ ZW51bSBpbnRlbF9wbGF0Zm9ybSBwbGF0Zm9ybTsKLQl1MzIgcGxhdGZvcm1fbWFzazsKKworCXVu aW9uIHsKKwkJdTMyIHBsYXRmb3JtX3N1YnBsYXRmb3JtX21hc2s7CisJCXN0cnVjdCB7CisJCQl1 MzIgcGxhdGZvcm1fbWFzayA6ICgzMiAtIElOVEVMX1NVQlBMQVRGT1JNX0JJVFMpOworCQkJdTMy IHN1YnBsYXRmb3JtX21hc2sgOiBJTlRFTF9TVUJQTEFURk9STV9CSVRTOworCQl9OworCX07CiAK IAl1MzIgZGlzcGxheV9tbWlvX29mZnNldDsKIAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK