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: Mon, 9 May 2016 14:00:06 +0100 Message-ID: <1462798808-14184-3-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1462548051-7947-1-git-send-email-tvrtko.ursulin@linux.intel.com> <1462798808-14184-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 71B3E6E33B for ; Mon, 9 May 2016 13:00:29 +0000 (UTC) In-Reply-To: <1462798808-14184-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 IG9wdGltaXphdGlvbiBmcm9tIGEgcHJldmlvdXMgcGF0Y2ggd29ya3MgZXZlbiBiZXR0ZXIuCgp2 MjogUmViYXNlLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGlu QGludGVsLmNvbT4KUmV2aWV3ZWQtYnk6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29u LmNvLnVrPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZGVidWdmcy5jICAgICB8IDQg KystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kbWEuYyAgICAgICAgIHwgNCArKy0tCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2dlbS5jICAgICAgICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx NS9pOTE1X2dlbV9zdG9sZW4uYyAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bV90aWxpbmcuYyAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dwdV9lcnJvci5j ICAgfCAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jICAgICAgICAgfCA0ICsr LS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyAgICB8IDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2x2ZHMuYyAgICAgICB8IDIgKy0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX3BtLmMgICAgICAgICB8IDQgKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfcmluZ2J1ZmZlci5jIHwgMiArLQogMTIgZmlsZXMgY2hhbmdlZCwgMTYgaW5zZXJ0aW9u cygrKSwgMTYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwppbmRl eCA2Njk4OTU3ZWRlM2YuLjc4MTBjODM4NjMzNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJt L2k5MTUvaTkxNV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kZWJ1 Z2ZzLmMKQEAgLTIzMTAsMTIgKzIzMTAsMTIgQEAgc3RhdGljIHZvaWQgZ2VuNl9wcGd0dF9pbmZv KHN0cnVjdCBzZXFfZmlsZSAqbSwgc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAlzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBpbnRl bF9lbmdpbmVfY3MgKmVuZ2luZTsKIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA9PSA2KQor CWlmIChJU19HRU42KGRldl9wcml2KSkKIAkJc2VxX3ByaW50ZihtLCAiR0ZYX01PREU6IDB4JTA4 eFxuIiwgSTkxNV9SRUFEKEdGWF9NT0RFKSk7CiAKIAlmb3JfZWFjaF9lbmdpbmUoZW5naW5lLCBk ZXZfcHJpdikgewogCQlzZXFfcHJpbnRmKG0sICIlc1xuIiwgZW5naW5lLT5uYW1lKTsKLQkJaWYg KElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDcpCisJCWlmIChJU19HRU43KGRldl9wcml2KSkKIAkJ CXNlcV9wcmludGYobSwgIkdGWF9NT0RFOiAweCUwOHhcbiIsCiAJCQkJICAgSTkxNV9SRUFEKFJJ TkdfTU9ERV9HRU43KGVuZ2luZSkpKTsKIAkJc2VxX3ByaW50ZihtLCAiUFBfRElSX0JBU0U6IDB4 JTA4eFxuIiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMgYi9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCmluZGV4IGVmMmU5MWQ1MmM1ZS4uYmMxOGUx MGMyZmVmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RtYS5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZG1hLmMKQEAgLTg4OCw3ICs4ODgsNyBAQCBzdGF0 aWMgdm9pZCBpbnRlbF9kZXZpY2VfaW5mb19ydW50aW1lX2luaXQoc3RydWN0IGRybV9kZXZpY2Ug KmRldikKIAkJRFJNX0lORk8oIkRpc3BsYXkgZGlzYWJsZWQgKG1vZHVsZSBwYXJhbWV0ZXIpXG4i KTsKIAkJaW5mby0+bnVtX3BpcGVzID0gMDsKIAl9IGVsc2UgaWYgKGluZm8tPm51bV9waXBlcyA+ IDAgJiYKLQkJICAgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDcgfHwgSU5URUxfSU5GTyhkZXYp LT5nZW4gPT0gOCkgJiYKKwkJICAgKElTX0dFTjcoZGV2X3ByaXYpIHx8IElTX0dFTjgoZGV2X3By aXYpKSAmJgogCQkgICBIQVNfUENIX1NQTElUKGRldikpIHsKIAkJdTMyIGZ1c2Vfc3RyYXAgPSBJ OTE1X1JFQUQoRlVTRV9TVFJBUCk7CiAJCXUzMiBzZnVzZV9zdHJhcCA9IEk5MTVfUkVBRChTRlVT RV9TVFJBUCk7CkBAIC05MTIsNyArOTEyLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGV2aWNlX2lu Zm9fcnVudGltZV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiAJCQlEUk1fSU5GTygiUGlw ZUMgZnVzZWQgb2ZmXG4iKTsKIAkJCWluZm8tPm51bV9waXBlcyAtPSAxOwogCQl9Ci0JfSBlbHNl IGlmIChpbmZvLT5udW1fcGlwZXMgPiAwICYmIElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDkpIHsK Kwl9IGVsc2UgaWYgKGluZm8tPm51bV9waXBlcyA+IDAgJiYgSVNfR0VOOShkZXZfcHJpdikpIHsK IAkJdTMyIGRmc20gPSBJOTE1X1JFQUQoU0tMX0RGU00pOwogCQl1OCBkaXNhYmxlZF9tYXNrID0g MDsKIAkJYm9vbCBpbnZhbGlkOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKaW5kZXggN2E3YzllNTIx NDI0Li42OWZkZjg0YTNlMjggMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf ZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaApAQCAtMjcwMiw3ICsy NzAyLDcgQEAgc3RydWN0IGRybV9pOTE1X2NtZF90YWJsZSB7CiAJCQkJIElTX0NIRVJSWVZJRVco ZGV2KSB8fCBJU19TS1lMQUtFKGRldikgfHwgXAogCQkJCSBJU19LQUJZTEFLRShkZXYpIHx8IElT X0JST1hUT04oZGV2KSkKICNkZWZpbmUgSEFTX1JDNihkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5n ZW4gPj0gNikKLSNkZWZpbmUgSEFTX1JDNnAoZGV2KQkJKElOVEVMX0lORk8oZGV2KS0+Z2VuID09 IDYgfHwgSVNfSVZZQlJJREdFKGRldikpCisjZGVmaW5lIEhBU19SQzZwKGRldikJCShJU19HRU42 KGRldikgfHwgSVNfSVZZQlJJREdFKGRldikpCiAKICNkZWZpbmUgSEFTX0NTUihkZXYpCShJU19H RU45KGRldikpCiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCmluZGV4IGM5OWQxYjJjNjVkNC4uYjU2 OWVhZWM3MmIwIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKQEAgLTE5ODEsNyArMTk4MSw3IEBA IGk5MTVfZ2VtX2dldF9ndHRfc2l6ZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1aW50MzJfdCBz aXplLCBpbnQgdGlsaW5nX21vZGUpCiAJCXJldHVybiBzaXplOwogCiAJLyogUHJldmlvdXMgY2hp cHMgbmVlZCBhIHBvd2VyLW9mLXR3byBmZW5jZSByZWdpb24gd2hlbiB0aWxpbmcgKi8KLQlpZiAo SU5URUxfSU5GTyhkZXYpLT5nZW4gPT0gMykKKwlpZiAoSVNfR0VOMyhkZXYpKQogCQlndHRfc2l6 ZSA9IDEwMjQqMTAyNDsKIAllbHNlCiAJCWd0dF9zaXplID0gNTEyKjEwMjQ7CmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZ2VtX3N0b2xlbi5jCmluZGV4IDY4ZmRlOGZiYTgwMy4uZjkyNTNmMmI3YmEw IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYwpAQCAtNTYsNyArNTYsNyBA QCBpbnQgaTkxNV9nZW1fc3RvbGVuX2luc2VydF9ub2RlX2luX3JhbmdlKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdiwKIAogCS8qIFNlZSB0aGUgY29tbWVudCBhdCB0aGUgZHJtX21t X2luaXQoKSBjYWxsIGZvciBtb3JlIGFib3V0IHRoaXMgY2hlY2suCiAJICogV2FTa2lwU3RvbGVu TWVtb3J5Rmlyc3RQYWdlOmJkdyxjaHYgKGluY29tcGxldGUpICovCi0JaWYgKElOVEVMX0lORk8o ZGV2X3ByaXYpLT5nZW4gPT0gOCAmJiBzdGFydCA8IDQwOTYpCisJaWYgKElTX0dFTjgoZGV2X3By aXYpICYmIHN0YXJ0IDwgNDA5NikKIAkJc3RhcnQgPSA0MDk2OwogCiAJbXV0ZXhfbG9jaygmZGV2 X3ByaXYtPm1tLnN0b2xlbl9sb2NrKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3RpbGluZy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW1fdGlsaW5n LmMKaW5kZXggODI5ZGFiNjk4OTVmLi4yZmNiNGFmYWRlMTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZ2VtX3RpbGluZy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfZ2VtX3RpbGluZy5jCkBAIC0xMjUsNyArMTI1LDcgQEAgaTkxNV9nZW1fb2JqZWN0X2Zl bmNlX29rKHN0cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmosIGludCB0aWxpbmdfbW9kZSkK IAlpZiAoSU5URUxfSU5GTyhvYmotPmJhc2UuZGV2KS0+Z2VuID49IDQpCiAJCXJldHVybiB0cnVl OwogCi0JaWYgKElOVEVMX0lORk8ob2JqLT5iYXNlLmRldiktPmdlbiA9PSAzKSB7CisJaWYgKElT X0dFTjMob2JqLT5iYXNlLmRldikpIHsKIAkJaWYgKGk5MTVfZ2VtX29ial9nZ3R0X29mZnNldChv YmopICYgfkk5MTVfRkVOQ0VfU1RBUlRfTUFTSykKIAkJCXJldHVybiBmYWxzZTsKIAl9IGVsc2Ug ewpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYyBiL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vycm9yLmMKaW5kZXggMGY2MDAyY2I4NmY0Li4z NGZmMjQ1OWNlZWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ3B1X2Vy cm9yLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9ncHVfZXJyb3IuYwpAQCAtNDEx LDcgKzQxMSw3IEBAIGludCBpOTE1X2Vycm9yX3N0YXRlX3RvX3N0cihzdHJ1Y3QgZHJtX2k5MTVf ZXJyb3Jfc3RhdGVfYnVmICptLAogCQllcnJfcHJpbnRmKG0sICJET05FX1JFRzogMHglMDh4XG4i LCBlcnJvci0+ZG9uZV9yZWcpOwogCX0KIAotCWlmIChJTlRFTF9JTkZPKGRldiktPmdlbiA9PSA3 KQorCWlmIChJU19HRU43KGRldikpCiAJCWVycl9wcmludGYobSwgIkVSUl9JTlQ6IDB4JTA4eFxu IiwgZXJyb3ItPmVycl9pbnQpOwogCiAJZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUoZXJyb3It PnJpbmcpOyBpKyspCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwppbmRleCBhMTYzMDM3ZGRiZDguLjgx NWRiYmViYzgzNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9pcnEuYwor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2lycS5jCkBAIC00NjQ0LDEyICs0NjQ0LDEy IEBAIHZvaWQgaW50ZWxfaXJxX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2 KQogCQlkZXYtPmRyaXZlci0+ZGlzYWJsZV92YmxhbmsgPSBpcm9ubGFrZV9kaXNhYmxlX3ZibGFu azsKIAkJZGV2X3ByaXYtPmRpc3BsYXkuaHBkX2lycV9zZXR1cCA9IGlsa19ocGRfaXJxX3NldHVw OwogCX0gZWxzZSB7Ci0JCWlmIChJTlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID09IDIpIHsKKwkJ aWYgKElTX0dFTjIoZGV2X3ByaXYpKSB7CiAJCQlkZXYtPmRyaXZlci0+aXJxX3ByZWluc3RhbGwg PSBpOHh4X2lycV9wcmVpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV9wb3N0aW5zdGFsbCA9 IGk4eHhfaXJxX3Bvc3RpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV9oYW5kbGVyID0gaTh4 eF9pcnFfaGFuZGxlcjsKIAkJCWRldi0+ZHJpdmVyLT5pcnFfdW5pbnN0YWxsID0gaTh4eF9pcnFf dW5pbnN0YWxsOwotCQl9IGVsc2UgaWYgKElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPT0gMykg eworCQl9IGVsc2UgaWYgKElTX0dFTjMoZGV2X3ByaXYpKSB7CiAJCQlkZXYtPmRyaXZlci0+aXJx X3ByZWluc3RhbGwgPSBpOTE1X2lycV9wcmVpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV9w b3N0aW5zdGFsbCA9IGk5MTVfaXJxX3Bvc3RpbnN0YWxsOwogCQkJZGV2LT5kcml2ZXItPmlycV91 bmluc3RhbGwgPSBpOTE1X2lycV91bmluc3RhbGw7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNw bGF5LmMKaW5kZXggM2M2YjdiOWFmZjA4Li5hN2MzNGMzYTI5YjQgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKQEAgLTEyMDQsNyArMTIwNCw3IEBAIHN0YXRpYyB2b2lkIGFzc2Vy dF9mZGlfdHhfcGxsX2VuYWJsZWQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAog CXUzMiB2YWw7CiAKIAkvKiBJTEsgRkRJIFBMTCBpcyBhbHdheXMgZW5hYmxlZCAqLwotCWlmIChJ TlRFTF9JTkZPKGRldl9wcml2KS0+Z2VuID09IDUpCisJaWYgKElTX0dFTjUoZGV2X3ByaXYpKQog CQlyZXR1cm47CiAKIAkvKiBPbiBIYXN3ZWxsLCBEREkgcG9ydHMgYXJlIHJlc3BvbnNpYmxlIGZv ciB0aGUgRkRJIFBMTCBzZXR1cCAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfbHZkcy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCmluZGV4IGJj NTNjMGRkMzRkMC4uZDY1ZmQ5NDU2MDdhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9sdmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHZkcy5jCkBA IC0xOTAsNyArMTkwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfcHJlX2VuYWJsZV9sdmRzKHN0cnVj dCBpbnRlbF9lbmNvZGVyICplbmNvZGVyKQogCS8qIFNldCB0aGUgZGl0aGVyaW5nIGZsYWcgb24g TFZEUyBhcyBuZWVkZWQsIG5vdGUgdGhhdCB0aGVyZSBpcyBubwogCSAqIHNwZWNpYWwgbHZkcyBk aXRoZXIgY29udHJvbCBiaXQgb24gcGNoLXNwbGl0IHBsYXRmb3JtcywgZGl0aGVyaW5nIGlzCiAJ ICogb25seSBjb250cm9sbGVkIHRocm91Z2ggdGhlIFBJUEVDT05GIHJlZy4gKi8KLQlpZiAoSU5U RUxfSU5GTyhkZXYpLT5nZW4gPT0gNCkgeworCWlmIChJU19HRU40KGRldl9wcml2KSkgewogCQkv KiBCc3BlYyB3b3JkaW5nIHN1Z2dlc3RzIHRoYXQgTFZEUyBwb3J0IGRpdGhlcmluZyBvbmx5IGV4 aXN0cwogCQkgKiBmb3IgMThicHAgcGFuZWxzLiAqLwogCQlpZiAoY3J0Yy0+Y29uZmlnLT5kaXRo ZXIgJiYgY3J0Yy0+Y29uZmlnLT5waXBlX2JwcCA9PSAxOCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5j CmluZGV4IDI5OWI2Y2Q2MWY2OS4uYzA5ODhkNjE5ZTFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9wbS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Bt LmMKQEAgLTIxNDYsMTQgKzIxNDYsMTQgQEAgc3RhdGljIHZvaWQgaW50ZWxfcmVhZF93bV9sYXRl bmN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVpbnQxNl90IHdtWzhdKQogc3RhdGljIHZvaWQg aW50ZWxfZml4dXBfc3ByX3dtX2xhdGVuY3koc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdWludDE2 X3Qgd21bNV0pCiB7CiAJLyogSUxLIHNwcml0ZSBMUDAgbGF0ZW5jeSBpcyAxMzAwIG5zICovCi0J aWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDUpCisJaWYgKElTX0dFTjUoZGV2KSkKIAkJd21b MF0gPSAxMzsKIH0KIAogc3RhdGljIHZvaWQgaW50ZWxfZml4dXBfY3VyX3dtX2xhdGVuY3koc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwgdWludDE2X3Qgd21bNV0pCiB7CiAJLyogSUxLIGN1cnNvciBM UDAgbGF0ZW5jeSBpcyAxMzAwIG5zICovCi0JaWYgKElOVEVMX0lORk8oZGV2KS0+Z2VuID09IDUp CisJaWYgKElTX0dFTjUoZGV2KSkKIAkJd21bMF0gPSAxMzsKIAogCS8qIFdhRG91YmxlQ3Vyc29y TFAzTGF0ZW5jeTppdmIgKi8KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3JpbmdidWZmZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3JpbmdidWZmZXIuYwpp bmRleCBlMTdhNjgyZGQ2MjEuLjg0YjIyYTU3Y2MxYyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfcmluZ2J1ZmZlci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3JpbmdidWZmZXIuYwpAQCAtMjUwMyw3ICsyNTAzLDcgQEAgdm9pZCBpbnRlbF9yaW5nX2lu aXRfc2Vxbm8oc3RydWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLCB1MzIgc2Vxbm8pCiAJICog dGhlIHNlbWFwaG9yZSB2YWx1ZSwgdGhlbiB3aGVuIHRoZSBzZXFubyBtb3ZlcyBiYWNrd2FyZHMg YWxsCiAJICogZnV0dXJlIHdhaXRzIHdpbGwgY29tcGxldGUgaW5zdGFudGx5IChjYXVzaW5nIHJl bmRlcmluZyBjb3JydXB0aW9uKS4KIAkgKi8KLQlpZiAoSU5URUxfSU5GTyhkZXZfcHJpdiktPmdl biA9PSA2IHx8IElOVEVMX0lORk8oZGV2X3ByaXYpLT5nZW4gPT0gNykgeworCWlmIChJU19HRU42 KGRldl9wcml2KSB8fCBJU19HRU43KGRldl9wcml2KSkgewogCQlJOTE1X1dSSVRFKFJJTkdfU1lO Q18wKGVuZ2luZS0+bW1pb19iYXNlKSwgMCk7CiAJCUk5MTVfV1JJVEUoUklOR19TWU5DXzEoZW5n aW5lLT5tbWlvX2Jhc2UpLCAwKTsKIAkJaWYgKEhBU19WRUJPWChkZXZfcHJpdikpCi0tIAoxLjku MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==