From mboxrd@z Thu Jan  1 00:00:00 1970
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [RFC 5/8] drm/i915/gen11+: Prefer gen over platform
 codename.
Date: Thu, 18 Oct 2018 16:34:44 -0700
Message-ID: <20181018233447.5187-6-rodrigo.vivi@intel.com>
References: <20181018233447.5187-1-rodrigo.vivi@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga12.intel.com (mga12.intel.com [192.55.52.136])
 by gabe.freedesktop.org (Postfix) with ESMTPS id 1FCB06E12C
 for <intel-gfx@lists.freedesktop.org>; Thu, 18 Oct 2018 23:35:00 +0000 (UTC)
In-Reply-To: <20181018233447.5187-1-rodrigo.vivi@intel.com>
List-Unsubscribe: <https://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <https://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <https://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: intel-gfx@lists.freedesktop.org
Cc: lucas.demarchi@intel.com, Rodrigo Vivi <rodrigo.vivi@intel.com>
List-Id: intel-gfx@lists.freedesktop.org

QWxzbyBsZXQncyBhbHdheXMgY29uc2lkZXIgbmV4dCBwbGF0Zm9ybSBmb2xsb3dzCnRoZSBtb3N0
IHJlY2VudCBvbmUuIExpa2Ugd2UgaGF2ZSBkb25lIGZvciB0cmFuc2l0aW9uaW5nCmdlbjkgdG8g
Z2VuMTAgYW5kIGdlbnQxMCB0byBnZW4xMS4KCkxldCdzIHVzZSBzYW1lIGFwcHJvYWNoIGZvciBn
ZW4xMSsgYW5kIG9ubHkgaW50cm9kdWNlCmNoYW5nZXMgbGF0ZXIgYXMgbmVlZGVkLgoKU2lnbmVk
LW9mZi1ieTogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgotLS0KIGRyaXZl
cnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMgICAgICB8ICA2ICsrKy0tLQogZHJpdmVycy9n
cHUvZHJtL2k5MTUvaW50ZWxfZGRpLmMgICAgICAgIHwgMTggKysrKysrKysrLS0tLS0tLS0tCiBk
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgfCAgOCArKysrLS0tLQogZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYyAgIHwgIDIgKy0KIGRyaXZlcnMvZ3B1
L2RybS9pOTE1L2ludGVsX2hkbWkuYyAgICAgICB8ICAyICstCiBkcml2ZXJzL2dwdS9kcm0vaTkx
NS9pbnRlbF9tb2NzLmMgICAgICAgfCAgMyArLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs
X3BtLmMgICAgICAgICB8ICA0ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRp
bWVfcG0uYyB8ICA2ICsrKy0tLQogOCBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNlcnRpb25zKCspLCAy
NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9j
ZGNsay5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwppbmRleCBiMzE1Yjcw
ZmQ0OWMuLjkxNWUyYzkzNDEyYiAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfY2RjbGsuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9jZGNsay5jCkBAIC0y
NTcyLDcgKzI1NzIsNyBAQCBzdGF0aWMgaW50IGludGVsX2NvbXB1dGVfbWF4X2RvdGNsayhzdHJ1
Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiAgKi8KIHZvaWQgaW50ZWxfdXBkYXRlX21h
eF9jZGNsayhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JaWYgKElTX0lD
RUxBS0UoZGV2X3ByaXYpKSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpIHsKIAkJ
aWYgKGRldl9wcml2LT5jZGNsay5ody5yZWYgPT0gMjQwMDApCiAJCQlkZXZfcHJpdi0+bWF4X2Nk
Y2xrX2ZyZXEgPSA2NDgwMDA7CiAJCWVsc2UKQEAgLTI4MDEsMTIgKzI4MDEsMTIgQEAgdm9pZCBp
bnRlbF9pbml0X2NkY2xrX2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdikK
IAkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gY25sX3NldF9jZGNsazsKIAkJZGV2X3By
aXYtPmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KIAkJCWNubF9tb2Rlc2V0X2NhbGNfY2Rj
bGs7Ci0JfSBlbHNlIGlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkgeworCX0gZWxzZSBpZiAoSU5U
RUxfR0VOKGRldl9wcml2KSA+PSAxMSkgewogCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsg
PSBpY2xfc2V0X2NkY2xrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsg
PSBpY2xfbW9kZXNldF9jYWxjX2NkY2xrOwogCX0KIAotCWlmIChJU19JQ0VMQUtFKGRldl9wcml2
KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKIAkJZGV2X3ByaXYtPmRpc3BsYXku
Z2V0X2NkY2xrID0gaWNsX2dldF9jZGNsazsKIAllbHNlIGlmIChJU19HRU4xMChkZXZfcHJpdikp
CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGNubF9nZXRfY2RjbGs7CmRpZmYgLS1n
aXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYyBiL2RyaXZlcnMvZ3B1L2RybS9p
OTE1L2ludGVsX2RkaS5jCmluZGV4IGNkNjI3ODUxZjJhNS4uMTBiNTMxNGYyNjZjIDEwMDY0NAot
LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kZGkuYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9kZGkuYwpAQCAtOTE1LDcgKzkxNSw3IEBAIHN0YXRpYyBpbnQgaW50ZWxf
ZGRpX2hkbWlfbGV2ZWwoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVtIHBv
cnQgcG9yCiAKIAlsZXZlbCA9IGRldl9wcml2LT52YnQuZGRpX3BvcnRfaW5mb1twb3J0XS5oZG1p
X2xldmVsX3NoaWZ0OwogCi0JaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKSB7CisJaWYgKElOVEVM
X0dFTihkZXZfcHJpdikgPj0gMTEpIHsKIAkJaWYgKGludGVsX3BvcnRfaXNfY29tYm9waHkoZGV2
X3ByaXYsIHBvcnQpKQogCQkJaWNsX2dldF9jb21ib19idWZfdHJhbnMoZGV2X3ByaXYsIHBvcnQs
CiAJCQkJCQlJTlRFTF9PVVRQVVRfSERNSSwgJm5fZW50cmllcyk7CkBAIC0xNzQ1LDcgKzE3NDUs
NyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9kZGlfY2xvY2tfZ2V0KHN0cnVjdCBpbnRlbF9lbmNvZGVy
ICplbmNvZGVyLAogCQlieHRfZGRpX2Nsb2NrX2dldChlbmNvZGVyLCBwaXBlX2NvbmZpZyk7CiAJ
ZWxzZSBpZiAoSVNfR0VOMTAoZGV2X3ByaXYpKQogCQljbmxfZGRpX2Nsb2NrX2dldChlbmNvZGVy
LCBwaXBlX2NvbmZpZyk7Ci0JZWxzZSBpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCisJZWxzZSBp
ZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkKIAkJaWNsX2RkaV9jbG9ja19nZXQoZW5jb2Rl
ciwgcGlwZV9jb25maWcpOwogfQogCkBAIC0yMjQxLDcgKzIyNDEsNyBAQCB1OCBpbnRlbF9kZGlf
ZHBfdm9sdGFnZV9tYXgoc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIpCiAJZW51bSBwb3J0
IHBvcnQgPSBlbmNvZGVyLT5wb3J0OwogCWludCBuX2VudHJpZXM7CiAKLQlpZiAoSVNfSUNFTEFL
RShkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMSkgewogCQlpZiAo
aW50ZWxfcG9ydF9pc19jb21ib3BoeShkZXZfcHJpdiwgcG9ydCkpCiAJCQlpY2xfZ2V0X2NvbWJv
X2J1Zl90cmFucyhkZXZfcHJpdiwgcG9ydCwgZW5jb2Rlci0+dHlwZSwKIAkJCQkJCSZuX2VudHJp
ZXMpOwpAQCAtMjcxNiw3ICsyNzE2LDcgQEAgdTMyIGJ4dF9zaWduYWxfbGV2ZWxzKHN0cnVjdCBp
bnRlbF9kcCAqaW50ZWxfZHApCiAJc3RydWN0IGludGVsX2VuY29kZXIgKmVuY29kZXIgPSAmZHBv
cnQtPmJhc2U7CiAJaW50IGxldmVsID0gaW50ZWxfZGRpX2RwX2xldmVsKGludGVsX2RwKTsKIAot
CWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAx
MSkKIAkJaWNsX2RkaV92c3dpbmdfc2VxdWVuY2UoZW5jb2RlciwgaW50ZWxfZHAtPmxpbmtfcmF0
ZSwKIAkJCQkJbGV2ZWwsIGVuY29kZXItPnR5cGUpOwogCWVsc2UgaWYgKElTX0dFTjEwKGRldl9w
cml2KSkKQEAgLTI4MzMsNyArMjgzMyw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9jbGtfc2Vs
ZWN0KHN0cnVjdCBpbnRlbF9lbmNvZGVyICplbmNvZGVyLAogCiAJbXV0ZXhfbG9jaygmZGV2X3By
aXYtPmRwbGxfbG9jayk7CiAKLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5U
RUxfR0VOKGRldl9wcml2KSA+PSAxMSkgewogCQlpZiAoIWludGVsX3BvcnRfaXNfY29tYm9waHko
ZGV2X3ByaXYsIHBvcnQpKQogCQkJSTkxNV9XUklURShERElfQ0xLX1NFTChwb3J0KSwKIAkJCQkg
ICBpY2xfcGxsX3RvX2RkaV9wbGxfc2VsKGVuY29kZXIsIGNydGNfc3RhdGUpKTsKQEAgLTI4NzUs
NyArMjg3NSw3IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9jbGtfZGlzYWJsZShzdHJ1Y3QgaW50
ZWxfZW5jb2RlciAqZW5jb2RlcikKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg
PSB0b19pOTE1KGVuY29kZXItPmJhc2UuZGV2KTsKIAllbnVtIHBvcnQgcG9ydCA9IGVuY29kZXIt
PnBvcnQ7CiAKLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRl
dl9wcml2KSA+PSAxMSkgewogCQlpZiAoIWludGVsX3BvcnRfaXNfY29tYm9waHkoZGV2X3ByaXYs
IHBvcnQpKQogCQkJSTkxNV9XUklURShERElfQ0xLX1NFTChwb3J0KSwgRERJX0NMS19TRUxfTk9O
RSk7CiAJfSBlbHNlIGlmIChJU19HRU4xMChkZXZfcHJpdikpIHsKQEAgLTI5MTcsNyArMjkxNyw3
IEBAIHN0YXRpYyB2b2lkIGludGVsX2RkaV9wcmVfZW5hYmxlX2RwKHN0cnVjdCBpbnRlbF9lbmNv
ZGVyICplbmNvZGVyLAogCWljbF9wcm9ncmFtX21nX2RwX21vZGUoaW50ZWxfZHApOwogCWljbF9k
aXNhYmxlX3BoeV9jbG9ja19nYXRpbmcoZGlnX3BvcnQpOwogCi0JaWYgKElTX0lDRUxBS0UoZGV2
X3ByaXYpKQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQogCQlpY2xfZGRpX3Zzd2lu
Z19zZXF1ZW5jZShlbmNvZGVyLCBjcnRjX3N0YXRlLT5wb3J0X2Nsb2NrLAogCQkJCQlsZXZlbCwg
ZW5jb2Rlci0+dHlwZSk7CiAJZWxzZSBpZiAoSVNfR0VOMTAoZGV2X3ByaXYpKQpAQCAtMjk1Niw3
ICsyOTU2LDcgQEAgc3RhdGljIHZvaWQgaW50ZWxfZGRpX3ByZV9lbmFibGVfaGRtaShzdHJ1Y3Qg
aW50ZWxfZW5jb2RlciAqZW5jb2RlciwKIAogCWludGVsX2Rpc3BsYXlfcG93ZXJfZ2V0KGRldl9w
cml2LCBkaWdfcG9ydC0+ZGRpX2lvX3Bvd2VyX2RvbWFpbik7CiAKLQlpZiAoSVNfSUNFTEFLRShk
ZXZfcHJpdikpCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTEpCiAJCWljbF9kZGlfdnN3
aW5nX3NlcXVlbmNlKGVuY29kZXIsIGNydGNfc3RhdGUtPnBvcnRfY2xvY2ssCiAJCQkJCWxldmVs
LCBJTlRFTF9PVVRQVVRfSERNSSk7CiAJZWxzZSBpZiAoSVNfR0VOMTAoZGV2X3ByaXYpKQpAQCAt
MzM3NSw3ICszMzc1LDcgQEAgdm9pZCBpbnRlbF9kZGlfY29tcHV0ZV9taW5fdm9sdGFnZV9sZXZl
bChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsCiB7CiAJaWYgKElTX0dFTjEwKGRl
dl9wcml2KSAmJiBjcnRjX3N0YXRlLT5wb3J0X2Nsb2NrID4gNTk0MDAwKQogCQljcnRjX3N0YXRl
LT5taW5fdm9sdGFnZV9sZXZlbCA9IDI7Ci0JZWxzZSBpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikg
JiYgY3J0Y19zdGF0ZS0+cG9ydF9jbG9jayA+IDU5NDAwMCkKKwllbHNlIGlmIChJTlRFTF9HRU4o
ZGV2X3ByaXYpID49IDExICYmIGNydGNfc3RhdGUtPnBvcnRfY2xvY2sgPiA1OTQwMDApCiAJCWNy
dGNfc3RhdGUtPm1pbl92b2x0YWdlX2xldmVsID0gMTsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZGlzcGxheS5jCmluZGV4IDFhYmY3OWE0ZWU5MS4uMDhkMGNkODAyZTQ4IDEwMDY0NAotLS0g
YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC01OTMyLDcgKzU5MzIsNyBAQCBib29sIGludGVs
X3BvcnRfaXNfY29tYm9waHkoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LCBlbnVt
IHBvcnQgcG9ydCkKIAlpZiAocG9ydCA9PSBQT1JUX05PTkUpCiAJCXJldHVybiBmYWxzZTsKIAot
CWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAx
MSkKIAkJcmV0dXJuIHBvcnQgPD0gUE9SVF9COwogCiAJcmV0dXJuIGZhbHNlOwpAQCAtNTk0MCw3
ICs1OTQwLDcgQEAgYm9vbCBpbnRlbF9wb3J0X2lzX2NvbWJvcGh5KHN0cnVjdCBkcm1faTkxNV9w
cml2YXRlICpkZXZfcHJpdiwgZW51bSBwb3J0IHBvcnQpCiAKIGJvb2wgaW50ZWxfcG9ydF9pc190
YyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYsIGVudW0gcG9ydCBwb3J0KQogewot
CWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAx
MSkKIAkJcmV0dXJuIHBvcnQgPj0gUE9SVF9DICYmIHBvcnQgPD0gUE9SVF9GOwogCiAJcmV0dXJu
IGZhbHNlOwpAQCAtOTQ5Niw3ICs5NDk2LDcgQEAgc3RhdGljIHZvaWQgaGFzd2VsbF9nZXRfZGRp
X3BvcnRfc3RhdGUoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAKIAlwb3J0ID0gKHRtcCAmIFRS
QU5TX0RESV9QT1JUX01BU0spID4+IFRSQU5TX0RESV9QT1JUX1NISUZUOwogCi0JaWYgKElTX0lD
RUxBS0UoZGV2X3ByaXYpKQorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExKQogCQlpY2Vs
YWtlX2dldF9kZGlfcGxsKGRldl9wcml2LCBwb3J0LCBwaXBlX2NvbmZpZyk7CiAJZWxzZSBpZiAo
SVNfR0VOMTAoZGV2X3ByaXYpKQogCQljYW5ub25sYWtlX2dldF9kZGlfcGxsKGRldl9wcml2LCBw
b3J0LCBwaXBlX2NvbmZpZyk7CkBAIC0xNDA0OSw3ICsxNDA0OSw3IEBAIHN0YXRpYyB2b2lkIGlu
dGVsX3NldHVwX291dHB1dHMoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCWlm
IChpbnRlbF9jcnRfcHJlc2VudChkZXZfcHJpdikpCiAJCWludGVsX2NydF9pbml0KGRldl9wcml2
KTsKIAotCWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkgeworCWlmIChJTlRFTF9HRU4oZGV2X3By
aXYpID49IDExKSB7CiAJCWludGVsX2RkaV9pbml0KGRldl9wcml2LCBQT1JUX0EpOwogCQlpbnRl
bF9kZGlfaW5pdChkZXZfcHJpdiwgUE9SVF9CKTsKIAkJaW50ZWxfZGRpX2luaXQoZGV2X3ByaXYs
IFBPUlRfQyk7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21n
ci5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHBsbF9tZ3IuYwppbmRleCBhZTkyZGM5
N2Q1YWEuLmIwYmE3NzU3MDZiMyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50
ZWxfZHBsbF9tZ3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcGxsX21nci5j
CkBAIC0zMjAwLDcgKzMyMDAsNyBAQCB2b2lkIGludGVsX3NoYXJlZF9kcGxsX2luaXQoc3RydWN0
IGRybV9kZXZpY2UgKmRldikKIAljb25zdCBzdHJ1Y3QgZHBsbF9pbmZvICpkcGxsX2luZm87CiAJ
aW50IGk7CiAKLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCisJaWYgKElOVEVMX0dFTihkZXZf
cHJpdikgPj0gMTEpCiAJCWRwbGxfbWdyID0gJmljbF9wbGxfbWdyOwogCWVsc2UgaWYgKElTX0dF
TjEwKGRldl9wcml2KSkKIAkJZHBsbF9tZ3IgPSAmY25sX3BsbF9tZ3I7CmRpZmYgLS1naXQgYS9k
cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p
bnRlbF9oZG1pLmMKaW5kZXggODlkNWUzOTg0NDUyLi5hYjgzNTM3MGRmMTkgMTAwNjQ0Ci0tLSBh
L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9oZG1pLmMKQEAgLTE5MTksNyArMTkxOSw3IEBAIGludGVsX2hkbWlfZGV0ZWN0
KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsIGJvb2wgZm9yY2UpCiAKIAlpbnRlbF9k
aXNwbGF5X3Bvd2VyX2dldChkZXZfcHJpdiwgUE9XRVJfRE9NQUlOX0dNQlVTKTsKIAotCWlmIChJ
U19JQ0VMQUtFKGRldl9wcml2KSAmJgorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDExICYm
CiAJICAgICFpbnRlbF9kaWdpdGFsX3BvcnRfY29ubmVjdGVkKGVuY29kZXIpKQogCQlnb3RvIG91
dDsKIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jIGIvZHJp
dmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCmluZGV4IDY2MmViMDg3YmIyZS4uZDc1Yjlh
MGMyYmNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9tb2NzLmMKKysr
IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbW9jcy5jCkBAIC0xNzgsOCArMTc4LDcgQEAg
c3RhdGljIGJvb2wgZ2V0X21vY3Nfc2V0dGluZ3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRl
dl9wcml2LAogewogCWJvb2wgcmVzdWx0ID0gZmFsc2U7CiAKLQlpZiAoSVNfR0VOOV9CQyhkZXZf
cHJpdikgfHwgSVNfR0VOMTAoZGV2X3ByaXYpIHx8Ci0JICAgIElTX0lDRUxBS0UoZGV2X3ByaXYp
KSB7CisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTAgfHwgSVNfR0VOOV9CQyhkZXZfcHJp
dikpIHsKIAkJdGFibGUtPnNpemUgID0gQVJSQVlfU0laRShza3lsYWtlX21vY3NfdGFibGUpOwog
CQl0YWJsZS0+dGFibGUgPSBza3lsYWtlX21vY3NfdGFibGU7CiAJCXJlc3VsdCA9IHRydWU7CmRp
ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9wbS5jIGIvZHJpdmVycy9ncHUv
ZHJtL2k5MTUvaW50ZWxfcG0uYwppbmRleCA3MjM0YjIyNzI0ODEuLmY0YjdmZDEzMjE3MyAxMDA2
NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfcG0uYworKysgYi9kcml2ZXJzL2dw
dS9kcm0vaTkxNS9pbnRlbF9wbS5jCkBAIC0zNjEyLDggKzM2MTIsOCBAQCBzdGF0aWMgYm9vbCBz
a2xfbmVlZHNfbWVtb3J5X2J3X3dhKHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUgKnN0YXRlKQog
c3RhdGljIGJvb2wKIGludGVsX2hhc19zYWd2KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZf
cHJpdikKIHsKLQlpZiAoSVNfS0FCWUxBS0UoZGV2X3ByaXYpIHx8IElTX0NPRkZFRUxBS0UoZGV2
X3ByaXYpIHx8Ci0JICAgIElTX0dFTjEwKGRldl9wcml2KSB8fCBJU19JQ0VMQUtFKGRldl9wcml2
KSkKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fAorCSAgICBJU19LQUJZTEFLRShk
ZXZfcHJpdikgfHwgSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpCiAJCXJldHVybiB0cnVlOwogCiAJ
aWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpICYmCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v
aTkxNS9pbnRlbF9ydW50aW1lX3BtLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9ydW50
aW1lX3BtLmMKaW5kZXggNjNmMGIxYzBiZjc3Li4xZDdkZDUwNjcwOGEgMTAwNjQ0Ci0tLSBhL2Ry
aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3J1bnRpbWVfcG0uYworKysgYi9kcml2ZXJzL2dwdS9k
cm0vaTkxNS9pbnRlbF9ydW50aW1lX3BtLmMKQEAgLTMwODIsNyArMzA4Miw3IEBAIGludCBpbnRl
bF9wb3dlcl9kb21haW5zX2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQog
CSAqIFRoZSBlbmFibGluZyBvcmRlciB3aWxsIGJlIGZyb20gbG93ZXIgdG8gaGlnaGVyIGluZGV4
ZWQgd2VsbHMsCiAJICogdGhlIGRpc2FibGluZyBvcmRlciBpcyByZXZlcnNlZC4KIAkgKi8KLQlp
ZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAx
MSkgewogCQllcnIgPSBzZXRfcG93ZXJfd2VsbHMocG93ZXJfZG9tYWlucywgaWNsX3Bvd2VyX3dl
bGxzKTsKIAl9IGVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpKSB7CiAJCWVyciA9IHNldF9w
b3dlcl93ZWxscyhwb3dlcl9kb21haW5zLCBoc3dfcG93ZXJfd2VsbHMpOwpAQCAtMzc2Nyw3ICsz
NzY3LDcgQEAgdm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX2luaXRfaHcoc3RydWN0IGRybV9pOTE1
X3ByaXZhdGUgKmRldl9wcml2LCBib29sIHJlc3VtZSkKIAogCXBvd2VyX2RvbWFpbnMtPmluaXRp
YWxpemluZyA9IHRydWU7CiAKLQlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5U
RUxfR0VOKGRldl9wcml2KSA+PSAxMSkgewogCQlpY2xfZGlzcGxheV9jb3JlX2luaXQoZGV2X3By
aXYsIHJlc3VtZSk7CiAJfSBlbHNlIGlmIChJU19HRU4xMChkZXZfcHJpdikpIHsKIAkJY25sX2Rp
c3BsYXlfY29yZV9pbml0KGRldl9wcml2LCByZXN1bWUpOwpAQCAtMzg5OCw3ICszODk4LDcgQEAg
dm9pZCBpbnRlbF9wb3dlcl9kb21haW5zX3N1c3BlbmQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg
KmRldl9wcml2LAogCQlpbnRlbF9wb3dlcl9kb21haW5zX3ZlcmlmeV9zdGF0ZShkZXZfcHJpdik7
CiAJfQogCi0JaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKQorCWlmIChJTlRFTF9HRU4oZGV2X3By
aXYpID49IDExKQogCQlpY2xfZGlzcGxheV9jb3JlX3VuaW5pdChkZXZfcHJpdik7CiAJZWxzZSBp
ZiAoSVNfR0VOMTAoZGV2X3ByaXYpKQogCQljbmxfZGlzcGxheV9jb3JlX3VuaW5pdChkZXZfcHJp
dik7Ci0tIAoyLjE5LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w
Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs
LWdmeAo=