From: James Ausmus Subject: [PATCH v4] drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ Date: Fri, 10 Nov 2017 13:25:45 -0800 Message-ID: <20171110212545.25943-1-james.ausmus@intel.com> References: <20171102204936.9592-1-james.ausmus@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 702006EB58 for ; Fri, 10 Nov 2017 21:26:59 +0000 (UTC) In-Reply-To: <20171102204936.9592-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 b3AKcmVkdW5kYW50IGNvbW1lbnQgYWJvdXQgYWxwaGEgYmxlbmRpbmcuIChWaWxsZSkKCnYzOiBN b3ZlIEFscGhhIE1vZGUgYml0cyBvdXQgb2Ygc2tsX3BsYW5lX2N0bF9mb3JtYXQgaW50bwpza2xf cGxhbmVfY3RsX2FscGhhLCBhbmQgZHJvcCBnbGtfcGxhbmVfY3RsX2Zvcm1hdCwgZHJvcCBpbml0 aWFsaXphdGlvbgpvZiBzdGF0ZS0+Y29sb3JfY3RsIG9uIHBsYXRmb3JtcyB0aGF0IGRvbid0IHVz ZSBpdCwgYW5kIGRyb3AgY29sb3JfY3RsCmxvY2FsIHZhci4gKFZpbGxlKQoKdjQ6IENvbnNvbGlk YXRlIHNrbF9wbGFuZV9jdGxfZm9ybWF0IHN3aXRjaCBzdGF0ZW1lbnQgb24gZm9ybWF0cyB0aGF0 CnJldHVybiB0aGUgc2FtZSBzZXR0aW5ncy4gKFZpbGxlKQoKU2lnbmVkLW9mZi1ieTogSmFtZXMg QXVzbXVzIDxqYW1lcy5hdXNtdXNAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5y Lnphbm9uaUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAg ICAgfCAxMiArKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDcz ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZHJ2LmggICAgIHwgIDUgKysrCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9z cHJpdGUuYyAgfCAxMSArKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgNzYgaW5zZXJ0aW9ucygrKSwg MjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9y ZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggNmVmMzM0MjJmNzYy Li44ZTc2ZmI5MWIzMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaApAQCAtNjI2NCw3ICs2MjY0 LDcgQEAgZW51bSB7CiAjZGVmaW5lIF9QTEFORV9DVExfMl9BCQkJCTB4NzAyODAKICNkZWZpbmUg X1BMQU5FX0NUTF8zX0EJCQkJMHg3MDM4MAogI2RlZmluZSAgIFBMQU5FX0NUTF9FTkFCTEUJCQko MSA8PCAzMSkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMw KQorI2RlZmluZSAgIFBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJMRQkJKDEgPDwgMzApICAgLyog UHJlLUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRfTUFTSwkJCSgweGYgPDwgMjQp CiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9ZVVY0MjIJCSggIDAgPDwgMjQpCiAjZGVmaW5l ICAgUExBTkVfQ1RMX0ZPUk1BVF9OVjEyCQkJKCAgMSA8PCAyNCkKQEAgLTYyNzQsNyArNjI3NCw3 IEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRfQVlVVgkJCSggIDggPDwgMjQp CiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9JTkRFWEVECQkoIDEyIDw8IDI0KQogI2RlZmlu ZSAgIFBMQU5FX0NUTF9GT1JNQVRfUkdCXzU2NQkJKCAxNCA8PCAyNCkKLSNkZWZpbmUgICBQTEFO RV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykKKyNkZWZpbmUgICBQTEFORV9DVExfUElQ RV9DU0NfRU5BQkxFCQkoMSA8PCAyMykgLyogUHJlLUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NU TF9LRVlfRU5BQkxFX01BU0sJCSgweDMgPDwgMjEpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0tFWV9F TkFCTEVfU09VUkNFCQkoICAxIDw8IDIxKQogI2RlZmluZSAgIFBMQU5FX0NUTF9LRVlfRU5BQkxF X0RFU1RJTkFUSU9OCSggIDIgPDwgMjEpCkBAIC02Mjg3LDEzICs2Mjg3LDEzIEBAIGVudW0gewog I2RlZmluZSAgIFBMQU5FX0NUTF9ZVVY0MjJfVllVWQkJCSggIDMgPDwgMTYpCiAjZGVmaW5lICAg UExBTkVfQ1RMX0RFQ09NUFJFU1NJT05fRU5BQkxFCSgxIDw8IDE1KQogI2RlZmluZSAgIFBMQU5F X0NUTF9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8PCAxNCkKLSNkZWZpbmUgICBQTEFORV9DVExf UExBTkVfR0FNTUFfRElTQUJMRQkJKDEgPDwgMTMpCisjZGVmaW5lICAgUExBTkVfQ1RMX1BMQU5F X0dBTU1BX0RJU0FCTEUJCSgxIDw8IDEzKSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExBTkVf Q1RMX1RJTEVEX01BU0sJCQkoMHg3IDw8IDEwKQogI2RlZmluZSAgIFBMQU5FX0NUTF9USUxFRF9M SU5FQVIJCSggIDAgPDwgMTApCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVEX1gJCQkoICAxIDw8 IDEwKQogI2RlZmluZSAgIFBMQU5FX0NUTF9USUxFRF9ZCQkJKCAgNCA8PCAxMCkKICNkZWZpbmUg ICBQTEFORV9DVExfVElMRURfWUYJCQkoICA1IDw8IDEwKQotI2RlZmluZSAgIFBMQU5FX0NUTF9B TFBIQV9NQVNLCQkJKDB4MyA8PCA0KQorI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9NQVNLCQkJ KDB4MyA8PCA0KSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExBTkVfQ1RMX0FMUEhBX0RJU0FC TEUJCSggIDAgPDwgNCkKICNkZWZpbmUgICBQTEFORV9DVExfQUxQSEFfU1dfUFJFTVVMVElQTFkJ KCAgMiA8PCA0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9IV19QUkVNVUxUSVBMWQkoICAz IDw8IDQpCkBAIC02MzMzLDYgKzYzMzMsMTAgQEAgZW51bSB7CiAjZGVmaW5lICAgUExBTkVfQ09M T1JfUElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMwKQogI2RlZmluZSAgIFBMQU5FX0NPTE9SX1BJ UEVfQ1NDX0VOQUJMRQkJKDEgPDwgMjMpCiAjZGVmaW5lICAgUExBTkVfQ09MT1JfUExBTkVfR0FN TUFfRElTQUJMRQkoMSA8PCAxMykKKyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9NQVNLCQko MHgzIDw8IDQpCisjZGVmaW5lICAgUExBTkVfQ09MT1JfQUxQSEFfRElTQUJMRQkJKDAgPDwgNCkK KyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9TV19QUkVNVUxUSVBMWQkoMiA8PCA0KQorI2Rl ZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX0hXX1BSRU1VTFRJUExZCSgzIDw8IDQpCiAjZGVmaW5l IF9QTEFORV9CVUZfQ0ZHXzFfQQkJCTB4NzAyN2MKICNkZWZpbmUgX1BMQU5FX0JVRl9DRkdfMl9B CQkJMHg3MDM3YwogI2RlZmluZSBfUExBTkVfTlYxMl9CVUZfQ0ZHXzFfQQkJMHg3MDI3OApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmluZGV4IDVjNzU0MGYzZjVkYy4uZGQ1NTJkNzll YmFmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCkBAIC0zNDMyLDIwICszNDMy LDExIEBAIHN0YXRpYyB1MzIgc2tsX3BsYW5lX2N0bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9y bWF0KQogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6CiAJCXJldHVybiBQTEFORV9DVExfRk9STUFU X1JHQl81NjU7CiAJY2FzZSBEUk1fRk9STUFUX1hCR1I4ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9B QkdSODg4ODoKIAkJcmV0dXJuIFBMQU5FX0NUTF9GT1JNQVRfWFJHQl84ODg4IHwgUExBTkVfQ1RM X09SREVSX1JHQlg7CiAJY2FzZSBEUk1fRk9STUFUX1hSR0I4ODg4OgotCQlyZXR1cm4gUExBTkVf Q1RMX0ZPUk1BVF9YUkdCXzg4ODg7Ci0JLyoKLQkgKiBYWFg6IEZvciBBUkJHL0FCR1IgZm9ybWF0 cyB3ZSBkZWZhdWx0IHRvIGV4cGVjdGluZyBzY2Fub3V0IGJ1ZmZlcnMKLQkgKiB0byBiZSBhbHJl YWR5IHByZS1tdWx0aXBsaWVkLiBXZSBuZWVkIHRvIGFkZCBhIGtub2IgKG9yIGEgZGlmZmVyZW50 Ci0JICogRFJNX0ZPUk1BVCkgZm9yIHVzZXItc3BhY2UgdG8gY29uZmlndXJlIHRoYXQuCi0JICov Ci0JY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgotCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9Y UkdCXzg4ODggfCBQTEFORV9DVExfT1JERVJfUkdCWCB8Ci0JCQlQTEFORV9DVExfQUxQSEFfU1df UFJFTVVMVElQTFk7CiAJY2FzZSBEUk1fRk9STUFUX0FSR0I4ODg4OgotCQlyZXR1cm4gUExBTkVf Q1RMX0ZPUk1BVF9YUkdCXzg4ODggfAotCQkJUExBTkVfQ1RMX0FMUEhBX1NXX1BSRU1VTFRJUExZ OworCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzg4ODg7CiAJY2FzZSBEUk1fRk9STUFU X1hSR0IyMTAxMDEwOgogCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzIxMDEwMTA7CiAJ Y2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgpAQCAtMzQ2NSw2ICszNDU2LDMzIEBAIHN0YXRp YyB1MzIgc2tsX3BsYW5lX2N0bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9ybWF0KQogCXJldHVy biAwOwogfQogCisvKgorICogWFhYOiBGb3IgQVJCRy9BQkdSIGZvcm1hdHMgd2UgZGVmYXVsdCB0 byBleHBlY3Rpbmcgc2Nhbm91dCBidWZmZXJzCisgKiB0byBiZSBhbHJlYWR5IHByZS1tdWx0aXBs aWVkLiBXZSBuZWVkIHRvIGFkZCBhIGtub2IgKG9yIGEgZGlmZmVyZW50CisgKiBEUk1fRk9STUFU KSBmb3IgdXNlci1zcGFjZSB0byBjb25maWd1cmUgdGhhdC4KKyAqLworc3RhdGljIHUzMiBza2xf cGxhbmVfY3RsX2FscGhhKHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKK3sKKwlzd2l0Y2ggKHBpeGVs X2Zvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwljYXNlIERSTV9GT1JNQVRf QVJHQjg4ODg6CisJCXJldHVybiBQTEFORV9DVExfQUxQSEFfU1dfUFJFTVVMVElQTFk7CisJZGVm YXVsdDoKKwkJcmV0dXJuIFBMQU5FX0NUTF9BTFBIQV9ESVNBQkxFOworCX0KK30KKworc3RhdGlj IHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKK3sK Kwlzd2l0Y2ggKHBpeGVsX2Zvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwlj YXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6CisJCXJldHVybiBQTEFORV9DT0xPUl9BTFBIQV9TV19Q UkVNVUxUSVBMWTsKKwlkZWZhdWx0OgorCQlyZXR1cm4gUExBTkVfQ09MT1JfQUxQSEFfRElTQUJM RTsKKwl9Cit9CisKIHN0YXRpYyB1MzIgc2tsX3BsYW5lX2N0bF90aWxpbmcodWludDY0X3QgZmJf bW9kaWZpZXIpCiB7CiAJc3dpdGNoIChmYl9tb2RpZmllcikgewpAQCAtMzUyMSw3ICszNTM5LDgg QEAgdTMyIHNrbF9wbGFuZV9jdGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUsCiAKIAlwbGFuZV9jdGwgPSBQTEFORV9DVExfRU5BQkxFOwogCi0JaWYgKCFJU19HRU1J TklMQUtFKGRldl9wcml2KSAmJiAhSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5U RUxfR0VOKGRldl9wcml2KSA8IDEwICYmICFJU19HRU1JTklMQUtFKGRldl9wcml2KSkgeworCQlw bGFuZV9jdGwgfD0gc2tsX3BsYW5lX2N0bF9hbHBoYShmYi0+Zm9ybWF0LT5mb3JtYXQpOwogCQlw bGFuZV9jdGwgfD0KIAkJCVBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJMRSB8CiAJCQlQTEFORV9D VExfUElQRV9DU0NfRU5BQkxFIHwKQEAgLTM1NDAsNiArMzU1OSwyMCBAQCB1MzIgc2tsX3BsYW5l X2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4g cGxhbmVfY3RsOwogfQogCit1MzIgZ2xrX3BsYW5lX2NvbG9yX2N0bChjb25zdCBzdHJ1Y3QgaW50 ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJCWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqcGxhbmVfc3RhdGUpCit7CisJY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIg PSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwl1MzIgcGxhbmVfY29sb3JfY3RsID0gMDsKKworCXBs YW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9QSVBFX0dBTU1BX0VOQUJMRTsKKwlwbGFuZV9j b2xvcl9jdGwgfD0gUExBTkVfQ09MT1JfUElQRV9DU0NfRU5BQkxFOworCXBsYW5lX2NvbG9yX2N0 bCB8PSBQTEFORV9DT0xPUl9QTEFORV9HQU1NQV9ESVNBQkxFOworCXBsYW5lX2NvbG9yX2N0bCB8 PSBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKGZiLT5mb3JtYXQtPmZvcm1hdCk7CisKKwlyZXR1 cm4gcGxhbmVfY29sb3JfY3RsOworfQorCiBzdGF0aWMgaW50CiBfX2ludGVsX2Rpc3BsYXlfcmVz dW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJCSAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19z dGF0ZSAqc3RhdGUsCkBAIC04NDI2LDcgKzg0NTksNyBAQCBza3lsYWtlX2dldF9pbml0aWFsX3Bs YW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0YywKIHsKIAlzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9w cml2ID0gdG9faTkxNShkZXYpOwotCXUzMiB2YWwsIGJhc2UsIG9mZnNldCwgc3RyaWRlX211bHQs IHRpbGluZzsKKwl1MzIgdmFsLCBiYXNlLCBvZmZzZXQsIHN0cmlkZV9tdWx0LCB0aWxpbmcsIGFs cGhhOwogCWludCBwaXBlID0gY3J0Yy0+cGlwZTsKIAlpbnQgZm91cmNjLCBwaXhlbF9mb3JtYXQ7 CiAJdW5zaWduZWQgaW50IGFsaWduZWRfaGVpZ2h0OwpAQCAtODQ0OCw5ICs4NDgxLDE2IEBAIHNr eWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAog CQlnb3RvIGVycm9yOwogCiAJcGl4ZWxfZm9ybWF0ID0gdmFsICYgUExBTkVfQ1RMX0ZPUk1BVF9N QVNLOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0gMTAgfHwgSVNfR0VNSU5JTEFLRShk ZXZfcHJpdikpIHsKKwkJYWxwaGEgPSBJOTE1X1JFQUQoUExBTkVfQ09MT1JfQ1RMKHBpcGUsIDAp KTsKKwkJYWxwaGEgJj0gUExBTkVfQ09MT1JfQUxQSEFfTUFTSzsKKwl9IGVsc2UgeworCQlhbHBo YSA9IHZhbCAmIFBMQU5FX0NUTF9BTFBIQV9NQVNLOworCX0KKwogCWZvdXJjYyA9IHNrbF9mb3Jt YXRfdG9fZm91cmNjKHBpeGVsX2Zvcm1hdCwKLQkJCQkgICAgICB2YWwgJiBQTEFORV9DVExfT1JE RVJfUkdCWCwKLQkJCQkgICAgICB2YWwgJiBQTEFORV9DVExfQUxQSEFfTUFTSyk7CisJCQkJICAg ICAgdmFsICYgUExBTkVfQ1RMX09SREVSX1JHQlgsIGFscGhhKTsKIAlmYi0+Zm9ybWF0ID0gZHJt X2Zvcm1hdF9pbmZvKGZvdXJjYyk7CiAKIAl0aWxpbmcgPSB2YWwgJiBQTEFORV9DVExfVElMRURf TUFTSzsKQEAgLTEyODMxLDYgKzEyODcxLDkgQEAgaW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShz dHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQlzdGF0ZS0+Y3RsID0gaTl4eF9wbGFuZV9jdGwo Y3J0Y19zdGF0ZSwgc3RhdGUpOwogCX0KIAorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEw IHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQlzdGF0ZS0+Y29sb3JfY3RsID0gZ2xrX3Bs YW5lX2NvbG9yX2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7CisKIAlyZXR1cm4gMDsKIH0KIApkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCBhMGE1Y2VhZDg2OGMuLjg0YThkNGIxOTNiNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQyNSw2ICs0MjUsOSBAQCBzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgewogCS8qIHBsYW5lIGNvbnRyb2wgcmVnaXN0ZXIgKi8KIAl1MzIgY3RsOwog CisJLyogcGxhbmUgY29sb3IgY29udHJvbCByZWdpc3RlciAqLworCXUzMiBjb2xvcl9jdGw7CisK IAkvKgogCSAqIHNjYWxlcl9pZAogCSAqICAgID0gLTEgOiBub3QgdXNpbmcgYSBzY2FsZXIKQEAg LTE1MDMsNiArMTUwNiw4IEBAIHN0YXRpYyBpbmxpbmUgdTMyIGludGVsX3BsYW5lX2dndHRfb2Zm c2V0KGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqc3RhdGUpCiAJcmV0dXJuIGk5MTVf Z2d0dF9vZmZzZXQoc3RhdGUtPnZtYSk7CiB9CiAKK3UzMiBnbGtfcGxhbmVfY29sb3JfY3RsKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJY29uc3Qgc3RydWN0 IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0ZSk7CiB1MzIgc2tsX3BsYW5lX2N0bChjb25z dCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJICBjb25zdCBzdHJ1Y3Qg aW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKIHUzMiBza2xfcGxhbmVfc3RyaWRlKGNv bnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZiLCBpbnQgcGxhbmUsCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX3Nwcml0ZS5jCmluZGV4IDRmY2Y4MGNhOTFkZC4uY2U2MTU3MDQ5ODJhIDEwMDY0NAot LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAtMjYzLDEzICsyNjMsOSBAQCBza2xfdXBkYXRl X3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgm ZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFncyk7CiAKLQlpZiAoSVNfR0VNSU5JTEFLRShk ZXZfcHJpdikgfHwgSVNfQ0FOTk9OTEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRl dl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklMQUtFKGRldl9wcml2KSkKIAkJSTkxNV9XUklURV9G VyhQTEFORV9DT0xPUl9DVEwocGlwZSwgcGxhbmVfaWQpLAotCQkJICAgICAgUExBTkVfQ09MT1Jf UElQRV9HQU1NQV9FTkFCTEUgfAotCQkJICAgICAgUExBTkVfQ09MT1JfUElQRV9DU0NfRU5BQkxF IHwKLQkJCSAgICAgIFBMQU5FX0NPTE9SX1BMQU5FX0dBTU1BX0RJU0FCTEUpOwotCX0KLQorCQkJ ICAgICAgcGxhbmVfc3RhdGUtPmNvbG9yX2N0bCk7CiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkx NV9XUklURV9GVyhQTEFORV9LRVlWQUwocGlwZSwgcGxhbmVfaWQpLCBrZXktPm1pbl92YWx1ZSk7 CiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfS0VZTUFYKHBpcGUsIHBsYW5lX2lkKSwga2V5LT5tYXhf dmFsdWUpOwpAQCAtOTc4LDYgKzk3NCw5IEBAIGludGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1 Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQlzdGF0ZS0+Y3RsID0gZzR4X3Nwcml0ZV9jdGwoY3J0 Y19zdGF0ZSwgc3RhdGUpOwogCX0KIAorCWlmIChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8 IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQlzdGF0ZS0+Y29sb3JfY3RsID0gZ2xrX3BsYW5l X2NvbG9yX2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7CisKIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4x NC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRl bC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK