From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/5] drm/i915: Replace "INTEL_INFO->gen == x" checks with IS_GENx Date: Fri, 6 May 2016 16:20:49 +0100 Message-ID: <1462548051-7947-4-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1462548051-7947-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 mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTP id AF6226E27F for ; Fri, 6 May 2016 15:20:57 +0000 (UTC) In-Reply-To: <1462548051-7947-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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgd2F5 IG9wdGltaXphdGlvbiBmcm9tIGEgcHJldmlvdXMgcGF0Y2ggd29ya3MgZXZlbiBiZXR0ZXIuCgpT aWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgot LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8IDQgKystLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgICAgIHwgNCArKy0tCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2Rydi5oICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyAg ICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyAgfCAyICst CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYyAgfCAyICstCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2lycS5jICAgICAgICAgfCA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5j ICAgICAgICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jICAgICAg IHwgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYyAgICAgICAgIHwgNCArKy0t CiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgfCA2ICsrKy0tLQogMTUg ZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRleCA2YWQwMDhjMTk2YjUuLmUyNjRmMTY4ZWYwMiAx MDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKQEAgLTIzMTAsMTIgKzIzMTAsMTIgQEAg c3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRy bV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYt PmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2luZTsKIAotCWlmIChJ TlRFTF9JTkZPKGRldiktPmdlbiA9PSA2KQorCWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJc2Vx X3ByaW50ZihtLCAiR0ZYX01PREU6IDB4JTA4eFxuIiwgSTkxNV9SRUFEKEdGWF9NT0RFKSk7CiAK IAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBkZXZfcHJpdikgewogCQlzZXFfcHJpbnRmKG0sICIl c1xuIiwgZW5naW5lLT5uYW1lKTsKLQkJaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDcpCisJ CWlmIChJU19HRU43KGRldl9wcml2KSkKIAkJCXNlcV9wcmludGYobSwgIkdGWF9NT0RFOiAweCUw OHhcbiIsCiAJCQkJICAgSTkxNV9SRUFEKFJJTkdfTU9ERV9HRU43KGVuZ2luZSkpKTsKIAkJc2Vx X3ByaW50ZihtLCAiUFBfRElSX0JBU0U6IDB4JTA4eFxuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5j CmluZGV4IDcyNWQ3NWY0ZGZhZC4uYWYzMmMzODkzNGMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2RtYS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1h LmMKQEAgLTg4OCw3ICs4ODgsNyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZXZpY2VfaW5mb19ydW50 aW1lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJRFJNX0lORk8oIkRpc3BsYXkgZGlz YWJsZWQgKG1vZHVsZSBwYXJhbWV0ZXIpXG4iKTsKIAkJaW5mby0+bnVtX3BpcGVzID0gMDsKIAl9 IGVsc2UgaWYgKGluZm8tPm51bV9waXBlcyA+IDAgJiYKLQkJICAgKElOVEVMX0lORk8oZGV2KS0+ Z2VuID09IDcgfHwgSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gOCkgJiYKKwkJICAgKElTX0dFTjco ZGV2X3ByaXYpIHx8IElTX0dFTjgoZGV2X3ByaXYpKSAmJgogCQkgICBIQVNfUENIX1NQTElUKGRl dikpIHsKIAkJdTMyIGZ1c2Vfc3RyYXAgPSBJOTE1X1JFQUQoRlVTRV9TVFJBUCk7CiAJCXUzMiBz ZnVzZV9zdHJhcCA9IEk5MTVfUkVBRChTRlVTRV9TVFJBUCk7CkBAIC05MTIsNyArOTEyLDcgQEAg c3RhdGljIHZvaWQgaW50ZWxfZGV2aWNlX2luZm9fcnVudGltZV9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYpCiAJCQlEUk1fSU5GTygiUGlwZUMgZnVzZWQgb2ZmXG4iKTsKIAkJCWluZm8tPm51 bV9waXBlcyAtPSAxOwogCQl9Ci0JfSBlbHNlIGlmIChpbmZvLT5udW1fcGlwZXMgPiAwICYmIElO VEVMX0lORk8oZGV2KS0+Z2VuID09IDkpIHsKKwl9IGVsc2UgaWYgKGluZm8tPm51bV9waXBlcyA+ IDAgJiYgSVNfR0VOOShkZXZfcHJpdikpIHsKIAkJdTMyIGRmc20gPSBJOTE1X1JFQUQoU0tMX0RG U00pOwogCQl1OCBkaXNhYmxlZF9tYXNrID0gMDsKIAkJYm9vbCBpbnZhbGlkOwpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZHJ2LmMKaW5kZXggZGE2NTMyZGE0NGUzLi5mMjdjYzE1YjZmOGUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9kcnYuYwpAQCAtNTQ4LDcgKzU0OCw3IEBAIGJvb2wgaTkxNV9zZW1hcGhvcmVfaXNf ZW5hYmxlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCiAjaWZkZWYgQ09ORklHX0lOVEVMX0lP TU1VCiAJLyogRW5hYmxlIHNlbWFwaG9yZXMgb24gU05CIHdoZW4gSU8gcmVtYXBwaW5nIGlzIG9m ZiAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA9PSA2ICYmIGludGVsX2lvbW11X2dmeF9t YXBwZWQpCisJaWYgKElTX0dFTjYoZGV2KSAmJiBpbnRlbF9pb21tdV9nZnhfbWFwcGVkKQogCQly ZXR1cm4gZmFsc2U7CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggNWQwM2Yz ODliOTEyLi5mNmYxMzE5MzE3MDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjcwMiw3 ICsyNzAyLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJCQkJIElTX0NIRVJSWVZJ RVcoZGV2KSB8fCBJU19TS1lMQUtFKGRldikgfHwgXAogCQkJCSBJU19LQUJZTEFLRShkZXYpIHx8 IElTX0JST1hUT04oZGV2KSkKICNkZWZpbmUgSEFTX1JDNihkZXYpCQkoSU5URUxfSU5GTyhkZXYp LT5nZW4gPj0gNikKLSNkZWZpbmUgSEFTX1JDNnAoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+Z2Vu ID09IDYgfHwgSVNfSVZZQlJJREdFKGRldikpCisjZGVmaW5lIEhBU19SQzZwKGRldikJCShJU19H RU42KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikpCiAKICNkZWZpbmUgSEFTX0NTUihkZXYpCShJ U19HRU45KGRldikpCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2Vt LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGE4OGU2YzllOTUxNi4u ZjJlNDJjMGNjNWJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE5ODIsNyArMTk4Miw3 IEBAIGk5MTVfZ2VtX2dldF9ndHRfc2l6ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MzJf dCBzaXplLCBpbnQgdGlsaW5nX21vZGUpCiAJCXJldHVybiBzaXplOwogCiAJLyogUHJldmlvdXMg Y2hpcHMgbmVlZCBhIHBvd2VyLW9mLXR3byBmZW5jZSByZWdpb24gd2hlbiB0aWxpbmcgKi8KLQlp ZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gMykKKwlpZiAoSVNfR0VOMyhkZXYpKQogCQlndHRf c2l6ZSA9IDEwMjQqMTAyNDsKIAllbHNlCiAJCWd0dF9zaXplID0gNTEyKjEwMjQ7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX2d0dC5jCmluZGV4IGQyODRiMTdhZjQzMS4uNjFlODVjMmI1MDBkIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYworKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9ndHQuYwpAQCAtMTQ0LDcgKzE0NCw3IEBAIGludCBp bnRlbF9zYW5pdGl6ZV9lbmFibGVfcHBndHQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgaW50IGVu YWJsZV9wcGd0dCkKIAogI2lmZGVmIENPTkZJR19JTlRFTF9JT01NVQogCS8qIERpc2FibGUgcHBn dHQgb24gU05CIGlmIFZULWQgaXMgb24uICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09 IDYgJiYgaW50ZWxfaW9tbXVfZ2Z4X21hcHBlZCkgeworCWlmIChJU19HRU42KGRldikgJiYgaW50 ZWxfaW9tbXVfZ2Z4X21hcHBlZCkgewogCQlEUk1fSU5GTygiRGlzYWJsaW5nIFBQR1RUIGJlY2F1 c2UgVlQtZCBpcyBvblxuIik7CiAJCXJldHVybiAwOwogCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9nZW1fc3RvbGVuLmMKaW5kZXggNjhmZGU4ZmJhODAzLi5mOTI1M2YyYjdiYTAgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCkBAIC01Niw3ICs1Niw3IEBAIGludCBpOTE1 X2dlbV9zdG9sZW5faW5zZXJ0X25vZGVfaW5fcmFuZ2Uoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg KmRldl9wcml2LAogCiAJLyogU2VlIHRoZSBjb21tZW50IGF0IHRoZSBkcm1fbW1faW5pdCgpIGNh bGwgZm9yIG1vcmUgYWJvdXQgdGhpcyBjaGVjay4KIAkgKiBXYVNraXBTdG9sZW5NZW1vcnlGaXJz dFBhZ2U6YmR3LGNodiAoaW5jb21wbGV0ZSkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdikt PmdlbiA9PSA4ICYmIHN0YXJ0IDwgNDA5NikKKwlpZiAoSVNfR0VOOChkZXZfcHJpdikgJiYgc3Rh cnQgPCA0MDk2KQogCQlzdGFydCA9IDQwOTY7CiAKIAltdXRleF9sb2NrKCZkZXZfcHJpdi0+bW0u c3RvbGVuX2xvY2spOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f dGlsaW5nLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV90aWxpbmcuYwppbmRleCA4 MjlkYWI2OTg5NWYuLjJmY2I0YWZhZGUxOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9nZW1fdGlsaW5nLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1f dGlsaW5nLmMKQEAgLTEyNSw3ICsxMjUsNyBAQCBpOTE1X2dlbV9vYmplY3RfZmVuY2Vfb2soc3Ry dWN0IGRybV9pOTE1X2dlbV9vYmplY3QgKm9iaiwgaW50IHRpbGluZ19tb2RlKQogCWlmIChJTlRF TF9JTkZPKG9iai0+YmFzZS5kZXYpLT5nZW4gPj0gNCkKIAkJcmV0dXJuIHRydWU7CiAKLQlpZiAo SU5URUxfSU5GTyhvYmotPmJhc2UuZGV2KS0+Z2VuID09IDMpIHsKKwlpZiAoSVNfR0VOMyhvYmot PmJhc2UuZGV2KSkgewogCQlpZiAoaTkxNV9nZW1fb2JqX2dndHRfb2Zmc2V0KG9iaikgJiB+STkx NV9GRU5DRV9TVEFSVF9NQVNLKQogCQkJcmV0dXJuIGZhbHNlOwogCX0gZWxzZSB7CmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwppbmRleCA4OTcyNWM5ZWZjMjUuLjEyYTc0OWM5NzA3 YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5jCkBAIC00MTEsNyArNDExLDcg QEAgaW50IGk5MTVfZXJyb3Jfc3RhdGVfdG9fc3RyKHN0cnVjdCBkcm1faTkxNV9lcnJvcl9zdGF0 ZV9idWYgKm0sCiAJCWVycl9wcmludGYobSwgIkRPTkVfUkVHOiAweCUwOHhcbiIsIGVycm9yLT5k b25lX3JlZyk7CiAJfQogCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDcpCisJaWYgKElT X0dFTjcoZGV2KSkKIAkJZXJyX3ByaW50ZihtLCAiRVJSX0lOVDogMHglMDh4XG4iLCBlcnJvci0+ ZXJyX2ludCk7CiAKIAlmb3IgKGkgPSAwOyBpIDwgQVJSQVlfU0laRShlcnJvci0+cmluZyk7IGkr KykKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCmluZGV4IDJmNmZkMzNjMDdiYS4uYmE4NGI5YjE3ZmMy IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfaXJxLmMKQEAgLTQ2NzQsMTIgKzQ2NzQsMTIgQEAgdm9pZCBp bnRlbF9pcnFfaW5pdChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAJCWRldi0+ ZHJpdmVyLT5kaXNhYmxlX3ZibGFuayA9IGlyb25sYWtlX2Rpc2FibGVfdmJsYW5rOwogCQlkZXZf cHJpdi0+ZGlzcGxheS5ocGRfaXJxX3NldHVwID0gaWxrX2hwZF9pcnFfc2V0dXA7CiAJfSBlbHNl IHsKLQkJaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPT0gMikgeworCQlpZiAoSVNfR0VO MihkZXZfcHJpdikpIHsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfcHJlaW5zdGFsbCA9IGk4eHhfaXJx X3ByZWluc3RhbGw7CiAJCQlkZXYtPmRyaXZlci0+aXJxX3Bvc3RpbnN0YWxsID0gaTh4eF9pcnFf cG9zdGluc3RhbGw7CiAJCQlkZXYtPmRyaXZlci0+aXJxX2hhbmRsZXIgPSBpOHh4X2lycV9oYW5k bGVyOwogCQkJZGV2LT5kcml2ZXItPmlycV91bmluc3RhbGwgPSBpOHh4X2lycV91bmluc3RhbGw7 Ci0JCX0gZWxzZSBpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA9PSAzKSB7CisJCX0gZWxz ZSBpZiAoSVNfR0VOMyhkZXZfcHJpdikpIHsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfcHJlaW5zdGFs bCA9IGk5MTVfaXJxX3ByZWluc3RhbGw7CiAJCQlkZXYtPmRyaXZlci0+aXJxX3Bvc3RpbnN0YWxs ID0gaTkxNV9pcnFfcG9zdGluc3RhbGw7CiAJCQlkZXYtPmRyaXZlci0+aXJxX3VuaW5zdGFsbCA9 IGk5MTVfaXJxX3VuaW5zdGFsbDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwppbmRl eCA2YmE2NzZmODFiYWUuLmE4YjgyYzI5NjY2ZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfZGlzcGxheS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rp c3BsYXkuYwpAQCAtMTIwNCw3ICsxMjA0LDcgQEAgc3RhdGljIHZvaWQgYXNzZXJ0X2ZkaV90eF9w bGxfZW5hYmxlZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiAJdTMyIHZhbDsK IAogCS8qIElMSyBGREkgUExMIGlzIGFsd2F5cyBlbmFibGVkICovCi0JaWYgKElOVEVMX0lORk8o ZGV2X3ByaXYpLT5nZW4gPT0gNSkKKwlpZiAoSVNfR0VONShkZXZfcHJpdikpCiAJCXJldHVybjsK IAogCS8qIE9uIEhhc3dlbGwsIERESSBwb3J0cyBhcmUgcmVzcG9uc2libGUgZm9yIHRoZSBGREkg UExMIHNldHVwICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xyYy5jCmluZGV4IGQ4NzYzNTI0MzE5ZC4u ZjYxNGEwN2EwN2JiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMu YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuYwpAQCAtMTM4Nyw3ICsxMzg3 LDcgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3dvcmthcm91bmRfYmIoc3RydWN0IGludGVsX2Vu Z2luZV9jcyAqZW5naW5lKQogCWJhdGNoID0ga21hcF9hdG9taWMocGFnZSk7CiAJb2Zmc2V0ID0g MDsKIAotCWlmIChJTlRFTF9JTkZPKGVuZ2luZS0+ZGV2KS0+Z2VuID09IDgpIHsKKwlpZiAoSVNf R0VOOChlbmdpbmUtPmRldikpIHsKIAkJcmV0ID0gZ2VuOF9pbml0X2luZGlyZWN0Y3R4X2JiKGVu Z2luZSwKIAkJCQkJICAgICAgICZ3YV9jdHgtPmluZGlyZWN0X2N0eCwKIAkJCQkJICAgICAgIGJh dGNoLApAQCAtMTQwMSw3ICsxNDAxLDcgQEAgc3RhdGljIGludCBpbnRlbF9pbml0X3dvcmthcm91 bmRfYmIoc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCQkJCQkgICZvZmZzZXQpOwog CQlpZiAocmV0KQogCQkJZ290byBvdXQ7Ci0JfSBlbHNlIGlmIChJTlRFTF9JTkZPKGVuZ2luZS0+ ZGV2KS0+Z2VuID09IDkpIHsKKwl9IGVsc2UgaWYgKElTX0dFTjkoZW5naW5lLT5kZXYpKSB7CiAJ CXJldCA9IGdlbjlfaW5pdF9pbmRpcmVjdGN0eF9iYihlbmdpbmUsCiAJCQkJCSAgICAgICAmd2Ff Y3R4LT5pbmRpcmVjdF9jdHgsCiAJCQkJCSAgICAgICBiYXRjaCwKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X2x2ZHMuYwppbmRleCBiYzUzYzBkZDM0ZDAuLmQ2NWZkOTQ1NjA3YSAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2x2ZHMuYwpAQCAtMTkwLDcgKzE5MCw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3ByZV9l bmFibGVfbHZkcyhzdHJ1Y3QgaW50ZWxfZW5jb2RlciAqZW5jb2RlcikKIAkvKiBTZXQgdGhlIGRp dGhlcmluZyBmbGFnIG9uIExWRFMgYXMgbmVlZGVkLCBub3RlIHRoYXQgdGhlcmUgaXMgbm8KIAkg KiBzcGVjaWFsIGx2ZHMgZGl0aGVyIGNvbnRyb2wgYml0IG9uIHBjaC1zcGxpdCBwbGF0Zm9ybXMs IGRpdGhlcmluZyBpcwogCSAqIG9ubHkgY29udHJvbGxlZCB0aHJvdWdoIHRoZSBQSVBFQ09ORiBy ZWcuICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDQpIHsKKwlpZiAoSVNfR0VONChk ZXZfcHJpdikpIHsKIAkJLyogQnNwZWMgd29yZGluZyBzdWdnZXN0cyB0aGF0IExWRFMgcG9ydCBk aXRoZXJpbmcgb25seSBleGlzdHMKIAkJICogZm9yIDE4YnBwIHBhbmVscy4gKi8KIAkJaWYgKGNy dGMtPmNvbmZpZy0+ZGl0aGVyICYmIGNydGMtPmNvbmZpZy0+cGlwZV9icHAgPT0gMTgpCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfcG0uYwppbmRleCAwMTdjNDMxZjkzNjMuLjVmMTdmNjgyZDM3YiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0yMTQ2LDE0ICsyMTQ2LDE0IEBAIHN0YXRpYyB2b2lkIGlu dGVsX3JlYWRfd21fbGF0ZW5jeShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MTZfdCB3bVs4 XSkKIHN0YXRpYyB2b2lkIGludGVsX2ZpeHVwX3Nwcl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHVpbnQxNl90IHdtWzVdKQogewogCS8qIElMSyBzcHJpdGUgTFAwIGxhdGVuY3kg aXMgMTMwMCBucyAqLwotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA9PSA1KQorCWlmIChJU19H RU41KGRldikpCiAJCXdtWzBdID0gMTM7CiB9CiAKIHN0YXRpYyB2b2lkIGludGVsX2ZpeHVwX2N1 cl93bV9sYXRlbmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQxNl90IHdtWzVdKQogewog CS8qIElMSyBjdXJzb3IgTFAwIGxhdGVuY3kgaXMgMTMwMCBucyAqLwotCWlmIChJTlRFTF9JTkZP KGRldiktPmdlbiA9PSA1KQorCWlmIChJU19HRU41KGRldikpCiAJCXdtWzBdID0gMTM7CiAKIAkv KiBXYURvdWJsZUN1cnNvckxQM0xhdGVuY3k6aXZiICovCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9yaW5nYnVmZmVyLmMKaW5kZXggOGYzZWIzMDMzZGEwLi43MTBjZDU5OGM3MDEgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9yaW5nYnVmZmVyLmMKQEAgLTEyMzYsNyArMTIzNiw3IEBAIHN0 YXRpYyBpbnQgaW5pdF9yZW5kZXJfcmluZyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUp CiAKIAkvKiBSZXF1aXJlZCBmb3IgdGhlIGhhcmR3YXJlIHRvIHByb2dyYW0gc2NhbmxpbmUgdmFs dWVzIGZvciB3YWl0aW5nICovCiAJLyogV2FFbmFibGVGbHVzaFRsYkludmFsaWRhdGlvbk1vZGU6 c25iICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDYpCisJaWYgKElTX0dFTjYoZGV2 X3ByaXYpKQogCQlJOTE1X1dSSVRFKEdGWF9NT0RFLAogCQkJICAgX01BU0tFRF9CSVRfRU5BQkxF KEdGWF9UTEJfSU5WQUxJREFURV9FWFBMSUNJVCkpOwogCkBAIC0yNTM2LDcgKzI1MzYsNyBAQCB2 b2lkIGludGVsX3JpbmdfaW5pdF9zZXFubyhzdHJ1Y3QgaW50ZWxfZW5naW5lX2NzICplbmdpbmUs IHUzMiBzZXFubykKIAkgKiB0aGUgc2VtYXBob3JlIHZhbHVlLCB0aGVuIHdoZW4gdGhlIHNlcW5v IG1vdmVzIGJhY2t3YXJkcyBhbGwKIAkgKiBmdXR1cmUgd2FpdHMgd2lsbCBjb21wbGV0ZSBpbnN0 YW50bHkgKGNhdXNpbmcgcmVuZGVyaW5nIGNvcnJ1cHRpb24pLgogCSAqLwotCWlmIChJTlRFTF9J TkZPKGRldl9wcml2KS0+Z2VuID09IDYgfHwgSU5URUxfSU5GTyhkZXZfcHJpdiktPmdlbiA9PSA3 KSB7CisJaWYgKElTX0dFTjYoZGV2X3ByaXYpIHx8IElTX0dFTjcoZGV2X3ByaXYpKSB7CiAJCUk5 MTVfV1JJVEUoUklOR19TWU5DXzAoZW5naW5lLT5tbWlvX2Jhc2UpLCAwKTsKIAkJSTkxNV9XUklU RShSSU5HX1NZTkNfMShlbmdpbmUtPm1taW9fYmFzZSksIDApOwogCQlpZiAoSEFTX1ZFQk9YKGRl dl9wcml2KSkKQEAgLTI4MDgsNyArMjgwOCw3IEBAIGludCBpbnRlbF9pbml0X3JlbmRlcl9yaW5n X2J1ZmZlcihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQllbmdpbmUtPmluaXRfY29udGV4dCA9 IGludGVsX3Jjc19jdHhfaW5pdDsKIAkJZW5naW5lLT5hZGRfcmVxdWVzdCA9IGdlbjZfYWRkX3Jl cXVlc3Q7CiAJCWVuZ2luZS0+Zmx1c2ggPSBnZW43X3JlbmRlcl9yaW5nX2ZsdXNoOwotCQlpZiAo SU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gNikKKwkJaWYgKElTX0dFTjYoZGV2X3ByaXYpKQogCQkJ ZW5naW5lLT5mbHVzaCA9IGdlbjZfcmVuZGVyX3JpbmdfZmx1c2g7CiAJCWVuZ2luZS0+aXJxX2dl dCA9IGdlbjZfcmluZ19nZXRfaXJxOwogCQllbmdpbmUtPmlycV9wdXQgPSBnZW42X3JpbmdfcHV0 X2lycTsKLS0gCjEuOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRl bC1nZngK