From: James Ausmus Subject: [PATCH] drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ Date: Thu, 2 Nov 2017 16:00:49 -0700 Message-ID: <20171102230049.10952-1-james.ausmus@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7283A6E9C9 for ; Thu, 2 Nov 2017 23:01:56 +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: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org U2luY2UgR0xLLCBzb21lIHBsYW5lIGNvbmZpZ3VyYXRpb24gc2V0dGluZ3MgaGF2ZSBtb3ZlZCB0 byB0aGUKUExBTkVfQ09MT1JfQ1RMIHJlZ2lzdGVyLiBSZWZhY3RvciBoYW5kbGluZyBvZiB0aGUg cmVnaXN0ZXIgdG8gd29yayBsaWtlClBMQU5FX0NUTC4gVGhpcyBhbHNvIGFsbG93cyB1cyB0byBm aXggdGhlIHNldC9yZWFkIG9mIHRoZSBwbGFuZSBBbHBoYQpNb2RlIGZvciBHTEsrLgoKU2lnbmVk LW9mZi1ieTogSmFtZXMgQXVzbXVzIDxqYW1lcy5hdXNtdXNAaW50ZWwuY29tPgpDYzogUGF1bG8g WmFub25pIDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaCAgICAgIHwgMTIgKysrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX2Rpc3BsYXkuYyB8IDYwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLQog ZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDUgKysrCiBkcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxNCArKysrKy0tLS0KIDQgZmlsZXMgY2hhbmdl ZCwgNzYgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKaW5kZXggNjhhNThjY2U2YWIxLi41MjBmZjlhMTUyMjIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaApAQCAtNjI2Myw3ICs2MjYzLDcgQEAgZW51bSB7CiAjZGVmaW5lIF9QTEFORV9DVExfMl9B CQkJCTB4NzAyODAKICNkZWZpbmUgX1BMQU5FX0NUTF8zX0EJCQkJMHg3MDM4MAogI2RlZmluZSAg IFBMQU5FX0NUTF9FTkFCTEUJCQkoMSA8PCAzMSkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9H QU1NQV9FTkFCTEUJCSgxIDw8IDMwKQorI2RlZmluZSAgIFBMQU5FX0NUTF9QSVBFX0dBTU1BX0VO QUJMRQkJKDEgPDwgMzApICAgLyogUHJlLUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JN QVRfTUFTSwkJCSgweGYgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9ZVVY0MjIJ CSggIDAgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9OVjEyCQkJKCAgMSA8PCAy NCkKQEAgLTYyNzMsNyArNjI3Myw3IEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JN QVRfQVlVVgkJCSggIDggPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9JTkRFWEVE CQkoIDEyIDw8IDI0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRfUkdCXzU2NQkJKCAxNCA8 PCAyNCkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykKKyNk ZWZpbmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykgLyogUHJlLUdMSyAq LwogI2RlZmluZSAgIFBMQU5FX0NUTF9LRVlfRU5BQkxFX01BU0sJCSgweDMgPDwgMjEpCiAjZGVm aW5lICAgUExBTkVfQ1RMX0tFWV9FTkFCTEVfU09VUkNFCQkoICAxIDw8IDIxKQogI2RlZmluZSAg IFBMQU5FX0NUTF9LRVlfRU5BQkxFX0RFU1RJTkFUSU9OCSggIDIgPDwgMjEpCkBAIC02Mjg2LDEz ICs2Mjg2LDEzIEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9ZVVY0MjJfVllVWQkJCSgg IDMgPDwgMTYpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0RFQ09NUFJFU1NJT05fRU5BQkxFCSgxIDw8 IDE1KQogI2RlZmluZSAgIFBMQU5FX0NUTF9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8PCAxNCkK LSNkZWZpbmUgICBQTEFORV9DVExfUExBTkVfR0FNTUFfRElTQUJMRQkJKDEgPDwgMTMpCisjZGVm aW5lICAgUExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEUJCSgxIDw8IDEzKSAvKiBQcmUtR0xL ICovCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVEX01BU0sJCQkoMHg3IDw8IDEwKQogI2RlZmlu ZSAgIFBMQU5FX0NUTF9USUxFRF9MSU5FQVIJCSggIDAgPDwgMTApCiAjZGVmaW5lICAgUExBTkVf Q1RMX1RJTEVEX1gJCQkoICAxIDw8IDEwKQogI2RlZmluZSAgIFBMQU5FX0NUTF9USUxFRF9ZCQkJ KCAgNCA8PCAxMCkKICNkZWZpbmUgICBQTEFORV9DVExfVElMRURfWUYJCQkoICA1IDw8IDEwKQot I2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KQorI2RlZmluZSAgIFBM QU5FX0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAg UExBTkVfQ1RMX0FMUEhBX0RJU0FCTEUJCSggIDAgPDwgNCkKICNkZWZpbmUgICBQTEFORV9DVExf QUxQSEFfU1dfUFJFTVVMVElQTFkJKCAgMiA8PCA0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBI QV9IV19QUkVNVUxUSVBMWQkoICAzIDw8IDQpCkBAIC02MzMyLDYgKzYzMzIsMTAgQEAgZW51bSB7 CiAjZGVmaW5lICAgUExBTkVfQ09MT1JfUElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMwKQogI2Rl ZmluZSAgIFBMQU5FX0NPTE9SX1BJUEVfQ1NDX0VOQUJMRQkJKDEgPDwgMjMpCiAjZGVmaW5lICAg UExBTkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJMRQkoMSA8PCAxMykKKyNkZWZpbmUgICBQTEFO RV9DT0xPUl9BTFBIQV9NQVNLCQkoMHgzIDw8IDQpCisjZGVmaW5lICAgUExBTkVfQ09MT1JfQUxQ SEFfRElTQUJMRQkJKDAgPDwgNCkKKyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9TV19QUkVN VUxUSVBMWQkoMiA8PCA0KQorI2RlZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX0hXX1BSRU1VTFRJ UExZCSgzIDw8IDQpCiAjZGVmaW5lIF9QTEFORV9CVUZfQ0ZHXzFfQQkJCTB4NzAyN2MKICNkZWZp bmUgX1BMQU5FX0JVRl9DRkdfMl9BCQkJMHg3MDM3YwogI2RlZmluZSBfUExBTkVfTlYxMl9CVUZf Q0ZHXzFfQQkJMHg3MDI3OApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IGUy YWM5NzY4NDRkOC4uMDg4M2U4NTdkZGE5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxh eS5jCkBAIC0zNDY2LDYgKzM0NjYsMjkgQEAgc3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX2Zvcm1h dCh1aW50MzJfdCBwaXhlbF9mb3JtYXQpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB1MzIgZ2xr X3BsYW5lX2N0bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9ybWF0KQoreworCS8qIEdMSysgbW92 ZXMgdGhlIGFscGhhIG1hc2sgdG8gYSBkaWZmZXJlbnQgcmVnaXN0ZXIgKi8KKwlyZXR1cm4gc2ts X3BsYW5lX2N0bF9mb3JtYXQocGl4ZWxfZm9ybWF0KSAmIH5QTEFORV9DVExfQUxQSEFfTUFTSzsK K30KKworc3RhdGljIHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKHVpbnQzMl90IHBpeGVs X2Zvcm1hdCkKK3sKKwlzd2l0Y2ggKHBpeGVsX2Zvcm1hdCkgeworCS8qCisJICogWFhYOiBGb3Ig QVJCRy9BQkdSIGZvcm1hdHMgd2UgZGVmYXVsdCB0byBleHBlY3Rpbmcgc2Nhbm91dCBidWZmZXJz CisJICogdG8gYmUgYWxyZWFkeSBwcmUtbXVsdGlwbGllZC4gV2UgbmVlZCB0byBhZGQgYSBrbm9i IChvciBhIGRpZmZlcmVudAorCSAqIERSTV9GT1JNQVQpIGZvciB1c2VyLXNwYWNlIHRvIGNvbmZp Z3VyZSB0aGF0LgorCSAqLworCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwkJcmV0dXJuIFBM QU5FX0NPTE9SX0FMUEhBX1NXX1BSRU1VTFRJUExZOworCWNhc2UgRFJNX0ZPUk1BVF9BUkdCODg4 ODoKKwkJcmV0dXJuIFBMQU5FX0NPTE9SX0FMUEhBX1NXX1BSRU1VTFRJUExZOworCWRlZmF1bHQ6 CisJCXJldHVybiBQTEFORV9DT0xPUl9BTFBIQV9ESVNBQkxFOworCX0KK30KKwogc3RhdGljIHUz MiBza2xfcGxhbmVfY3RsX3RpbGluZyh1aW50NjRfdCBmYl9tb2RpZmllcikKIHsKIAlzd2l0Y2gg KGZiX21vZGlmaWVyKSB7CkBAIC0zNTIyLDE0ICszNTQ1LDE2IEBAIHUzMiBza2xfcGxhbmVfY3Rs KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCiAJcGxhbmVfY3Rs ID0gUExBTkVfQ1RMX0VOQUJMRTsKIAotCWlmICghSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgJiYg IUlTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7CisJaWYgKCFJU19HRU1JTklMQUtFKGRldl9wcml2 KSAmJiAhKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTApKSB7CiAJCXBsYW5lX2N0bCB8PQogCQkJ UExBTkVfQ1RMX1BJUEVfR0FNTUFfRU5BQkxFIHwKIAkJCVBMQU5FX0NUTF9QSVBFX0NTQ19FTkFC TEUgfAogCQkJUExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEU7CisJCXBsYW5lX2N0bCB8PSBz a2xfcGxhbmVfY3RsX2Zvcm1hdChmYi0+Zm9ybWF0LT5mb3JtYXQpOworCX0gZWxzZSB7CisJCXBs YW5lX2N0bCB8PSBnbGtfcGxhbmVfY3RsX2Zvcm1hdChmYi0+Zm9ybWF0LT5mb3JtYXQpOwogCX0K IAotCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX2Zvcm1hdChmYi0+Zm9ybWF0LT5mb3JtYXQp OwogCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3RpbGluZyhmYi0+bW9kaWZpZXIpOwogCXBs YW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0aW9uKHJvdGF0aW9uKTsKIApAQCAtMzU0MSw2 ICszNTY2LDIwIEBAIHUzMiBza2xfcGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0 YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBwbGFuZV9jdGw7CiB9CiAKK3UzMiBnbGtfcGxhbmVf Y29sb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJ Y29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwljb25zdCBz dHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOworCXUzMiBw bGFuZV9jb2xvcl9jdGwgPSAwOworCisJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BJ UEVfR0FNTUFfRU5BQkxFOworCXBsYW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9QSVBFX0NT Q19FTkFCTEU7CisJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BMQU5FX0dBTU1BX0RJ U0FCTEU7CisJcGxhbmVfY29sb3JfY3RsIHw9IGdsa19wbGFuZV9jb2xvcl9jdGxfYWxwaGEoZmIt PmZvcm1hdC0+Zm9ybWF0KTsKKworCXJldHVybiBwbGFuZV9jb2xvcl9jdGw7Cit9CisKIHN0YXRp YyBpbnQKIF9faW50ZWxfZGlzcGxheV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJ ICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSwKQEAgLTg0MjUsNyArODQ2NCw3 IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpj cnRjLAogewogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1 Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JdTMyIHZhbCwg YmFzZSwgb2Zmc2V0LCBzdHJpZGVfbXVsdCwgdGlsaW5nOworCXUzMiB2YWwsIGJhc2UsIG9mZnNl dCwgc3RyaWRlX211bHQsIHRpbGluZywgYWxwaGE7CiAJaW50IHBpcGUgPSBjcnRjLT5waXBlOwog CWludCBmb3VyY2MsIHBpeGVsX2Zvcm1hdDsKIAl1bnNpZ25lZCBpbnQgYWxpZ25lZF9oZWlnaHQ7 CkBAIC04NDQ3LDkgKzg0ODYsMTYgQEAgc2t5bGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWco c3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCWdvdG8gZXJyb3I7CiAKIAlwaXhlbF9mb3JtYXQg PSB2YWwgJiBQTEFORV9DVExfRk9STUFUX01BU0s7CisKKwlpZiAoIUlTX0dFTUlOSUxBS0UoZGV2 X3ByaXYpICYmICEoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCkpIHsKKwkJYWxwaGEgPSB2YWwg JiBQTEFORV9DVExfQUxQSEFfTUFTSzsKKwl9IGVsc2UgeworCQlhbHBoYSA9IEk5MTVfUkVBRChQ TEFORV9DT0xPUl9DVEwocGlwZSwgMCkpOworCQlhbHBoYSAmPSBQTEFORV9DT0xPUl9BTFBIQV9N QVNLOworCX0KKwogCWZvdXJjYyA9IHNrbF9mb3JtYXRfdG9fZm91cmNjKHBpeGVsX2Zvcm1hdCwK LQkJCQkgICAgICB2YWwgJiBQTEFORV9DVExfT1JERVJfUkdCWCwKLQkJCQkgICAgICB2YWwgJiBQ TEFORV9DVExfQUxQSEFfTUFTSyk7CisJCQkJICAgICAgdmFsICYgUExBTkVfQ1RMX09SREVSX1JH QlgsIGFscGhhKTsKIAlmYi0+Zm9ybWF0ID0gZHJtX2Zvcm1hdF9pbmZvKGZvdXJjYyk7CiAKIAl0 aWxpbmcgPSB2YWwgJiBQTEFORV9DVExfVElMRURfTUFTSzsKQEAgLTEyODE2LDYgKzEyODYyLDEw IEBAIGludGVsX2NoZWNrX3ByaW1hcnlfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwK IAogCQlzdGF0ZS0+Y3RsID0gaTl4eF9wbGFuZV9jdGwoY3J0Y19zdGF0ZSwgc3RhdGUpOwogCX0K KwlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2KSA+PSAx MCkKKwkJc3RhdGUtPmNvbG9yX2N0bCA9IGdsa19wbGFuZV9jb2xvcl9jdGwoY3J0Y19zdGF0ZSwg c3RhdGUpOworCWVsc2UKKwkJc3RhdGUtPmNvbG9yX2N0bCA9IDA7CiAKIAlyZXR1cm4gMDsKIH0K ZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKaW5kZXggNDdkMDIyZDQ4NzE4Li43OTY3YjM3MDUyMTcg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCkBAIC00MjAsNiArNDIwLDkgQEAgc3RydWN0IGlu dGVsX3BsYW5lX3N0YXRlIHsKIAkvKiBwbGFuZSBjb250cm9sIHJlZ2lzdGVyICovCiAJdTMyIGN0 bDsKIAorCS8qIHBsYW5lIGNvbG9yIGNvbnRyb2wgcmVnaXN0ZXIgKi8KKwl1MzIgY29sb3JfY3Rs OworCiAJLyoKIAkgKiBzY2FsZXJfaWQKIAkgKiAgICA9IC0xIDogbm90IHVzaW5nIGEgc2NhbGVy CkBAIC0xNDkyLDYgKzE0OTUsOCBAQCBzdGF0aWMgaW5saW5lIHUzMiBpbnRlbF9wbGFuZV9nZ3R0 X29mZnNldChjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnN0YXRlKQogCXJldHVybiBp OTE1X2dndHRfb2Zmc2V0KHN0YXRlLT52bWEpOwogfQogCit1MzIgZ2xrX3BsYW5lX2NvbG9yX2N0 bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCWNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwogdTMyIHNrbF9wbGFuZV9jdGwo Y29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAJCSAgY29uc3Qgc3Ry dWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiB1MzIgc2tsX3BsYW5lX3N0cmlk ZShjb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiwgaW50IHBsYW5lLApkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9zcHJpdGUuYwppbmRleCA0ZmNmODBjYTkxZGQuLjBjMDk2NTcxMDFiNyAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKQEAgLTI0MCw2ICsyNDAsNyBAQCBza2xfdXBk YXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJZW51bSBwbGFuZV9pZCBwbGFu ZV9pZCA9IHBsYW5lLT5pZDsKIAllbnVtIHBpcGUgcGlwZSA9IHBsYW5lLT5waXBlOwogCXUzMiBw bGFuZV9jdGwgPSBwbGFuZV9zdGF0ZS0+Y3RsOworCXUzMiBwbGFuZV9jb2xvcl9jdGwgPSBwbGFu ZV9zdGF0ZS0+Y29sb3JfY3RsOwogCWNvbnN0IHN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9y a2V5ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAJdTMyIHN1cmZfYWRkciA9IHBsYW5lX3N0 YXRlLT5tYWluLm9mZnNldDsKIAl1bnNpZ25lZCBpbnQgcm90YXRpb24gPSBwbGFuZV9zdGF0ZS0+ YmFzZS5yb3RhdGlvbjsKQEAgLTI2MywxMyArMjY0LDkgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCiAJc3Bpbl9sb2NrX2lycXNhdmUoJmRldl9wcml2LT51 bmNvcmUubG9jaywgaXJxZmxhZ3MpOwogCi0JaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpIHx8 IElTX0NBTk5PTkxBS0UoZGV2X3ByaXYpKSB7CisJaWYgKElTX0dFTUlOSUxBS0UoZGV2X3ByaXYp IHx8IElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTApCiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfQ09M T1JfQ1RMKHBpcGUsIHBsYW5lX2lkKSwKLQkJCSAgICAgIFBMQU5FX0NPTE9SX1BJUEVfR0FNTUFf RU5BQkxFIHwKLQkJCSAgICAgIFBMQU5FX0NPTE9SX1BJUEVfQ1NDX0VOQUJMRSB8Ci0JCQkgICAg ICBQTEFORV9DT0xPUl9QTEFORV9HQU1NQV9ESVNBQkxFKTsKLQl9Ci0KKwkJCSAgICAgIHBsYW5l X2NvbG9yX2N0bCk7CiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkxNV9XUklURV9GVyhQTEFORV9L RVlWQUwocGlwZSwgcGxhbmVfaWQpLCBrZXktPm1pbl92YWx1ZSk7CiAJCUk5MTVfV1JJVEVfRlco UExBTkVfS0VZTUFYKHBpcGUsIHBsYW5lX2lkKSwga2V5LT5tYXhfdmFsdWUpOwpAQCAtOTc4LDYg Kzk3NSwxMSBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpw bGFuZSwKIAkJc3RhdGUtPmN0bCA9IGc0eF9zcHJpdGVfY3RsKGNydGNfc3RhdGUsIHN0YXRlKTsK IAl9CiAKKwlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgfHwgSU5URUxfR0VOKGRldl9wcml2 KSA+PSAxMCkKKwkJc3RhdGUtPmNvbG9yX2N0bCA9IGdsa19wbGFuZV9jb2xvcl9jdGwoY3J0Y19z dGF0ZSwgc3RhdGUpOworCWVsc2UKKwkJc3RhdGUtPmNvbG9yX2N0bCA9IDA7CisKIAlyZXR1cm4g MDsKIH0KIAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVz a3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9p bnRlbC1nZngK