From: James Ausmus Subject: [PATCH v2] drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ Date: Fri, 3 Nov 2017 09:58:48 -0700 Message-ID: <20171103165848.23407-1-james.ausmus@intel.com> References: <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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id F08AB6E2E7 for ; Fri, 3 Nov 2017 16:59:57 +0000 (UTC) In-Reply-To: <20171102230049.10952-1-james.ausmus@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 Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org U2luY2UgR0xLLCBzb21lIHBsYW5lIGNvbmZpZ3VyYXRpb24gc2V0dGluZ3MgaGF2ZSBtb3ZlZCB0 byB0aGUKUExBTkVfQ09MT1JfQ1RMIHJlZ2lzdGVyLiBSZWZhY3RvciBoYW5kbGluZyBvZiB0aGUg cmVnaXN0ZXIgdG8gd29yayBsaWtlClBMQU5FX0NUTC4gVGhpcyBhbHNvIGFsbG93cyB1cyB0byBm aXggdGhlIHNldC9yZWFkIG9mIHRoZSBwbGFuZSBBbHBoYQpNb2RlIGZvciBHTEsrLgoKdjI6IEFk anVzdCBvcmRlcmluZyBvZiBwbGF0Zm9ybSBjaGVja3MgdG8gYmUgbmV3ZXN0LT5vbGRlc3QsIGRy b3AKcmVkdW5kYW50IGNvbW1lbnQgYWJvdXQgYWxwaGEgYmxlbmRpbmcuIChWaWxsZSkKClNpZ25l ZC1vZmYtYnk6IEphbWVzIEF1c211cyA8amFtZXMuYXVzbXVzQGludGVsLmNvbT4KQ2M6IFBhdWxv IFphbm9uaSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2 aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oICAgICAgfCAxMiArKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIHwgNTUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tCiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNSArKysrCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxNCArKysrKy0tLS0KIDQgZmlsZXMgY2hhbmdlZCwg NzEgaW5zZXJ0aW9ucygrKSwgMTUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgK aW5kZXggZjBmOGY2MDU5NjUyLi5lY2Q2YjIzNmUwMDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcu aApAQCAtNjI2Myw3ICs2MjYzLDcgQEAgZW51bSB7CiAjZGVmaW5lIF9QTEFORV9DVExfMl9BCQkJ CTB4NzAyODAKICNkZWZpbmUgX1BMQU5FX0NUTF8zX0EJCQkJMHg3MDM4MAogI2RlZmluZSAgIFBM QU5FX0NUTF9FTkFCTEUJCQkoMSA8PCAzMSkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9HQU1N QV9FTkFCTEUJCSgxIDw8IDMwKQorI2RlZmluZSAgIFBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJM RQkJKDEgPDwgMzApICAgLyogUHJlLUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRf TUFTSwkJCSgweGYgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9ZVVY0MjIJCSgg IDAgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9OVjEyCQkJKCAgMSA8PCAyNCkK QEAgLTYyNzMsNyArNjI3Myw3IEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRf QVlVVgkJCSggIDggPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9JTkRFWEVECQko IDEyIDw8IDI0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRfUkdCXzU2NQkJKCAxNCA8PCAy NCkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykKKyNkZWZp bmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykgLyogUHJlLUdMSyAqLwog I2RlZmluZSAgIFBMQU5FX0NUTF9LRVlfRU5BQkxFX01BU0sJCSgweDMgPDwgMjEpCiAjZGVmaW5l ICAgUExBTkVfQ1RMX0tFWV9FTkFCTEVfU09VUkNFCQkoICAxIDw8IDIxKQogI2RlZmluZSAgIFBM QU5FX0NUTF9LRVlfRU5BQkxFX0RFU1RJTkFUSU9OCSggIDIgPDwgMjEpCkBAIC02Mjg2LDEzICs2 Mjg2LDEzIEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9ZVVY0MjJfVllVWQkJCSggIDMg PDwgMTYpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0RFQ09NUFJFU1NJT05fRU5BQkxFCSgxIDw8IDE1 KQogI2RlZmluZSAgIFBMQU5FX0NUTF9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8PCAxNCkKLSNk ZWZpbmUgICBQTEFORV9DVExfUExBTkVfR0FNTUFfRElTQUJMRQkJKDEgPDwgMTMpCisjZGVmaW5l ICAgUExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEUJCSgxIDw8IDEzKSAvKiBQcmUtR0xLICov CiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVEX01BU0sJCQkoMHg3IDw8IDEwKQogI2RlZmluZSAg IFBMQU5FX0NUTF9USUxFRF9MSU5FQVIJCSggIDAgPDwgMTApCiAjZGVmaW5lICAgUExBTkVfQ1RM X1RJTEVEX1gJCQkoICAxIDw8IDEwKQogI2RlZmluZSAgIFBMQU5FX0NUTF9USUxFRF9ZCQkJKCAg NCA8PCAxMCkKICNkZWZpbmUgICBQTEFORV9DVExfVElMRURfWUYJCQkoICA1IDw8IDEwKQotI2Rl ZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KQorI2RlZmluZSAgIFBMQU5F X0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExB TkVfQ1RMX0FMUEhBX0RJU0FCTEUJCSggIDAgPDwgNCkKICNkZWZpbmUgICBQTEFORV9DVExfQUxQ SEFfU1dfUFJFTVVMVElQTFkJKCAgMiA8PCA0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9I V19QUkVNVUxUSVBMWQkoICAzIDw8IDQpCkBAIC02MzMyLDYgKzYzMzIsMTAgQEAgZW51bSB7CiAj ZGVmaW5lICAgUExBTkVfQ09MT1JfUElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMwKQogI2RlZmlu ZSAgIFBMQU5FX0NPTE9SX1BJUEVfQ1NDX0VOQUJMRQkJKDEgPDwgMjMpCiAjZGVmaW5lICAgUExB TkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJMRQkoMSA8PCAxMykKKyNkZWZpbmUgICBQTEFORV9D T0xPUl9BTFBIQV9NQVNLCQkoMHgzIDw8IDQpCisjZGVmaW5lICAgUExBTkVfQ09MT1JfQUxQSEFf RElTQUJMRQkJKDAgPDwgNCkKKyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9TV19QUkVNVUxU SVBMWQkoMiA8PCA0KQorI2RlZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX0hXX1BSRU1VTFRJUExZ CSgzIDw8IDQpCiAjZGVmaW5lIF9QTEFORV9CVUZfQ0ZHXzFfQQkJCTB4NzAyN2MKICNkZWZpbmUg X1BMQU5FX0JVRl9DRkdfMl9BCQkJMHg3MDM3YwogI2RlZmluZSBfUExBTkVfTlYxMl9CVUZfQ0ZH XzFfQQkJMHg3MDI3OApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlz cGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDczN2Rl MjUxZDBmOC4uMzk0NTMyNzZkYWQxIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j CkBAIC0zNDY2LDYgKzM0NjYsMjMgQEAgc3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX2Zvcm1hdCh1 aW50MzJfdCBwaXhlbF9mb3JtYXQpCiAJcmV0dXJuIDA7CiB9CiAKK3N0YXRpYyB1MzIgZ2xrX3Bs YW5lX2N0bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9ybWF0KQoreworCS8qIEdMSysgbW92ZXMg dGhlIGFscGhhIG1hc2sgdG8gYSBkaWZmZXJlbnQgcmVnaXN0ZXIgKi8KKwlyZXR1cm4gc2tsX3Bs YW5lX2N0bF9mb3JtYXQocGl4ZWxfZm9ybWF0KSAmIH5QTEFORV9DVExfQUxQSEFfTUFTSzsKK30K Kworc3RhdGljIHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKHVpbnQzMl90IHBpeGVsX2Zv cm1hdCkKK3sKKwlzd2l0Y2ggKHBpeGVsX2Zvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9BQkdS ODg4ODoKKwljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6CisJCXJldHVybiBQTEFORV9DT0xPUl9B TFBIQV9TV19QUkVNVUxUSVBMWTsKKwlkZWZhdWx0OgorCQlyZXR1cm4gUExBTkVfQ09MT1JfQUxQ SEFfRElTQUJMRTsKKwl9Cit9CisKIHN0YXRpYyB1MzIgc2tsX3BsYW5lX2N0bF90aWxpbmcodWlu dDY0X3QgZmJfbW9kaWZpZXIpCiB7CiAJc3dpdGNoIChmYl9tb2RpZmllcikgewpAQCAtMzUyMiwx NCArMzUzOSwxNiBAQCB1MzIgc2tsX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSwKIAogCXBsYW5lX2N0bCA9IFBMQU5FX0NUTF9FTkFCTEU7CiAKLQlp ZiAoIUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpICYmICFJU19DQU5OT05MQUtFKGRldl9wcml2KSkg eworCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3By aXYpKSB7CisJCXBsYW5lX2N0bCB8PSBnbGtfcGxhbmVfY3RsX2Zvcm1hdChmYi0+Zm9ybWF0LT5m b3JtYXQpOworCX0gZWxzZSB7CiAJCXBsYW5lX2N0bCB8PQogCQkJUExBTkVfQ1RMX1BJUEVfR0FN TUFfRU5BQkxFIHwKIAkJCVBMQU5FX0NUTF9QSVBFX0NTQ19FTkFCTEUgfAogCQkJUExBTkVfQ1RM X1BMQU5FX0dBTU1BX0RJU0FCTEU7CisJCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX2Zvcm1h dChmYi0+Zm9ybWF0LT5mb3JtYXQpOwogCX0KIAotCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3Rs X2Zvcm1hdChmYi0+Zm9ybWF0LT5mb3JtYXQpOwogCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3Rs X3RpbGluZyhmYi0+bW9kaWZpZXIpOwogCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX3JvdGF0 aW9uKHJvdGF0aW9uKTsKIApAQCAtMzU0MSw2ICszNTYwLDIwIEBAIHUzMiBza2xfcGxhbmVfY3Rs KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXJldHVybiBwbGFu ZV9jdGw7CiB9CiAKK3UzMiBnbGtfcGxhbmVfY29sb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRl ICpwbGFuZV9zdGF0ZSkKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVyICpmYiA9IHBs YW5lX3N0YXRlLT5iYXNlLmZiOworCXUzMiBwbGFuZV9jb2xvcl9jdGwgPSAwOworCisJcGxhbmVf Y29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BJUEVfR0FNTUFfRU5BQkxFOworCXBsYW5lX2NvbG9y X2N0bCB8PSBQTEFORV9DT0xPUl9QSVBFX0NTQ19FTkFCTEU7CisJcGxhbmVfY29sb3JfY3RsIHw9 IFBMQU5FX0NPTE9SX1BMQU5FX0dBTU1BX0RJU0FCTEU7CisJcGxhbmVfY29sb3JfY3RsIHw9IGds a19wbGFuZV9jb2xvcl9jdGxfYWxwaGEoZmItPmZvcm1hdC0+Zm9ybWF0KTsKKworCXJldHVybiBw bGFuZV9jb2xvcl9jdGw7Cit9CisKIHN0YXRpYyBpbnQKIF9faW50ZWxfZGlzcGxheV9yZXN1bWUo c3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICAgICAgIHN0cnVjdCBkcm1fYXRvbWljX3N0YXRl ICpzdGF0ZSwKQEAgLTg0MjYsNyArODQ1OSw3IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVf Y29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogewogCXN0cnVjdCBkcm1fZGV2aWNlICpk ZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYg PSB0b19pOTE1KGRldik7Ci0JdTMyIHZhbCwgYmFzZSwgb2Zmc2V0LCBzdHJpZGVfbXVsdCwgdGls aW5nOworCXUzMiB2YWwsIGJhc2UsIG9mZnNldCwgc3RyaWRlX211bHQsIHRpbGluZywgYWxwaGE7 CiAJaW50IHBpcGUgPSBjcnRjLT5waXBlOwogCWludCBmb3VyY2MsIHBpeGVsX2Zvcm1hdDsKIAl1 bnNpZ25lZCBpbnQgYWxpZ25lZF9oZWlnaHQ7CkBAIC04NDQ4LDkgKzg0ODEsMTYgQEAgc2t5bGFr ZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNydGMsCiAJCWdv dG8gZXJyb3I7CiAKIAlwaXhlbF9mb3JtYXQgPSB2YWwgJiBQTEFORV9DVExfRk9STUFUX01BU0s7 CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklMQUtFKGRldl9w cml2KSkgeworCQlhbHBoYSA9IEk5MTVfUkVBRChQTEFORV9DT0xPUl9DVEwocGlwZSwgMCkpOwor CQlhbHBoYSAmPSBQTEFORV9DT0xPUl9BTFBIQV9NQVNLOworCX0gZWxzZSB7CisJCWFscGhhID0g dmFsICYgUExBTkVfQ1RMX0FMUEhBX01BU0s7CisJfQorCiAJZm91cmNjID0gc2tsX2Zvcm1hdF90 b19mb3VyY2MocGl4ZWxfZm9ybWF0LAotCQkJCSAgICAgIHZhbCAmIFBMQU5FX0NUTF9PUkRFUl9S R0JYLAotCQkJCSAgICAgIHZhbCAmIFBMQU5FX0NUTF9BTFBIQV9NQVNLKTsKKwkJCQkgICAgICB2 YWwgJiBQTEFORV9DVExfT1JERVJfUkdCWCwgYWxwaGEpOwogCWZiLT5mb3JtYXQgPSBkcm1fZm9y bWF0X2luZm8oZm91cmNjKTsKIAogCXRpbGluZyA9IHZhbCAmIFBMQU5FX0NUTF9USUxFRF9NQVNL OwpAQCAtMTI4MzEsNiArMTI4NzEsMTEgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQlzdGF0ZS0+Y3RsID0gaTl4eF9wbGFuZV9jdGwoY3J0 Y19zdGF0ZSwgc3RhdGUpOwogCX0KIAorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8 IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQlzdGF0ZS0+Y29sb3JfY3RsID0gZ2xrX3BsYW5l X2NvbG9yX2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7CisJZWxzZQorCQlzdGF0ZS0+Y29sb3JfY3Rs ID0gMDsKKwogCXJldHVybiAwOwogfQogCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDAw YjQ4ODY4ODA0Mi4uOTJiYzEzMjU3MDFiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkx NS9pbnRlbF9kcnYuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAt NDI1LDYgKzQyNSw5IEBAIHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSB7CiAJLyogcGxhbmUgY29u dHJvbCByZWdpc3RlciAqLwogCXUzMiBjdGw7CiAKKwkvKiBwbGFuZSBjb2xvciBjb250cm9sIHJl Z2lzdGVyICovCisJdTMyIGNvbG9yX2N0bDsKKwogCS8qCiAJICogc2NhbGVyX2lkCiAJICogICAg PSAtMSA6IG5vdCB1c2luZyBhIHNjYWxlcgpAQCAtMTUwNCw2ICsxNTA3LDggQEAgc3RhdGljIGlu bGluZSB1MzIgaW50ZWxfcGxhbmVfZ2d0dF9vZmZzZXQoY29uc3Qgc3RydWN0IGludGVsX3BsYW5l X3N0YXRlICpzdGF0ZSkKIAlyZXR1cm4gaTkxNV9nZ3R0X29mZnNldChzdGF0ZS0+dm1hKTsKIH0K IAordTMyIGdsa19wbGFuZV9jb2xvcl9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUg KmNydGNfc3RhdGUsCisJCQljb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0 YXRlKTsKIHUzMiBza2xfcGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlLAogCQkgIGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3Rh dGUpOwogdTMyIHNrbF9wbGFuZV9zdHJpZGUoY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAq ZmIsIGludCBwbGFuZSwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nw cml0ZS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNGZjZjgw Y2E5MWRkLi4xOGI5Yzk4YmM4MDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBA IC0yNDAsNiArMjQwLDcgQEAgc2tsX3VwZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBs YW5lLAogCWVudW0gcGxhbmVfaWQgcGxhbmVfaWQgPSBwbGFuZS0+aWQ7CiAJZW51bSBwaXBlIHBp cGUgPSBwbGFuZS0+cGlwZTsKIAl1MzIgcGxhbmVfY3RsID0gcGxhbmVfc3RhdGUtPmN0bDsKKwl1 MzIgcGxhbmVfY29sb3JfY3RsID0gcGxhbmVfc3RhdGUtPmNvbG9yX2N0bDsKIAljb25zdCBzdHJ1 Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqa2V5ID0gJnBsYW5lX3N0YXRlLT5ja2V5Owog CXUzMiBzdXJmX2FkZHIgPSBwbGFuZV9zdGF0ZS0+bWFpbi5vZmZzZXQ7CiAJdW5zaWduZWQgaW50 IHJvdGF0aW9uID0gcGxhbmVfc3RhdGUtPmJhc2Uucm90YXRpb247CkBAIC0yNjMsMTMgKzI2NCw5 IEBAIHNrbF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAogCXNwaW5f bG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAotCWlmIChJ U19HRU1JTklMQUtFKGRldl9wcml2KSB8fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkgeworCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQog CQlJOTE1X1dSSVRFX0ZXKFBMQU5FX0NPTE9SX0NUTChwaXBlLCBwbGFuZV9pZCksCi0JCQkgICAg ICBQTEFORV9DT0xPUl9QSVBFX0dBTU1BX0VOQUJMRSB8Ci0JCQkgICAgICBQTEFORV9DT0xPUl9Q SVBFX0NTQ19FTkFCTEUgfAotCQkJICAgICAgUExBTkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJM RSk7Ci0JfQotCisJCQkgICAgICBwbGFuZV9jb2xvcl9jdGwpOwogCWlmIChrZXktPmZsYWdzKSB7 CiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfS0VZVkFMKHBpcGUsIHBsYW5lX2lkKSwga2V5LT5taW5f dmFsdWUpOwogCQlJOTE1X1dSSVRFX0ZXKFBMQU5FX0tFWU1BWChwaXBlLCBwbGFuZV9pZCksIGtl eS0+bWF4X3ZhbHVlKTsKQEAgLTk3OCw2ICs5NzUsMTEgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3Bs YW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCXN0YXRlLT5jdGwgPSBnNHhfc3ByaXRl X2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7CiAJfQogCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCXN0YXRlLT5jb2xvcl9jdGwgPSBn bGtfcGxhbmVfY29sb3JfY3RsKGNydGNfc3RhdGUsIHN0YXRlKTsKKwllbHNlCisJCXN0YXRlLT5j b2xvcl9jdGwgPSAwOworCiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMTQuMQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==