From: Tvrtko Ursulin Subject: [PATCH 14/22] drm/i915: Make IS_KABYLAKE only take dev_priv Date: Wed, 5 Oct 2016 13:33:41 +0100 Message-ID: <1475670829-14025-15-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-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AA576E83C for ; Wed, 5 Oct 2016 12:34:14 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id p138so24361290wmb.0 for ; Wed, 05 Oct 2016 05:34:14 -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 RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClNhdmVzIDEz MjAgYnl0ZXMgb2YgLnJvZGF0YSBzdHJpbmdzLgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3Vs aW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5jICAgICAgICAgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X2Rydi5oICAgICAgICAgfCAgNiArKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtX3N0b2xlbi5jICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyAg ICAgICAgfCAxNiArKysrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k aXNwbGF5LmMgICAgfCAxMCArKysrKy0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9k cGxsX21nci5jICAgfCAgMiArLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjX2xvYWRl ci5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYyB8ICAy ICstCiA4IGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IDg4OTk4MzVmZmZhYi4uZDg1NGVhNGE3ZTkyIDEw MDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTIwMywxNyArMjAzLDE3IEBAIHN0YXRpYyB2b2lk IGludGVsX2RldGVjdF9wY2goc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJCX0gZWxzZSBpZiAo aWQgPT0gSU5URUxfUENIX1NQVF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9wcml2LT5wY2hf dHlwZSA9IFBDSF9TUFQ7CiAJCQkJRFJNX0RFQlVHX0tNUygiRm91bmQgU3VucmlzZVBvaW50IFBD SFxuIik7Ci0JCQkJV0FSTl9PTighSVNfU0tZTEFLRShkZXYpICYmCi0JCQkJCSFJU19LQUJZTEFL RShkZXYpKTsKKwkJCQlXQVJOX09OKCFJU19TS1lMQUtFKGRldl9wcml2KSAmJgorCQkJCQkhSVNf S0FCWUxBS0UoZGV2X3ByaXYpKTsKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX1NQVF9M UF9ERVZJQ0VfSURfVFlQRSkgewogCQkJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBDSF9TUFQ7CiAJ CQkJRFJNX0RFQlVHX0tNUygiRm91bmQgU3VucmlzZVBvaW50IExQIFBDSFxuIik7Ci0JCQkJV0FS Tl9PTighSVNfU0tZTEFLRShkZXYpICYmCi0JCQkJCSFJU19LQUJZTEFLRShkZXYpKTsKKwkJCQlX QVJOX09OKCFJU19TS1lMQUtFKGRldl9wcml2KSAmJgorCQkJCQkhSVNfS0FCWUxBS0UoZGV2X3By aXYpKTsKIAkJCX0gZWxzZSBpZiAoaWQgPT0gSU5URUxfUENIX0tCUF9ERVZJQ0VfSURfVFlQRSkg ewogCQkJCWRldl9wcml2LT5wY2hfdHlwZSA9IFBDSF9LQlA7CiAJCQkJRFJNX0RFQlVHX0tNUygi Rm91bmQgS2FieVBvaW50IFBDSFxuIik7Ci0JCQkJV0FSTl9PTighSVNfS0FCWUxBS0UoZGV2KSk7 CisJCQkJV0FSTl9PTighSVNfS0FCWUxBS0UoZGV2X3ByaXYpKTsKIAkJCX0gZWxzZSBpZiAoKGlk ID09IElOVEVMX1BDSF9QMlhfREVWSUNFX0lEX1RZUEUpIHx8CiAJCQkJICAgKGlkID09IElOVEVM X1BDSF9QM1hfREVWSUNFX0lEX1RZUEUpIHx8CiAJCQkJICAgKChpZCA9PSBJTlRFTF9QQ0hfUUVN VV9ERVZJQ0VfSURfVFlQRSkgJiYKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCmluZGV4IGM1MzUzNThk YzdmYi4uOTQ2NTE2NzRlNDQyIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKQEAgLTI2NjcsNyAr MjY2Nyw3IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBJU19CUk9BRFdF TEwoZGV2X3ByaXYpCShkZXZfcHJpdi0+aW5mby5pc19icm9hZHdlbGwpCiAjZGVmaW5lIElTX1NL WUxBS0UoZGV2KQkoSU5URUxfSU5GTyhkZXYpLT5pc19za3lsYWtlKQogI2RlZmluZSBJU19CUk9Y VE9OKGRldikJCShJTlRFTF9JTkZPKGRldiktPmlzX2Jyb3h0b24pCi0jZGVmaW5lIElTX0tBQllM QUtFKGRldikJKElOVEVMX0lORk8oZGV2KS0+aXNfa2FieWxha2UpCisjZGVmaW5lIElTX0tBQllM QUtFKGRldl9wcml2KQkoZGV2X3ByaXYtPmluZm8uaXNfa2FieWxha2UpCiAjZGVmaW5lIElTX01P QklMRShkZXYpCQkoSU5URUxfSU5GTyhkZXYpLT5pc19tb2JpbGUpCiAjZGVmaW5lIElTX0hTV19F QVJMWV9TRFYoZGV2X3ByaXYpIChJU19IQVNXRUxMKGRldl9wcml2KSAmJiBcCiAJCQkJICAgIChJ TlRFTF9ERVZJRChkZXZfcHJpdikgJiAweEZGMDApID09IDB4MEMwMCkKQEAgLTI3MzQsOCArMjcz NCw4IEBAIHN0cnVjdCBkcm1faTkxNV9jbWRfdGFibGUgewogI2RlZmluZSBLQkxfUkVWSURfRDAJ CTB4MwogI2RlZmluZSBLQkxfUkVWSURfRTAJCTB4NAogCi0jZGVmaW5lIElTX0tCTF9SRVZJRChw LCBzaW5jZSwgdW50aWwpIFwKLQkoSVNfS0FCWUxBS0UocCkgJiYgSVNfUkVWSUQocCwgc2luY2Us IHVudGlsKSkKKyNkZWZpbmUgSVNfS0JMX1JFVklEKGRldl9wcml2LCBzaW5jZSwgdW50aWwpIFwK KwkoSVNfS0FCWUxBS0UoZGV2X3ByaXYpICYmIElTX1JFVklEKGRldl9wcml2LCBzaW5jZSwgdW50 aWwpKQogCiAvKgogICogVGhlIGdlblggZGVzaWduYXRpb24gdHlwaWNhbGx5IHJlZmVycyB0byB0 aGUgcmVuZGVyIGVuZ2luZSwgc28gcmVuZGVyCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9zdG9sZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtX3N0 b2xlbi5jCmluZGV4IGNiZWE2ZmI4M2NlNS4uMzUwODEyMGI4YzkwIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbV9zdG9sZW4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pOTE1X2dlbV9zdG9sZW4uYwpAQCAtNDU2LDcgKzQ1Niw3IEBAIGludCBpOTE1X2dlbV9p bml0X3N0b2xlbihzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQlicmVhazsKIAlkZWZhdWx0Ogog CQlpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSB8fAotCQkgICAgSVNfU0tZTEFLRShkZXZfcHJp dikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwkJICAgIElTX1NLWUxBS0UoZGV2X3ByaXYpIHx8IElT X0tBQllMQUtFKGRldl9wcml2KSkKIAkJCWJkd19nZXRfc3RvbGVuX3Jlc2VydmVkKGRldl9wcml2 LCAmcmVzZXJ2ZWRfYmFzZSwKIAkJCQkJCSZyZXNlcnZlZF9zaXplKTsKIAkJZWxzZQpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kZGkuYwppbmRleCBjZDcxMjhiODliNGQuLjA3MTY0ZTI1MGFkZiAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfZGRpLmMKQEAgLTEwMjAsMTMgKzEwMjAsMTMgQEAgc3RhdGljIHZvaWQg Ynh0X2RkaV9jbG9ja19nZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiB2b2lkIGlu dGVsX2RkaV9jbG9ja19nZXQoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIsCiAJCQkgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKnBpcGVfY29uZmlnKQogewotCXN0cnVjdCBkcm1fZGV2aWNl ICpkZXYgPSBlbmNvZGVyLT5iYXNlLmRldjsKKwlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2 X3ByaXYgPSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAotCWlmIChJTlRFTF9JTkZPKGRl diktPmdlbiA8PSA4KQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpIDw9IDgpCiAJCWhzd19kZGlf Y2xvY2tfZ2V0KGVuY29kZXIsIHBpcGVfY29uZmlnKTsKLQllbHNlIGlmIChJU19TS1lMQUtFKGRl dikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwllbHNlIGlmIChJU19TS1lMQUtFKGRldl9wcml2KSB8 fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCXNrbF9kZGlfY2xvY2tfZ2V0KGVuY29kZXIsIHBp cGVfY29uZmlnKTsKLQllbHNlIGlmIChJU19CUk9YVE9OKGRldikpCisJZWxzZSBpZiAoSVNfQlJP WFRPTihkZXZfcHJpdikpCiAJCWJ4dF9kZGlfY2xvY2tfZ2V0KGVuY29kZXIsIHBpcGVfY29uZmln KTsKIH0KIApAQCAtMTA4MSwxNCArMTA4MSwxNCBAQCBieHRfZGRpX3BsbF9zZWxlY3Qoc3RydWN0 IGludGVsX2NydGMgKmludGVsX2NydGMsCiBib29sIGludGVsX2RkaV9wbGxfc2VsZWN0KHN0cnVj dCBpbnRlbF9jcnRjICppbnRlbF9jcnRjLAogCQkJICBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSkKIHsKLQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gaW50ZWxfY3J0Yy0+YmFz ZS5kZXY7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShpbnRl bF9jcnRjLT5iYXNlLmRldik7CiAJc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2VuY29kZXIg PQogCQlpbnRlbF9kZGlfZ2V0X2NydGNfbmV3X2VuY29kZXIoY3J0Y19zdGF0ZSk7CiAKLQlpZiAo SVNfU0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpCisJaWYgKElTX1NLWUxBS0UoZGV2 X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkKIAkJcmV0dXJuIHNrbF9kZGlfcGxsX3Nl bGVjdChpbnRlbF9jcnRjLCBjcnRjX3N0YXRlLAogCQkJCQkgIGludGVsX2VuY29kZXIpOwotCWVs c2UgaWYgKElTX0JST1hUT04oZGV2KSkKKwllbHNlIGlmIChJU19CUk9YVE9OKGRldl9wcml2KSkK IAkJcmV0dXJuIGJ4dF9kZGlfcGxsX3NlbGVjdChpbnRlbF9jcnRjLCBjcnRjX3N0YXRlLAogCQkJ CQkgIGludGVsX2VuY29kZXIpOwogCWVsc2UKQEAgLTE3NDIsNyArMTc0Miw3IEBAIHN0YXRpYyB2 b2lkIGludGVsX2RkaV9wb3N0X2Rpc2FibGUoc3RydWN0IGludGVsX2VuY29kZXIgKmludGVsX2Vu Y29kZXIsCiAJCWludGVsX2VkcF9wYW5lbF9vZmYoaW50ZWxfZHApOwogCX0KIAotCWlmIChJU19T S1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwlpZiAoSVNfU0tZTEFLRShkZXZfcHJp dikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQogCQlJOTE1X1dSSVRFKERQTExfQ1RSTDIsIChJ OTE1X1JFQUQoRFBMTF9DVFJMMikgfAogCQkJCQlEUExMX0NUUkwyX0RESV9DTEtfT0ZGKHBvcnQp KSk7CiAJZWxzZSBpZiAoSU5URUxfSU5GTyhkZXYpLT5nZW4gPCA5KQpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jCmluZGV4IDcyNjAzY2MyOGQ5Mi4uNmUyODAxMTExODYwIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01ODI3LDcgKzU4MjcsNyBAQCBzdGF0aWMg dm9pZCBpbnRlbF91cGRhdGVfbWF4X2NkY2xrKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYpCiB7CiAJ c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwogCi0JaWYg KElTX1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKSB7CisJaWYgKElTX1NLWUxBS0Uo ZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewogCQl1MzIgbGltaXQgPSBJOTE1 X1JFQUQoU0tMX0RGU00pICYgU0tMX0RGU01fQ0RDTEtfTElNSVRfTUFTSzsKIAkJaW50IG1heF9j ZGNsaywgdmNvOwogCkBAIC0xMDY0NSw3ICsxMDY0NSw3IEBAIHN0YXRpYyB2b2lkIGhhc3dlbGxf Z2V0X2RkaV9wb3J0X3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCiAJcG9ydCA9ICh0 bXAgJiBUUkFOU19ERElfUE9SVF9NQVNLKSA+PiBUUkFOU19ERElfUE9SVF9TSElGVDsKIAotCWlm IChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FCWUxBS0UoZGV2KSkKKwlpZiAoSVNfU0tZTEFLRShk ZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQogCQlza3lsYWtlX2dldF9kZGlfcGxs KGRldl9wcml2LCBwb3J0LCBwaXBlX2NvbmZpZyk7CiAJZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYp KQogCQlieHRfZ2V0X2RkaV9wbGwoZGV2X3ByaXYsIHBvcnQsIHBpcGVfY29uZmlnKTsKQEAgLTEy ODIwLDcgKzEyODIwLDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZHVtcF9waXBlX2NvbmZpZyhzdHJ1 Y3QgaW50ZWxfY3J0YyAqY3J0YywKIAkJCSAgICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRl LnBsbDksCiAJCQkgICAgICBwaXBlX2NvbmZpZy0+ZHBsbF9od19zdGF0ZS5wbGwxMCwKIAkJCSAg ICAgIHBpcGVfY29uZmlnLT5kcGxsX2h3X3N0YXRlLnBjc2R3MTIpOwotCX0gZWxzZSBpZiAoSVNf U0tZTEFLRShkZXYpIHx8IElTX0tBQllMQUtFKGRldikpIHsKKwl9IGVsc2UgaWYgKElTX1NLWUxB S0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgewogCQlEUk1fREVCVUdfS01T KCJkcGxsX2h3X3N0YXRlOiAiCiAJCQkgICAgICAiY3RybDE6IDB4JXgsIGNmZ2NyMTogMHgleCwg Y2ZnY3IyOiAweCV4XG4iLAogCQkJICAgICAgcGlwZV9jb25maWctPmRwbGxfaHdfc3RhdGUuY3Ry bDEsCkBAIC0xNTQxOSw3ICsxNTQxOSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX3NldHVwX291dHB1 dHMoc3RydWN0IGRybV9kZXZpY2UgKmRldikKIAkJICovCiAJCWZvdW5kID0gSTkxNV9SRUFEKERE SV9CVUZfQ1RMKFBPUlRfQSkpICYgRERJX0lOSVRfRElTUExBWV9ERVRFQ1RFRDsKIAkJLyogV2FJ Z25vcmVERElBU3RyYXA6IHNrbCAqLwotCQlpZiAoZm91bmQgfHwgSVNfU0tZTEFLRShkZXYpIHx8 IElTX0tBQllMQUtFKGRldikpCisJCWlmIChmb3VuZCB8fCBJU19TS1lMQUtFKGRldl9wcml2KSB8 fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCQlpbnRlbF9kZGlfaW5pdChkZXYsIFBPUlRfQSk7 CiAKIAkJLyogRERJIEIsIEMgYW5kIEQgZGV0ZWN0aW9uIGlzIGluZGljYXRlZCBieSB0aGUgU0ZV U0VfU1RSQVAKQEAgLTE1NDM1LDcgKzE1NDM1LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfc2V0dXBf b3V0cHV0cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogCQkvKgogCQkgKiBPbiBTS0wgd2UgZG9u J3QgaGF2ZSBhIHdheSB0byBkZXRlY3QgRERJLUUgc28gd2UgcmVseSBvbiBWQlQuCiAJCSAqLwot CQlpZiAoKElTX1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKSAmJgorCQlpZiAoKElT X1NLWUxBS0UoZGV2X3ByaXYpIHx8IElTX0tBQllMQUtFKGRldl9wcml2KSkgJiYKIAkJICAgIChk ZXZfcHJpdi0+dmJ0LmRkaV9wb3J0X2luZm9bUE9SVF9FXS5zdXBwb3J0c19kcCB8fAogCQkgICAg IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0VdLnN1cHBvcnRzX2R2aSB8fAogCQkg ICAgIGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1tQT1JUX0VdLnN1cHBvcnRzX2hkbWkpKQpk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdyLmMKaW5kZXggYzM3Y2UxMjYzMTQyLi43Y2Y5 ZDkxYzA3NDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2RwbGxfbWdy LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwpAQCAtMTg1MSw3 ICsxODUxLDcgQEAgdm9pZCBpbnRlbF9zaGFyZWRfZHBsbF9pbml0KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpCiAJY29uc3Qgc3RydWN0IGRwbGxfaW5mbyAqZHBsbF9pbmZvOwogCWludCBpOwogCi0J aWYgKElTX1NLWUxBS0UoZGV2KSB8fCBJU19LQUJZTEFLRShkZXYpKQorCWlmIChJU19TS1lMQUtF KGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCiAJCWRwbGxfbWdyID0gJnNrbF9w bGxfbWdyOwogCWVsc2UgaWYgKElTX0JST1hUT04oZGV2KSkKIAkJZHBsbF9tZ3IgPSAmYnh0X3Bs bF9tZ3I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVy LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9hZGVyLmMKaW5kZXggN2FjZTk2 YmU4MmE4Li4zYzQ2NjA1YjU4ZTcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2d1Y19sb2FkZXIuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ndWNfbG9h ZGVyLmMKQEAgLTczNCw3ICs3MzQsNyBAQCB2b2lkIGludGVsX2d1Y19pbml0KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYpCiAJCWZ3X3BhdGggPSBJOTE1X0JYVF9HVUNfVUNPREU7CiAJCWd1Y19mdy0+ Z3VjX2Z3X21ham9yX3dhbnRlZCA9IEJYVF9GV19NQUpPUjsKIAkJZ3VjX2Z3LT5ndWNfZndfbWlu b3Jfd2FudGVkID0gQlhUX0ZXX01JTk9SOwotCX0gZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2KSkg eworCX0gZWxzZSBpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpKSB7CiAJCWZ3X3BhdGggPSBJOTE1 X0tCTF9HVUNfVUNPREU7CiAJCWd1Y19mdy0+Z3VjX2Z3X21ham9yX3dhbnRlZCA9IEtCTF9GV19N QUpPUjsKIAkJZ3VjX2Z3LT5ndWNfZndfbWlub3Jfd2FudGVkID0gS0JMX0ZXX01JTk9SOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCmluZGV4IDc3ZWYwM2NiNjE2My4uMDI1 ZmJkNTIyODE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50aW1l X3BtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcnVudGltZV9wbS5jCkBAIC0y NTk0LDcgKzI1OTQsNyBAQCB2b2lkIGludGVsX3Bvd2VyX2RvbWFpbnNfaW5pdF9odyhzdHJ1Y3Qg ZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGJvb2wgcmVzdW1lKQogCiAJcG93ZXJfZG9tYWlu cy0+aW5pdGlhbGl6aW5nID0gdHJ1ZTsKIAotCWlmIChJU19TS1lMQUtFKGRldikgfHwgSVNfS0FC WUxBS0UoZGV2KSkgeworCWlmIChJU19TS1lMQUtFKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShk ZXZfcHJpdikpIHsKIAkJc2tsX2Rpc3BsYXlfY29yZV9pbml0KGRldl9wcml2LCByZXN1bWUpOwog CX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXYpKSB7CiAJCWJ4dF9kaXNwbGF5X2NvcmVfaW5pdChk ZXZfcHJpdiwgcmVzdW1lKTsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK