From: Rodrigo Vivi Subject: [PATCH] drm/i915: Yet another if/else sort of newer to older platforms. Date: Fri, 22 Feb 2019 14:11:12 -0800 Message-ID: <20190222221112.9833-1-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D4C4898F5 for ; Fri, 22 Feb 2019 22:11:14 +0000 (UTC) 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: Lucas De Marchi List-Id: intel-gfx@lists.freedesktop.org Tm8gZnVuY3Rpb25hbCBjaGFuZ2UuIEp1c3QgYSByZW9yZyB0byBtYXRjaCB0aGUgcHJlZmVycmVk CmJlaGF2aW9yLgoKV2hlbiByZWJhc2luZyBpbnRlcm5hbCBicmFuY2ggb24gdG9wIG9mIGxhdGVz dCBzb3J0IEkgbm90aWNlZApmZXcgbW9yZSBjYXNlcyB0aGF0IG5lZWRzIHRvIGdldCByZW9yZGVy ZWQuCgpMZXQncyBkbyBpbiBhIGJ1bmRsZSB0aGlzIHRpbWUgYW5kIGhvcGluZyB0aGVyZSdzIG5v IG90aGVyCm1pc3NpbmcgcGxhY2VzLgoKQ2M6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFs YUBsaW51eC5pbnRlbC5jb20+CkNjOiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KQ2M6IEx1Y2FzIERlIE1hcmNoaSA8bHVjYXMuZGVtYXJjaGlAaW50ZWwuY29tPgpTaWdu ZWQtb2ZmLWJ5OiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+Ci0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyAgICAgICAgICB8IDI0ICsrKystLS0tLQogZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgICAgICAgICB8IDUwICsrKysrKysrKy0tLS0t LS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYyAgICAgICB8IDM4ICsrKysr KystLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jIHwgNjQg KysrKysrKysrKysrLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDg4IGluc2VydGlvbnMo KyksIDg4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5jCmluZGV4IGM2MzU0ZjZj ZGJkYi4uMGUzZDVjZjJjNGY4IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKQEAgLTIxOSwyMCAr MjE5LDIwIEBAIGludGVsX3ZpcnRfZGV0ZWN0X3BjaChjb25zdCBzdHJ1Y3QgZHJtX2k5MTVfcHJp dmF0ZSAqZGV2X3ByaXYpCiAJICogbWFrZSBhbiBlZHVjYXRlZCBndWVzcyBhcyB0byB3aGljaCBQ Q0ggaXMgcmVhbGx5IHRoZXJlLgogCSAqLwogCi0JaWYgKElTX0dFTihkZXZfcHJpdiwgNSkpCi0J CWlkID0gSU5URUxfUENIX0lCWF9ERVZJQ0VfSURfVFlQRTsKLQllbHNlIGlmIChJU19HRU4oZGV2 X3ByaXYsIDYpIHx8IElTX0lWWUJSSURHRShkZXZfcHJpdikpCi0JCWlkID0gSU5URUxfUENIX0NQ VF9ERVZJQ0VfSURfVFlQRTsKLQllbHNlIGlmIChJU19IU1dfVUxUKGRldl9wcml2KSB8fCBJU19C RFdfVUxUKGRldl9wcml2KSkKLQkJaWQgPSBJTlRFTF9QQ0hfTFBUX0xQX0RFVklDRV9JRF9UWVBF OwotCWVsc2UgaWYgKElTX0hBU1dFTEwoZGV2X3ByaXYpIHx8IElTX0JST0FEV0VMTChkZXZfcHJp dikpCi0JCWlkID0gSU5URUxfUENIX0xQVF9ERVZJQ0VfSURfVFlQRTsKLQllbHNlIGlmIChJU19T S1lMQUtFKGRldl9wcml2KSB8fCBJU19LQUJZTEFLRShkZXZfcHJpdikpCi0JCWlkID0gSU5URUxf UENIX1NQVF9ERVZJQ0VfSURfVFlQRTsKKwlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCisJCWlk ID0gSU5URUxfUENIX0lDUF9ERVZJQ0VfSURfVFlQRTsKIAllbHNlIGlmIChJU19DT0ZGRUVMQUtF KGRldl9wcml2KSB8fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkKIAkJaWQgPSBJTlRFTF9QQ0hf Q05QX0RFVklDRV9JRF9UWVBFOwotCWVsc2UgaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKQotCQlp ZCA9IElOVEVMX1BDSF9JQ1BfREVWSUNFX0lEX1RZUEU7CisJZWxzZSBpZiAoSVNfU0tZTEFLRShk ZXZfcHJpdikgfHwgSVNfS0FCWUxBS0UoZGV2X3ByaXYpKQorCQlpZCA9IElOVEVMX1BDSF9TUFRf REVWSUNFX0lEX1RZUEU7CisJZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZfcHJpdikgfHwgSVNfQlJP QURXRUxMKGRldl9wcml2KSkKKwkJaWQgPSBJTlRFTF9QQ0hfTFBUX0RFVklDRV9JRF9UWVBFOwor CWVsc2UgaWYgKElTX0hTV19VTFQoZGV2X3ByaXYpIHx8IElTX0JEV19VTFQoZGV2X3ByaXYpKQor CQlpZCA9IElOVEVMX1BDSF9MUFRfTFBfREVWSUNFX0lEX1RZUEU7CisJZWxzZSBpZiAoSVNfR0VO KGRldl9wcml2LCA2KSB8fCBJU19JVllCUklER0UoZGV2X3ByaXYpKQorCQlpZCA9IElOVEVMX1BD SF9DUFRfREVWSUNFX0lEX1RZUEU7CisJZWxzZSBpZiAoSVNfR0VOKGRldl9wcml2LCA1KSkKKwkJ aWQgPSBJTlRFTF9QQ0hfSUJYX0RFVklDRV9JRF9UWVBFOwogCiAJaWYgKGlkKQogCQlEUk1fREVC VUdfS01TKCJBc3N1bWluZyBQQ0ggSUQgJTA0eFxuIiwgaWQpOwpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3Bl cmYuYwppbmRleCA5ZWJmOTlmM2Q4ZDMuLjcyYTlhMzViNDBlMiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9wZXJmLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9wZXJmLmMKQEAgLTI4ODEsMTIgKzI4ODEsMjQgQEAgdm9pZCBpOTE1X3BlcmZfcmVnaXN0ZXIo c3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJc3lzZnNfYXR0cl9pbml0KCZk ZXZfcHJpdi0+cGVyZi5vYS50ZXN0X2NvbmZpZy5zeXNmc19tZXRyaWNfaWQuYXR0cik7CiAKLQlp ZiAoSVNfSEFTV0VMTChkZXZfcHJpdikpIHsKLQkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdf aHN3KGRldl9wcml2KTsKLQl9IGVsc2UgaWYgKElTX0JST0FEV0VMTChkZXZfcHJpdikpIHsKLQkJ aTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfYmR3KGRldl9wcml2KTsKLQl9IGVsc2UgaWYgKElT X0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX2No dihkZXZfcHJpdik7CisJaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYpKSB7CisJCWk5MTVfcGVyZl9s b2FkX3Rlc3RfY29uZmlnX2ljbChkZXZfcHJpdik7CisJfSBlbHNlIGlmIChJU19DQU5OT05MQUtF KGRldl9wcml2KSkgeworCQlpOTE1X3BlcmZfbG9hZF90ZXN0X2NvbmZpZ19jbmwoZGV2X3ByaXYp OworCX0gZWxzZSBpZiAoSVNfQ09GRkVFTEFLRShkZXZfcHJpdikpIHsKKwkJaWYgKElTX0NGTF9H VDIoZGV2X3ByaXYpKQorCQkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfY2ZsZ3QyKGRldl9w cml2KTsKKwkJaWYgKElTX0NGTF9HVDMoZGV2X3ByaXYpKQorCQkJaTkxNV9wZXJmX2xvYWRfdGVz dF9jb25maWdfY2ZsZ3QzKGRldl9wcml2KTsKKwl9IGVsc2UgaWYgKElTX0dFTUlOSUxBS0UoZGV2 X3ByaXYpKSB7CisJCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX2dsayhkZXZfcHJpdik7CisJ fSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikpIHsKKwkJaWYgKElTX0tCTF9HVDIoZGV2 X3ByaXYpKQorCQkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfa2JsZ3QyKGRldl9wcml2KTsK KwkJZWxzZSBpZiAoSVNfS0JMX0dUMyhkZXZfcHJpdikpCisJCQlpOTE1X3BlcmZfbG9hZF90ZXN0 X2NvbmZpZ19rYmxndDMoZGV2X3ByaXYpOworCX0gZWxzZSBpZiAoSVNfQlJPWFRPTihkZXZfcHJp dikpIHsKKwkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfYnh0KGRldl9wcml2KTsKIAl9IGVs c2UgaWYgKElTX1NLWUxBS0UoZGV2X3ByaXYpKSB7CiAJCWlmIChJU19TS0xfR1QyKGRldl9wcml2 KSkKIAkJCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX3NrbGd0MihkZXZfcHJpdik7CkBAIC0y ODk0LDI1ICsyOTA2LDEzIEBAIHZvaWQgaTkxNV9wZXJmX3JlZ2lzdGVyKHN0cnVjdCBkcm1faTkx NV9wcml2YXRlICpkZXZfcHJpdikKIAkJCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX3NrbGd0 MyhkZXZfcHJpdik7CiAJCWVsc2UgaWYgKElTX1NLTF9HVDQoZGV2X3ByaXYpKQogCQkJaTkxNV9w ZXJmX2xvYWRfdGVzdF9jb25maWdfc2tsZ3Q0KGRldl9wcml2KTsKLQl9IGVsc2UgaWYgKElTX0JS T1hUT04oZGV2X3ByaXYpKSB7Ci0JCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX2J4dChkZXZf cHJpdik7Ci0JfSBlbHNlIGlmIChJU19LQUJZTEFLRShkZXZfcHJpdikpIHsKLQkJaWYgKElTX0tC TF9HVDIoZGV2X3ByaXYpKQotCQkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfa2JsZ3QyKGRl dl9wcml2KTsKLQkJZWxzZSBpZiAoSVNfS0JMX0dUMyhkZXZfcHJpdikpCi0JCQlpOTE1X3BlcmZf bG9hZF90ZXN0X2NvbmZpZ19rYmxndDMoZGV2X3ByaXYpOwotCX0gZWxzZSBpZiAoSVNfR0VNSU5J TEFLRShkZXZfcHJpdikpIHsKLQkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfZ2xrKGRldl9w cml2KTsKLQl9IGVsc2UgaWYgKElTX0NPRkZFRUxBS0UoZGV2X3ByaXYpKSB7Ci0JCWlmIChJU19D RkxfR1QyKGRldl9wcml2KSkKLQkJCWk5MTVfcGVyZl9sb2FkX3Rlc3RfY29uZmlnX2NmbGd0Mihk ZXZfcHJpdik7Ci0JCWlmIChJU19DRkxfR1QzKGRldl9wcml2KSkKLQkJCWk5MTVfcGVyZl9sb2Fk X3Rlc3RfY29uZmlnX2NmbGd0MyhkZXZfcHJpdik7Ci0JfSBlbHNlIGlmIChJU19DQU5OT05MQUtF KGRldl9wcml2KSkgewotCQlpOTE1X3BlcmZfbG9hZF90ZXN0X2NvbmZpZ19jbmwoZGV2X3ByaXYp OwotCX0gZWxzZSBpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpIHsKLQkJaTkxNV9wZXJmX2xvYWRf dGVzdF9jb25maWdfaWNsKGRldl9wcml2KTsKLQl9CisJfSBlbHNlIGlmIChJU19DSEVSUllWSUVX KGRldl9wcml2KSkgeworCQlpOTE1X3BlcmZfbG9hZF90ZXN0X2NvbmZpZ19jaHYoZGV2X3ByaXYp OworCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgeworCQlpOTE1X3BlcmZfbG9h ZF90ZXN0X2NvbmZpZ19iZHcoZGV2X3ByaXYpOworCX0gZWxzZSBpZiAoSVNfSEFTV0VMTChkZXZf cHJpdikpIHsKKwkJaTkxNV9wZXJmX2xvYWRfdGVzdF9jb25maWdfaHN3KGRldl9wcml2KTsKK30K IAogCWlmIChkZXZfcHJpdi0+cGVyZi5vYS50ZXN0X2NvbmZpZy5pZCA9PSAwKQogCQlnb3RvIHN5 c2ZzX2Vycm9yOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsu YyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2NkY2xrLmMKaW5kZXggMjZlMDFhODQ2NWFm Li41ZDI2NjUzODAzNmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Nk Y2xrLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfY2RjbGsuYwpAQCAtMjc0NCwx OCArMjc0NCwxMyBAQCB2b2lkIGludGVsX3VwZGF0ZV9yYXdjbGsoc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2KQogICovCiB2b2lkIGludGVsX2luaXRfY2RjbGtfaG9va3Moc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogewotCWlmIChJU19DSEVSUllWSUVXKGRldl9w cml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBjaHZfc2V0X2NkY2xrOwot CQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQotCQkJdmx2X21vZGVzZXRf Y2FsY19jZGNsazsKLQl9IGVsc2UgaWYgKElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpKSB7Ci0JCWRl dl9wcml2LT5kaXNwbGF5LnNldF9jZGNsayA9IHZsdl9zZXRfY2RjbGs7Ci0JCWRldl9wcml2LT5k aXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9Ci0JCQl2bHZfbW9kZXNldF9jYWxjX2NkY2xrOwot CX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkgewotCQlkZXZfcHJpdi0+ZGlzcGxh eS5zZXRfY2RjbGsgPSBiZHdfc2V0X2NkY2xrOworCWlmIChJU19JQ0VMQUtFKGRldl9wcml2KSkg eworCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBpY2xfc2V0X2NkY2xrOworCQlkZXZf cHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPSBpY2xfbW9kZXNldF9jYWxjX2NkY2xr OworCX0gZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsKKwkJZGV2X3ByaXYtPmRp c3BsYXkuc2V0X2NkY2xrID0gY25sX3NldF9jZGNsazsKIAkJZGV2X3ByaXYtPmRpc3BsYXkubW9k ZXNldF9jYWxjX2NkY2xrID0KLQkJCWJkd19tb2Rlc2V0X2NhbGNfY2RjbGs7CisJCQljbmxfbW9k ZXNldF9jYWxjX2NkY2xrOwogCX0gZWxzZSBpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikpIHsKIAkJ ZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gYnh0X3NldF9jZGNsazsKIAkJZGV2X3ByaXYt PmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KQEAgLTI3NjQsMjMgKzI3NTksMjggQEAgdm9p ZCBpbnRlbF9pbml0X2NkY2xrX2hvb2tzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJp dikKIAkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gc2tsX3NldF9jZGNsazsKIAkJZGV2 X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KIAkJCXNrbF9tb2Rlc2V0X2NhbGNf Y2RjbGs7Ci0JfSBlbHNlIGlmIChJU19DQU5OT05MQUtFKGRldl9wcml2KSkgewotCQlkZXZfcHJp di0+ZGlzcGxheS5zZXRfY2RjbGsgPSBjbmxfc2V0X2NkY2xrOworCX0gZWxzZSBpZiAoSVNfQlJP QURXRUxMKGRldl9wcml2KSkgeworCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSBiZHdf c2V0X2NkY2xrOwogCQlkZXZfcHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQotCQkJ Y25sX21vZGVzZXRfY2FsY19jZGNsazsKLQl9IGVsc2UgaWYgKElTX0lDRUxBS0UoZGV2X3ByaXYp KSB7Ci0JCWRldl9wcml2LT5kaXNwbGF5LnNldF9jZGNsayA9IGljbF9zZXRfY2RjbGs7Ci0JCWRl dl9wcml2LT5kaXNwbGF5Lm1vZGVzZXRfY2FsY19jZGNsayA9IGljbF9tb2Rlc2V0X2NhbGNfY2Rj bGs7CisJCQliZHdfbW9kZXNldF9jYWxjX2NkY2xrOworCX0gZWxzZSBpZiAoSVNfQ0hFUlJZVklF VyhkZXZfcHJpdikpIHsKKwkJZGV2X3ByaXYtPmRpc3BsYXkuc2V0X2NkY2xrID0gY2h2X3NldF9j ZGNsazsKKwkJZGV2X3ByaXYtPmRpc3BsYXkubW9kZXNldF9jYWxjX2NkY2xrID0KKwkJCXZsdl9t b2Rlc2V0X2NhbGNfY2RjbGs7CisJfSBlbHNlIGlmIChJU19WQUxMRVlWSUVXKGRldl9wcml2KSkg eworCQlkZXZfcHJpdi0+ZGlzcGxheS5zZXRfY2RjbGsgPSB2bHZfc2V0X2NkY2xrOworCQlkZXZf cHJpdi0+ZGlzcGxheS5tb2Rlc2V0X2NhbGNfY2RjbGsgPQorCQkJdmx2X21vZGVzZXRfY2FsY19j ZGNsazsKIAl9CiAKIAlpZiAoSVNfSUNFTEFLRShkZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNw bGF5LmdldF9jZGNsayA9IGljbF9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShk ZXZfcHJpdikpCiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGNubF9nZXRfY2RjbGs7 Ci0JZWxzZSBpZiAoSVNfR0VOOV9CQyhkZXZfcHJpdikpCi0JCWRldl9wcml2LT5kaXNwbGF5Lmdl dF9jZGNsayA9IHNrbF9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfR0VOOV9MUChkZXZfcHJpdikp CiAJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9IGJ4dF9nZXRfY2RjbGs7CisJZWxzZSBp ZiAoSVNfR0VOOV9CQyhkZXZfcHJpdikpCisJCWRldl9wcml2LT5kaXNwbGF5LmdldF9jZGNsayA9 IHNrbF9nZXRfY2RjbGs7CiAJZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkKIAkJZGV2 X3ByaXYtPmRpc3BsYXkuZ2V0X2NkY2xrID0gYmR3X2dldF9jZGNsazsKIAllbHNlIGlmIChJU19I QVNXRUxMKGRldl9wcml2KSkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5j CmluZGV4IDc0M2NmNWIwMDE1NS4uM2U4MTM4YjY2MTkxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3dvcmthcm91bmRzLmMKQEAgLTg2MiwyNiArODYyLDI2IEBAIGljbF9ndF93b3JrYXJv dW5kc19pbml0KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBzdHJ1Y3QgaTkxNV93YV9s aXN0ICp3YWwpCiBzdGF0aWMgdm9pZAogZ3RfaW5pdF93b3JrYXJvdW5kcyhzdHJ1Y3QgZHJtX2k5 MTVfcHJpdmF0ZSAqaTkxNSwgc3RydWN0IGk5MTVfd2FfbGlzdCAqd2FsKQogewotCWlmIChJTlRF TF9HRU4oaTkxNSkgPCA4KQorCWlmIChJU19JQ0VMQUtFKGk5MTUpKQorCQlpY2xfZ3Rfd29ya2Fy b3VuZHNfaW5pdChpOTE1LCB3YWwpOworCWVsc2UgaWYgKElTX0NBTk5PTkxBS0UoaTkxNSkpCisJ CWNubF9ndF93b3JrYXJvdW5kc19pbml0KGk5MTUsIHdhbCk7CisJZWxzZSBpZiAoSVNfQ09GRkVF TEFLRShpOTE1KSkKKwkJY2ZsX2d0X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKKwllbHNl IGlmIChJU19HRU1JTklMQUtFKGk5MTUpKQorCQlnbGtfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1 LCB3YWwpOworCWVsc2UgaWYgKElTX0tBQllMQUtFKGk5MTUpKQorCQlrYmxfZ3Rfd29ya2Fyb3Vu ZHNfaW5pdChpOTE1LCB3YWwpOworCWVsc2UgaWYgKElTX0JST1hUT04oaTkxNSkpCisJCWJ4dF9n dF93b3JrYXJvdW5kc19pbml0KGk5MTUsIHdhbCk7CisJZWxzZSBpZiAoSVNfU0tZTEFLRShpOTE1 KSkKKwkJc2tsX2d0X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKKwllbHNlIGlmIChJU19D SEVSUllWSUVXKGk5MTUpKQogCQlyZXR1cm47CiAJZWxzZSBpZiAoSVNfQlJPQURXRUxMKGk5MTUp KQogCQlyZXR1cm47Ci0JZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhpOTE1KSkKKwllbHNlIGlmIChJ TlRFTF9HRU4oaTkxNSkgPCA4KQogCQlyZXR1cm47Ci0JZWxzZSBpZiAoSVNfU0tZTEFLRShpOTE1 KSkKLQkJc2tsX2d0X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKLQllbHNlIGlmIChJU19C Uk9YVE9OKGk5MTUpKQotCQlieHRfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1LCB3YWwpOwotCWVs c2UgaWYgKElTX0tBQllMQUtFKGk5MTUpKQotCQlrYmxfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1 LCB3YWwpOwotCWVsc2UgaWYgKElTX0dFTUlOSUxBS0UoaTkxNSkpCi0JCWdsa19ndF93b3JrYXJv dW5kc19pbml0KGk5MTUsIHdhbCk7Ci0JZWxzZSBpZiAoSVNfQ09GRkVFTEFLRShpOTE1KSkKLQkJ Y2ZsX2d0X3dvcmthcm91bmRzX2luaXQoaTkxNSwgd2FsKTsKLQllbHNlIGlmIChJU19DQU5OT05M QUtFKGk5MTUpKQotCQljbmxfZ3Rfd29ya2Fyb3VuZHNfaW5pdChpOTE1LCB3YWwpOwotCWVsc2Ug aWYgKElTX0lDRUxBS0UoaTkxNSkpCi0JCWljbF9ndF93b3JrYXJvdW5kc19pbml0KGk5MTUsIHdh bCk7CiAJZWxzZQogCQlNSVNTSU5HX0NBU0UoSU5URUxfR0VOKGk5MTUpKTsKIH0KQEAgLTEwNjMs MjYgKzEwNjMsMjYgQEAgdm9pZCBpbnRlbF9lbmdpbmVfaW5pdF93aGl0ZWxpc3Qoc3RydWN0IGlu dGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCiAJd2FfaW5pdF9zdGFydCh3LCAid2hpdGVsaXN0Iik7 CiAKLQlpZiAoSU5URUxfR0VOKGk5MTUpIDwgOCkKKwlpZiAoSVNfSUNFTEFLRShpOTE1KSkKKwkJ aWNsX3doaXRlbGlzdF9idWlsZCh3KTsKKwllbHNlIGlmIChJU19DQU5OT05MQUtFKGk5MTUpKQor CQljbmxfd2hpdGVsaXN0X2J1aWxkKHcpOworCWVsc2UgaWYgKElTX0NPRkZFRUxBS0UoaTkxNSkp CisJCWNmbF93aGl0ZWxpc3RfYnVpbGQodyk7CisJZWxzZSBpZiAoSVNfR0VNSU5JTEFLRShpOTE1 KSkKKwkJZ2xrX3doaXRlbGlzdF9idWlsZCh3KTsKKwllbHNlIGlmIChJU19LQUJZTEFLRShpOTE1 KSkKKwkJa2JsX3doaXRlbGlzdF9idWlsZCh3KTsKKwllbHNlIGlmIChJU19CUk9YVE9OKGk5MTUp KQorCQlieHRfd2hpdGVsaXN0X2J1aWxkKHcpOworCWVsc2UgaWYgKElTX1NLWUxBS0UoaTkxNSkp CisJCXNrbF93aGl0ZWxpc3RfYnVpbGQodyk7CisJZWxzZSBpZiAoSVNfQ0hFUlJZVklFVyhpOTE1 KSkKIAkJcmV0dXJuOwogCWVsc2UgaWYgKElTX0JST0FEV0VMTChpOTE1KSkKIAkJcmV0dXJuOwot CWVsc2UgaWYgKElTX0NIRVJSWVZJRVcoaTkxNSkpCisJZWxzZSBpZiAoSU5URUxfR0VOKGk5MTUp IDwgOCkKIAkJcmV0dXJuOwotCWVsc2UgaWYgKElTX1NLWUxBS0UoaTkxNSkpCi0JCXNrbF93aGl0 ZWxpc3RfYnVpbGQodyk7Ci0JZWxzZSBpZiAoSVNfQlJPWFRPTihpOTE1KSkKLQkJYnh0X3doaXRl bGlzdF9idWlsZCh3KTsKLQllbHNlIGlmIChJU19LQUJZTEFLRShpOTE1KSkKLQkJa2JsX3doaXRl bGlzdF9idWlsZCh3KTsKLQllbHNlIGlmIChJU19HRU1JTklMQUtFKGk5MTUpKQotCQlnbGtfd2hp dGVsaXN0X2J1aWxkKHcpOwotCWVsc2UgaWYgKElTX0NPRkZFRUxBS0UoaTkxNSkpCi0JCWNmbF93 aGl0ZWxpc3RfYnVpbGQodyk7Ci0JZWxzZSBpZiAoSVNfQ0FOTk9OTEFLRShpOTE1KSkKLQkJY25s X3doaXRlbGlzdF9idWlsZCh3KTsKLQllbHNlIGlmIChJU19JQ0VMQUtFKGk5MTUpKQotCQlpY2xf d2hpdGVsaXN0X2J1aWxkKHcpOwogCWVsc2UKIAkJTUlTU0lOR19DQVNFKElOVEVMX0dFTihpOTE1 KSk7CiAKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50 ZWwtZ2Z4