From: James Ausmus Subject: [PATCH v4] drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ Date: Mon, 13 Nov 2017 10:11:28 -0800 Message-ID: <20171113181128.2926-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 2E8B56E73A for ; Mon, 13 Nov 2017 18:12:36 +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 aXggdGhlIHNldC9yZWFkIG9mIHRoZSBwbGFuZSBBbHBoYQpNb2RlIGZvciBHTEsrLgoKdjI6IEFk anVzdCBvcmRlcmluZyBvZiBwbGF0Zm9ybSBjaGVja3MgdG8gYmUgbmV3ZXN0LT5vbGRlc3QsIGRy b3AKcmVkdW5kYW50IGNvbW1lbnQgYWJvdXQgYWxwaGEgYmxlbmRpbmcuIChWaWxsZSkKCnYzOiBN b3ZlIEFscGhhIE1vZGUgYml0cyBvdXQgb2Ygc2tsX3BsYW5lX2N0bF9mb3JtYXQgaW50bwpza2xf cGxhbmVfY3RsX2FscGhhLCBhbmQgZHJvcCBnbGtfcGxhbmVfY3RsX2Zvcm1hdCwgZHJvcCBpbml0 aWFsaXphdGlvbgpvZiBzdGF0ZS0+Y29sb3JfY3RsIG9uIHBsYXRmb3JtcyB0aGF0IGRvbid0IHVz ZSBpdCwgYW5kIGRyb3AgY29sb3JfY3RsCmxvY2FsIHZhci4gKFZpbGxlKQoKdjQ6IENvbnNvbGlk YXRlIHNrbF9wbGFuZV9jdGxfZm9ybWF0IHN3aXRjaCBzdGF0ZW1lbnQgb24gZm9ybWF0cyB0aGF0 CnJldHVybiB0aGUgc2FtZSBzZXR0aW5ncy4gKFZpbGxlKQoKU2lnbmVkLW9mZi1ieTogSmFtZXMg QXVzbXVzIDxqYW1lcy5hdXNtdXNAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25pIDxwYXVsby5y Lnphbm9uaUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGlu dXguaW50ZWwuY29tPgpSZXZpZXdlZC1ieTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxh QGxpbnV4LmludGVsLmNvbT4KLS0tCgpOT1RFOiBSZXNlbmRpbmcgd2l0aG91dCB0aGUgLS1pbi1y ZXBseS10bywgYXMgaXQgc2VlbXMgSSBtYW5hZ2VkIHRvCmNvbmZ1c2UgdGhlIENJIHN5c3RlbSwg c28gdjQgZGlkbid0IGdldCBwcm9wZXJseSBwaWNrZWQgdXAgZm9yIHRlc3RpbmcKCiBkcml2ZXJz L2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oICAgICAgfCAxMiArKysrLS0KIGRyaXZlcnMvZ3B1L2Ry bS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDczICsrKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggICAgIHwgIDUgKysrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYyAgfCAxMSArKystLS0KIDQgZmlsZXMg Y2hhbmdlZCwgNzYgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfcmVnLmgKaW5kZXggMDVlMzNhNDFmY2M3Li4yMjJhZWE0OWMwNmEgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUv aTkxNV9yZWcuaApAQCAtNjI5NSw3ICs2Mjk1LDcgQEAgZW51bSB7CiAjZGVmaW5lIF9QTEFORV9D VExfMl9BCQkJCTB4NzAyODAKICNkZWZpbmUgX1BMQU5FX0NUTF8zX0EJCQkJMHg3MDM4MAogI2Rl ZmluZSAgIFBMQU5FX0NUTF9FTkFCTEUJCQkoMSA8PCAzMSkKLSNkZWZpbmUgICBQTEFORV9DVExf UElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMwKQorI2RlZmluZSAgIFBMQU5FX0NUTF9QSVBFX0dB TU1BX0VOQUJMRQkJKDEgPDwgMzApICAgLyogUHJlLUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NU TF9GT1JNQVRfTUFTSwkJCSgweGYgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9Z VVY0MjIJCSggIDAgPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9OVjEyCQkJKCAg MSA8PCAyNCkKQEAgLTYzMDUsNyArNjMwNSw3IEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NU TF9GT1JNQVRfQVlVVgkJCSggIDggPDwgMjQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9J TkRFWEVECQkoIDEyIDw8IDI0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9GT1JNQVRfUkdCXzU2NQkJ KCAxNCA8PCAyNCkKLSNkZWZpbmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAy MykKKyNkZWZpbmUgICBQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykgLyogUHJl LUdMSyAqLwogI2RlZmluZSAgIFBMQU5FX0NUTF9LRVlfRU5BQkxFX01BU0sJCSgweDMgPDwgMjEp CiAjZGVmaW5lICAgUExBTkVfQ1RMX0tFWV9FTkFCTEVfU09VUkNFCQkoICAxIDw8IDIxKQogI2Rl ZmluZSAgIFBMQU5FX0NUTF9LRVlfRU5BQkxFX0RFU1RJTkFUSU9OCSggIDIgPDwgMjEpCkBAIC02 MzE4LDEzICs2MzE4LDEzIEBAIGVudW0gewogI2RlZmluZSAgIFBMQU5FX0NUTF9ZVVY0MjJfVllV WQkJCSggIDMgPDwgMTYpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0RFQ09NUFJFU1NJT05fRU5BQkxF CSgxIDw8IDE1KQogI2RlZmluZSAgIFBMQU5FX0NUTF9UUklDS0xFX0ZFRURfRElTQUJMRQkoMSA8 PCAxNCkKLSNkZWZpbmUgICBQTEFORV9DVExfUExBTkVfR0FNTUFfRElTQUJMRQkJKDEgPDwgMTMp CisjZGVmaW5lICAgUExBTkVfQ1RMX1BMQU5FX0dBTU1BX0RJU0FCTEUJCSgxIDw8IDEzKSAvKiBQ cmUtR0xLICovCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVEX01BU0sJCQkoMHg3IDw8IDEwKQog I2RlZmluZSAgIFBMQU5FX0NUTF9USUxFRF9MSU5FQVIJCSggIDAgPDwgMTApCiAjZGVmaW5lICAg UExBTkVfQ1RMX1RJTEVEX1gJCQkoICAxIDw8IDEwKQogI2RlZmluZSAgIFBMQU5FX0NUTF9USUxF RF9ZCQkJKCAgNCA8PCAxMCkKICNkZWZpbmUgICBQTEFORV9DVExfVElMRURfWUYJCQkoICA1IDw8 IDEwKQotI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KQorI2RlZmlu ZSAgIFBMQU5FX0NUTF9BTFBIQV9NQVNLCQkJKDB4MyA8PCA0KSAvKiBQcmUtR0xLICovCiAjZGVm aW5lICAgUExBTkVfQ1RMX0FMUEhBX0RJU0FCTEUJCSggIDAgPDwgNCkKICNkZWZpbmUgICBQTEFO RV9DVExfQUxQSEFfU1dfUFJFTVVMVElQTFkJKCAgMiA8PCA0KQogI2RlZmluZSAgIFBMQU5FX0NU TF9BTFBIQV9IV19QUkVNVUxUSVBMWQkoICAzIDw8IDQpCkBAIC02MzY0LDYgKzYzNjQsMTAgQEAg ZW51bSB7CiAjZGVmaW5lICAgUExBTkVfQ09MT1JfUElQRV9HQU1NQV9FTkFCTEUJCSgxIDw8IDMw KQogI2RlZmluZSAgIFBMQU5FX0NPTE9SX1BJUEVfQ1NDX0VOQUJMRQkJKDEgPDwgMjMpCiAjZGVm aW5lICAgUExBTkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJMRQkoMSA8PCAxMykKKyNkZWZpbmUg ICBQTEFORV9DT0xPUl9BTFBIQV9NQVNLCQkoMHgzIDw8IDQpCisjZGVmaW5lICAgUExBTkVfQ09M T1JfQUxQSEFfRElTQUJMRQkJKDAgPDwgNCkKKyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9T V19QUkVNVUxUSVBMWQkoMiA8PCA0KQorI2RlZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX0hXX1BS RU1VTFRJUExZCSgzIDw8IDQpCiAjZGVmaW5lIF9QTEFORV9CVUZfQ0ZHXzFfQQkJCTB4NzAyN2MK ICNkZWZpbmUgX1BMQU5FX0JVRl9DRkdfMl9BCQkJMHg3MDM3YwogI2RlZmluZSBfUExBTkVfTlYx Ml9CVUZfQ0ZHXzFfQQkJMHg3MDI3OApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCmlu ZGV4IDBlYmYzZjI4M2I4Ny4uZWQ2YTRhOGQ5MjczIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jCkBAIC0zNDMyLDIwICszNDMyLDExIEBAIHN0YXRpYyB1MzIgc2tsX3BsYW5lX2N0 bF9mb3JtYXQodWludDMyX3QgcGl4ZWxfZm9ybWF0KQogCWNhc2UgRFJNX0ZPUk1BVF9SR0I1NjU6 CiAJCXJldHVybiBQTEFORV9DVExfRk9STUFUX1JHQl81NjU7CiAJY2FzZSBEUk1fRk9STUFUX1hC R1I4ODg4OgorCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKIAkJcmV0dXJuIFBMQU5FX0NUTF9G T1JNQVRfWFJHQl84ODg4IHwgUExBTkVfQ1RMX09SREVSX1JHQlg7CiAJY2FzZSBEUk1fRk9STUFU X1hSR0I4ODg4OgotCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzg4ODg7Ci0JLyoKLQkg KiBYWFg6IEZvciBBUkJHL0FCR1IgZm9ybWF0cyB3ZSBkZWZhdWx0IHRvIGV4cGVjdGluZyBzY2Fu b3V0IGJ1ZmZlcnMKLQkgKiB0byBiZSBhbHJlYWR5IHByZS1tdWx0aXBsaWVkLiBXZSBuZWVkIHRv IGFkZCBhIGtub2IgKG9yIGEgZGlmZmVyZW50Ci0JICogRFJNX0ZPUk1BVCkgZm9yIHVzZXItc3Bh Y2UgdG8gY29uZmlndXJlIHRoYXQuCi0JICovCi0JY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4Ogot CQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzg4ODggfCBQTEFORV9DVExfT1JERVJfUkdC WCB8Ci0JCQlQTEFORV9DVExfQUxQSEFfU1dfUFJFTVVMVElQTFk7CiAJY2FzZSBEUk1fRk9STUFU X0FSR0I4ODg4OgotCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzg4ODggfAotCQkJUExB TkVfQ1RMX0FMUEhBX1NXX1BSRU1VTFRJUExZOworCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9Y UkdCXzg4ODg7CiAJY2FzZSBEUk1fRk9STUFUX1hSR0IyMTAxMDEwOgogCQlyZXR1cm4gUExBTkVf Q1RMX0ZPUk1BVF9YUkdCXzIxMDEwMTA7CiAJY2FzZSBEUk1fRk9STUFUX1hCR1IyMTAxMDEwOgpA QCAtMzQ2NSw2ICszNDU2LDMzIEBAIHN0YXRpYyB1MzIgc2tsX3BsYW5lX2N0bF9mb3JtYXQodWlu dDMyX3QgcGl4ZWxfZm9ybWF0KQogCXJldHVybiAwOwogfQogCisvKgorICogWFhYOiBGb3IgQVJC Ry9BQkdSIGZvcm1hdHMgd2UgZGVmYXVsdCB0byBleHBlY3Rpbmcgc2Nhbm91dCBidWZmZXJzCisg KiB0byBiZSBhbHJlYWR5IHByZS1tdWx0aXBsaWVkLiBXZSBuZWVkIHRvIGFkZCBhIGtub2IgKG9y IGEgZGlmZmVyZW50CisgKiBEUk1fRk9STUFUKSBmb3IgdXNlci1zcGFjZSB0byBjb25maWd1cmUg dGhhdC4KKyAqLworc3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX2FscGhhKHVpbnQzMl90IHBpeGVs X2Zvcm1hdCkKK3sKKwlzd2l0Y2ggKHBpeGVsX2Zvcm1hdCkgeworCWNhc2UgRFJNX0ZPUk1BVF9B QkdSODg4ODoKKwljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6CisJCXJldHVybiBQTEFORV9DVExf QUxQSEFfU1dfUFJFTVVMVElQTFk7CisJZGVmYXVsdDoKKwkJcmV0dXJuIFBMQU5FX0NUTF9BTFBI QV9ESVNBQkxFOworCX0KK30KKworc3RhdGljIHUzMiBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhh KHVpbnQzMl90IHBpeGVsX2Zvcm1hdCkKK3sKKwlzd2l0Y2ggKHBpeGVsX2Zvcm1hdCkgeworCWNh c2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKKwljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6CisJCXJl dHVybiBQTEFORV9DT0xPUl9BTFBIQV9TV19QUkVNVUxUSVBMWTsKKwlkZWZhdWx0OgorCQlyZXR1 cm4gUExBTkVfQ09MT1JfQUxQSEFfRElTQUJMRTsKKwl9Cit9CisKIHN0YXRpYyB1MzIgc2tsX3Bs YW5lX2N0bF90aWxpbmcodWludDY0X3QgZmJfbW9kaWZpZXIpCiB7CiAJc3dpdGNoIChmYl9tb2Rp ZmllcikgewpAQCAtMzUyMSw3ICszNTM5LDggQEAgdTMyIHNrbF9wbGFuZV9jdGwoY29uc3Qgc3Ry dWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCiAKIAlwbGFuZV9jdGwgPSBQTEFORV9D VExfRU5BQkxFOwogCi0JaWYgKCFJU19HRU1JTklMQUtFKGRldl9wcml2KSAmJiAhSVNfQ0FOTk9O TEFLRShkZXZfcHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA8IDEwICYmICFJU19H RU1JTklMQUtFKGRldl9wcml2KSkgeworCQlwbGFuZV9jdGwgfD0gc2tsX3BsYW5lX2N0bF9hbHBo YShmYi0+Zm9ybWF0LT5mb3JtYXQpOwogCQlwbGFuZV9jdGwgfD0KIAkJCVBMQU5FX0NUTF9QSVBF X0dBTU1BX0VOQUJMRSB8CiAJCQlQTEFORV9DVExfUElQRV9DU0NfRU5BQkxFIHwKQEAgLTM1NDAs NiArMzU1OSwyMCBAQCB1MzIgc2tsX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19z dGF0ZSAqY3J0Y19zdGF0ZSwKIAlyZXR1cm4gcGxhbmVfY3RsOwogfQogCit1MzIgZ2xrX3BsYW5l X2NvbG9yX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKKwkJ CWNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpCit7CisJY29uc3Qg c3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIgPSBwbGFuZV9zdGF0ZS0+YmFzZS5mYjsKKwl1MzIg cGxhbmVfY29sb3JfY3RsID0gMDsKKworCXBsYW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9Q SVBFX0dBTU1BX0VOQUJMRTsKKwlwbGFuZV9jb2xvcl9jdGwgfD0gUExBTkVfQ09MT1JfUElQRV9D U0NfRU5BQkxFOworCXBsYW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9QTEFORV9HQU1NQV9E SVNBQkxFOworCXBsYW5lX2NvbG9yX2N0bCB8PSBnbGtfcGxhbmVfY29sb3JfY3RsX2FscGhhKGZi LT5mb3JtYXQtPmZvcm1hdCk7CisKKwlyZXR1cm4gcGxhbmVfY29sb3JfY3RsOworfQorCiBzdGF0 aWMgaW50CiBfX2ludGVsX2Rpc3BsYXlfcmVzdW1lKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiAJ CSAgICAgICBzdHJ1Y3QgZHJtX2F0b21pY19zdGF0ZSAqc3RhdGUsCkBAIC04NDI2LDcgKzg0NTks NyBAQCBza3lsYWtlX2dldF9pbml0aWFsX3BsYW5lX2NvbmZpZyhzdHJ1Y3QgaW50ZWxfY3J0YyAq Y3J0YywKIHsKIAlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2ID0gY3J0Yy0+YmFzZS5kZXY7CiAJc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShkZXYpOwotCXUzMiB2YWws IGJhc2UsIG9mZnNldCwgc3RyaWRlX211bHQsIHRpbGluZzsKKwl1MzIgdmFsLCBiYXNlLCBvZmZz ZXQsIHN0cmlkZV9tdWx0LCB0aWxpbmcsIGFscGhhOwogCWludCBwaXBlID0gY3J0Yy0+cGlwZTsK IAlpbnQgZm91cmNjLCBwaXhlbF9mb3JtYXQ7CiAJdW5zaWduZWQgaW50IGFsaWduZWRfaGVpZ2h0 OwpAQCAtODQ0OCw5ICs4NDgxLDE2IEBAIHNreWxha2VfZ2V0X2luaXRpYWxfcGxhbmVfY29uZmln KHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogCQlnb3RvIGVycm9yOwogCiAJcGl4ZWxfZm9ybWF0 ID0gdmFsICYgUExBTkVfQ1RMX0ZPUk1BVF9NQVNLOworCisJaWYgKElOVEVMX0dFTihkZXZfcHJp dikgPj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpIHsKKwkJYWxwaGEgPSBJOTE1X1JF QUQoUExBTkVfQ09MT1JfQ1RMKHBpcGUsIDApKTsKKwkJYWxwaGEgJj0gUExBTkVfQ09MT1JfQUxQ SEFfTUFTSzsKKwl9IGVsc2UgeworCQlhbHBoYSA9IHZhbCAmIFBMQU5FX0NUTF9BTFBIQV9NQVNL OworCX0KKwogCWZvdXJjYyA9IHNrbF9mb3JtYXRfdG9fZm91cmNjKHBpeGVsX2Zvcm1hdCwKLQkJ CQkgICAgICB2YWwgJiBQTEFORV9DVExfT1JERVJfUkdCWCwKLQkJCQkgICAgICB2YWwgJiBQTEFO RV9DVExfQUxQSEFfTUFTSyk7CisJCQkJICAgICAgdmFsICYgUExBTkVfQ1RMX09SREVSX1JHQlgs IGFscGhhKTsKIAlmYi0+Zm9ybWF0ID0gZHJtX2Zvcm1hdF9pbmZvKGZvdXJjYyk7CiAKIAl0aWxp bmcgPSB2YWwgJiBQTEFORV9DVExfVElMRURfTUFTSzsKQEAgLTEyODUzLDYgKzEyODkzLDkgQEAg aW50ZWxfY2hlY2tfcHJpbWFyeV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQlz dGF0ZS0+Y3RsID0gaTl4eF9wbGFuZV9jdGwoY3J0Y19zdGF0ZSwgc3RhdGUpOwogCX0KIAorCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQor CQlzdGF0ZS0+Y29sb3JfY3RsID0gZ2xrX3BsYW5lX2NvbG9yX2N0bChjcnRjX3N0YXRlLCBzdGF0 ZSk7CisKIAlyZXR1cm4gMDsKIH0KIApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAppbmRleCAxMGJl Yzg3OTYyMzkuLmU5YjY2ZTBjYjY0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKQEAgLTQy NSw2ICs0MjUsOSBAQCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgewogCS8qIHBsYW5lIGNvbnRy b2wgcmVnaXN0ZXIgKi8KIAl1MzIgY3RsOwogCisJLyogcGxhbmUgY29sb3IgY29udHJvbCByZWdp c3RlciAqLworCXUzMiBjb2xvcl9jdGw7CisKIAkvKgogCSAqIHNjYWxlcl9pZAogCSAqICAgID0g LTEgOiBub3QgdXNpbmcgYSBzY2FsZXIKQEAgLTE1MDMsNiArMTUwNiw4IEBAIHN0YXRpYyBpbmxp bmUgdTMyIGludGVsX3BsYW5lX2dndHRfb2Zmc2V0KGNvbnN0IHN0cnVjdCBpbnRlbF9wbGFuZV9z dGF0ZSAqc3RhdGUpCiAJcmV0dXJuIGk5MTVfZ2d0dF9vZmZzZXQoc3RhdGUtPnZtYSk7CiB9CiAK K3UzMiBnbGtfcGxhbmVfY29sb3JfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpj cnRjX3N0YXRlLAorCQkJY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpwbGFuZV9zdGF0 ZSk7CiB1MzIgc2tsX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAqY3J0 Y19zdGF0ZSwKIAkJICBjb25zdCBzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRl KTsKIHUzMiBza2xfcGxhbmVfc3RyaWRlKGNvbnN0IHN0cnVjdCBkcm1fZnJhbWVidWZmZXIgKmZi LCBpbnQgcGxhbmUsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJp dGUuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCmluZGV4IDRmY2Y4MGNh OTFkZC4uY2U2MTU3MDQ5ODJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zcHJpdGUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9zcHJpdGUuYwpAQCAt MjYzLDEzICsyNjMsOSBAQCBza2xfdXBkYXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxh bmUsCiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmZGV2X3ByaXYtPnVuY29yZS5sb2NrLCBpcnFmbGFn cyk7CiAKLQlpZiAoSVNfR0VNSU5JTEFLRShkZXZfcHJpdikgfHwgSVNfQ0FOTk9OTEFLRShkZXZf cHJpdikpIHsKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklMQUtF KGRldl9wcml2KSkKIAkJSTkxNV9XUklURV9GVyhQTEFORV9DT0xPUl9DVEwocGlwZSwgcGxhbmVf aWQpLAotCQkJICAgICAgUExBTkVfQ09MT1JfUElQRV9HQU1NQV9FTkFCTEUgfAotCQkJICAgICAg UExBTkVfQ09MT1JfUElQRV9DU0NfRU5BQkxFIHwKLQkJCSAgICAgIFBMQU5FX0NPTE9SX1BMQU5F X0dBTU1BX0RJU0FCTEUpOwotCX0KLQorCQkJICAgICAgcGxhbmVfc3RhdGUtPmNvbG9yX2N0bCk7 CiAJaWYgKGtleS0+ZmxhZ3MpIHsKIAkJSTkxNV9XUklURV9GVyhQTEFORV9LRVlWQUwocGlwZSwg cGxhbmVfaWQpLCBrZXktPm1pbl92YWx1ZSk7CiAJCUk5MTVfV1JJVEVfRlcoUExBTkVfS0VZTUFY KHBpcGUsIHBsYW5lX2lkKSwga2V5LT5tYXhfdmFsdWUpOwpAQCAtOTc4LDYgKzk3NCw5IEBAIGlu dGVsX2NoZWNrX3Nwcml0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCQlzdGF0 ZS0+Y3RsID0gZzR4X3Nwcml0ZV9jdGwoY3J0Y19zdGF0ZSwgc3RhdGUpOwogCX0KIAorCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQorCQlz dGF0ZS0+Y29sb3JfY3RsID0gZ2xrX3BsYW5lX2NvbG9yX2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7 CisKIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9pbnRlbC1nZngK