From: James Ausmus Subject: [CI v3] drm/i915/glk: Refactor handling of PLANE_COLOR_CTL for GLK+ Date: Mon, 6 Nov 2017 15:46:32 -0800 Message-ID: <20171106234632.10844-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 mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5BD88995F for ; Mon, 6 Nov 2017 23:47:41 +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 List-Id: intel-gfx@lists.freedesktop.org U2luY2UgR0xLLCBzb21lIHBsYW5lIGNvbmZpZ3VyYXRpb24gc2V0dGluZ3MgaGF2ZSBtb3ZlZCB0 byB0aGUKUExBTkVfQ09MT1JfQ1RMIHJlZ2lzdGVyLiBSZWZhY3RvciBoYW5kbGluZyBvZiB0aGUg cmVnaXN0ZXIgdG8gd29yayBsaWtlClBMQU5FX0NUTC4gVGhpcyBhbHNvIGFsbG93cyB1cyB0byBm aXggdGhlIHNldC9yZWFkIG9mIHRoZSBwbGFuZSBBbHBoYQpNb2RlIGZvciBHTEsrLgoKdjI6IEFk anVzdCBvcmRlcmluZyBvZiBwbGF0Zm9ybSBjaGVja3MgdG8gYmUgbmV3ZXN0LT5vbGRlc3QsIGRy b3AKcmVkdW5kYW50IGNvbW1lbnQgYWJvdXQgYWxwaGEgYmxlbmRpbmcuIChWaWxsZSkKCnYzOiBN b3ZlIEFscGhhIE1vZGUgYml0cyBvdXQgb2Ygc2tsX3BsYW5lX2N0bF9mb3JtYXQgaW50bwpza2xf cGxhbmVfY3RsX2FscGhhLCBhbmQgZHJvcCBnbGtfcGxhbmVfY3RsX2Zvcm1hdCwgZHJvcCBpbml0 aWFsaXphdGlvbgpvZiBzdGF0ZS0+Y29sb3JfY3RsIG9uIHBsYXRmb3JtcyB0aGF0IGRvbid0IHVz ZSBpdCwgYW5kIGRyb3AgY29sb3JfY3RsCmxvY2FsIHZhci4gKFZpbGxlKQoKU2lnbmVkLW9mZi1i eTogSmFtZXMgQXVzbXVzIDxqYW1lcy5hdXNtdXNAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25p IDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+CkNjOiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVn LmggICAgICB8IDEyICsrKystLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5j IHwgNzEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pbnRlbF9kcnYuaCAgICAgfCAgNSArKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3Nwcml0ZS5jICB8IDExICsrKy0tLQogNCBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25z KCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3JlZy5oIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaAppbmRleCBmMGY4ZjYw NTk2NTIuLmVjZDZiMjM2ZTAwNSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC02MjYzLDcg KzYyNjMsNyBAQCBlbnVtIHsKICNkZWZpbmUgX1BMQU5FX0NUTF8yX0EJCQkJMHg3MDI4MAogI2Rl ZmluZSBfUExBTkVfQ1RMXzNfQQkJCQkweDcwMzgwCiAjZGVmaW5lICAgUExBTkVfQ1RMX0VOQUJM RQkJCSgxIDw8IDMxKQotI2RlZmluZSAgIFBMQU5FX0NUTF9QSVBFX0dBTU1BX0VOQUJMRQkJKDEg PDwgMzApCisjZGVmaW5lICAgUExBTkVfQ1RMX1BJUEVfR0FNTUFfRU5BQkxFCQkoMSA8PCAzMCkg ICAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9NQVNLCQkJKDB4ZiA8 PCAyNCkKICNkZWZpbmUgICBQTEFORV9DVExfRk9STUFUX1lVVjQyMgkJKCAgMCA8PCAyNCkKICNk ZWZpbmUgICBQTEFORV9DVExfRk9STUFUX05WMTIJCQkoICAxIDw8IDI0KQpAQCAtNjI3Myw3ICs2 MjczLDcgQEAgZW51bSB7CiAjZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9BWVVWCQkJKCAgOCA8 PCAyNCkKICNkZWZpbmUgICBQTEFORV9DVExfRk9STUFUX0lOREVYRUQJCSggMTIgPDwgMjQpCiAj ZGVmaW5lICAgUExBTkVfQ1RMX0ZPUk1BVF9SR0JfNTY1CQkoIDE0IDw8IDI0KQotI2RlZmluZSAg IFBMQU5FX0NUTF9QSVBFX0NTQ19FTkFCTEUJCSgxIDw8IDIzKQorI2RlZmluZSAgIFBMQU5FX0NU TF9QSVBFX0NTQ19FTkFCTEUJCSgxIDw8IDIzKSAvKiBQcmUtR0xLICovCiAjZGVmaW5lICAgUExB TkVfQ1RMX0tFWV9FTkFCTEVfTUFTSwkJKDB4MyA8PCAyMSkKICNkZWZpbmUgICBQTEFORV9DVExf S0VZX0VOQUJMRV9TT1VSQ0UJCSggIDEgPDwgMjEpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0tFWV9F TkFCTEVfREVTVElOQVRJT04JKCAgMiA8PCAyMSkKQEAgLTYyODYsMTMgKzYyODYsMTMgQEAgZW51 bSB7CiAjZGVmaW5lICAgUExBTkVfQ1RMX1lVVjQyMl9WWVVZCQkJKCAgMyA8PCAxNikKICNkZWZp bmUgICBQTEFORV9DVExfREVDT01QUkVTU0lPTl9FTkFCTEUJKDEgPDwgMTUpCiAjZGVmaW5lICAg UExBTkVfQ1RMX1RSSUNLTEVfRkVFRF9ESVNBQkxFCSgxIDw8IDE0KQotI2RlZmluZSAgIFBMQU5F X0NUTF9QTEFORV9HQU1NQV9ESVNBQkxFCQkoMSA8PCAxMykKKyNkZWZpbmUgICBQTEFORV9DVExf UExBTkVfR0FNTUFfRElTQUJMRQkJKDEgPDwgMTMpIC8qIFByZS1HTEsgKi8KICNkZWZpbmUgICBQ TEFORV9DVExfVElMRURfTUFTSwkJCSgweDcgPDwgMTApCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJ TEVEX0xJTkVBUgkJKCAgMCA8PCAxMCkKICNkZWZpbmUgICBQTEFORV9DVExfVElMRURfWAkJCSgg IDEgPDwgMTApCiAjZGVmaW5lICAgUExBTkVfQ1RMX1RJTEVEX1kJCQkoICA0IDw8IDEwKQogI2Rl ZmluZSAgIFBMQU5FX0NUTF9USUxFRF9ZRgkJCSggIDUgPDwgMTApCi0jZGVmaW5lICAgUExBTkVf Q1RMX0FMUEhBX01BU0sJCQkoMHgzIDw8IDQpCisjZGVmaW5lICAgUExBTkVfQ1RMX0FMUEhBX01B U0sJCQkoMHgzIDw8IDQpIC8qIFByZS1HTEsgKi8KICNkZWZpbmUgICBQTEFORV9DVExfQUxQSEFf RElTQUJMRQkJKCAgMCA8PCA0KQogI2RlZmluZSAgIFBMQU5FX0NUTF9BTFBIQV9TV19QUkVNVUxU SVBMWQkoICAyIDw8IDQpCiAjZGVmaW5lICAgUExBTkVfQ1RMX0FMUEhBX0hXX1BSRU1VTFRJUExZ CSggIDMgPDwgNCkKQEAgLTYzMzIsNiArNjMzMiwxMCBAQCBlbnVtIHsKICNkZWZpbmUgICBQTEFO RV9DT0xPUl9QSVBFX0dBTU1BX0VOQUJMRQkJKDEgPDwgMzApCiAjZGVmaW5lICAgUExBTkVfQ09M T1JfUElQRV9DU0NfRU5BQkxFCQkoMSA8PCAyMykKICNkZWZpbmUgICBQTEFORV9DT0xPUl9QTEFO RV9HQU1NQV9ESVNBQkxFCSgxIDw8IDEzKQorI2RlZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX01B U0sJCSgweDMgPDwgNCkKKyNkZWZpbmUgICBQTEFORV9DT0xPUl9BTFBIQV9ESVNBQkxFCQkoMCA8 PCA0KQorI2RlZmluZSAgIFBMQU5FX0NPTE9SX0FMUEhBX1NXX1BSRU1VTFRJUExZCSgyIDw8IDQp CisjZGVmaW5lICAgUExBTkVfQ09MT1JfQUxQSEFfSFdfUFJFTVVMVElQTFkJKDMgPDwgNCkKICNk ZWZpbmUgX1BMQU5FX0JVRl9DRkdfMV9BCQkJMHg3MDI3YwogI2RlZmluZSBfUExBTkVfQlVGX0NG R18yX0EJCQkweDcwMzdjCiAjZGVmaW5lIF9QTEFORV9OVjEyX0JVRl9DRkdfMV9BCQkweDcwMjc4 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKaW5kZXggNzM3ZGUyNTFkMGY4Li4yMTRj MGMxMTkwMDIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXku YworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMKQEAgLTM0MzYsMTcg KzM0MzYsMTAgQEAgc3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX2Zvcm1hdCh1aW50MzJfdCBwaXhl bF9mb3JtYXQpCiAJCXJldHVybiBQTEFORV9DVExfRk9STUFUX1hSR0JfODg4OCB8IFBMQU5FX0NU TF9PUkRFUl9SR0JYOwogCWNhc2UgRFJNX0ZPUk1BVF9YUkdCODg4ODoKIAkJcmV0dXJuIFBMQU5F X0NUTF9GT1JNQVRfWFJHQl84ODg4OwotCS8qCi0JICogWFhYOiBGb3IgQVJCRy9BQkdSIGZvcm1h dHMgd2UgZGVmYXVsdCB0byBleHBlY3Rpbmcgc2Nhbm91dCBidWZmZXJzCi0JICogdG8gYmUgYWxy ZWFkeSBwcmUtbXVsdGlwbGllZC4gV2UgbmVlZCB0byBhZGQgYSBrbm9iIChvciBhIGRpZmZlcmVu dAotCSAqIERSTV9GT1JNQVQpIGZvciB1c2VyLXNwYWNlIHRvIGNvbmZpZ3VyZSB0aGF0LgotCSAq LwogCWNhc2UgRFJNX0ZPUk1BVF9BQkdSODg4ODoKLQkJcmV0dXJuIFBMQU5FX0NUTF9GT1JNQVRf WFJHQl84ODg4IHwgUExBTkVfQ1RMX09SREVSX1JHQlggfAotCQkJUExBTkVfQ1RMX0FMUEhBX1NX X1BSRU1VTFRJUExZOworCQlyZXR1cm4gUExBTkVfQ1RMX0ZPUk1BVF9YUkdCXzg4ODggfCBQTEFO RV9DVExfT1JERVJfUkdCWDsKIAljYXNlIERSTV9GT1JNQVRfQVJHQjg4ODg6Ci0JCXJldHVybiBQ TEFORV9DVExfRk9STUFUX1hSR0JfODg4OCB8Ci0JCQlQTEFORV9DVExfQUxQSEFfU1dfUFJFTVVM VElQTFk7CisJCXJldHVybiBQTEFORV9DVExfRk9STUFUX1hSR0JfODg4ODsKIAljYXNlIERSTV9G T1JNQVRfWFJHQjIxMDEwMTA6CiAJCXJldHVybiBQTEFORV9DVExfRk9STUFUX1hSR0JfMjEwMTAx MDsKIAljYXNlIERSTV9GT1JNQVRfWEJHUjIxMDEwMTA6CkBAIC0zNDY2LDYgKzM0NTksMzMgQEAg c3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX2Zvcm1hdCh1aW50MzJfdCBwaXhlbF9mb3JtYXQpCiAJ cmV0dXJuIDA7CiB9CiAKKy8qCisgKiBYWFg6IEZvciBBUkJHL0FCR1IgZm9ybWF0cyB3ZSBkZWZh dWx0IHRvIGV4cGVjdGluZyBzY2Fub3V0IGJ1ZmZlcnMKKyAqIHRvIGJlIGFscmVhZHkgcHJlLW11 bHRpcGxpZWQuIFdlIG5lZWQgdG8gYWRkIGEga25vYiAob3IgYSBkaWZmZXJlbnQKKyAqIERSTV9G T1JNQVQpIGZvciB1c2VyLXNwYWNlIHRvIGNvbmZpZ3VyZSB0aGF0LgorICovCitzdGF0aWMgdTMy IHNrbF9wbGFuZV9jdGxfYWxwaGEodWludDMyX3QgcGl4ZWxfZm9ybWF0KQoreworCXN3aXRjaCAo cGl4ZWxfZm9ybWF0KSB7CisJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4OgorCWNhc2UgRFJNX0ZP Uk1BVF9BUkdCODg4ODoKKwkJcmV0dXJuIFBMQU5FX0NUTF9BTFBIQV9TV19QUkVNVUxUSVBMWTsK KwlkZWZhdWx0OgorCQlyZXR1cm4gUExBTkVfQ1RMX0FMUEhBX0RJU0FCTEU7CisJfQorfQorCitz dGF0aWMgdTMyIGdsa19wbGFuZV9jb2xvcl9jdGxfYWxwaGEodWludDMyX3QgcGl4ZWxfZm9ybWF0 KQoreworCXN3aXRjaCAocGl4ZWxfZm9ybWF0KSB7CisJY2FzZSBEUk1fRk9STUFUX0FCR1I4ODg4 OgorCWNhc2UgRFJNX0ZPUk1BVF9BUkdCODg4ODoKKwkJcmV0dXJuIFBMQU5FX0NPTE9SX0FMUEhB X1NXX1BSRU1VTFRJUExZOworCWRlZmF1bHQ6CisJCXJldHVybiBQTEFORV9DT0xPUl9BTFBIQV9E SVNBQkxFOworCX0KK30KKwogc3RhdGljIHUzMiBza2xfcGxhbmVfY3RsX3RpbGluZyh1aW50NjRf dCBmYl9tb2RpZmllcikKIHsKIAlzd2l0Y2ggKGZiX21vZGlmaWVyKSB7CkBAIC0zNTIyLDcgKzM1 NDIsOCBAQCB1MzIgc2tsX3BsYW5lX2N0bChjb25zdCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSAq Y3J0Y19zdGF0ZSwKIAogCXBsYW5lX2N0bCA9IFBMQU5FX0NUTF9FTkFCTEU7CiAKLQlpZiAoIUlT X0dFTUlOSUxBS0UoZGV2X3ByaXYpICYmICFJU19DQU5OT05MQUtFKGRldl9wcml2KSkgeworCWlm IChJTlRFTF9HRU4oZGV2X3ByaXYpIDwgMTAgJiYgIUlTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKSB7 CisJCXBsYW5lX2N0bCB8PSBza2xfcGxhbmVfY3RsX2FscGhhKGZiLT5mb3JtYXQtPmZvcm1hdCk7 CiAJCXBsYW5lX2N0bCB8PQogCQkJUExBTkVfQ1RMX1BJUEVfR0FNTUFfRU5BQkxFIHwKIAkJCVBM QU5FX0NUTF9QSVBFX0NTQ19FTkFCTEUgfApAQCAtMzU0MSw2ICszNTYyLDIwIEBAIHUzMiBza2xf cGxhbmVfY3RsKGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCXJl dHVybiBwbGFuZV9jdGw7CiB9CiAKK3UzMiBnbGtfcGxhbmVfY29sb3JfY3RsKGNvbnN0IHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAorCQkJY29uc3Qgc3RydWN0IGludGVsX3Bs YW5lX3N0YXRlICpwbGFuZV9zdGF0ZSkKK3sKKwljb25zdCBzdHJ1Y3QgZHJtX2ZyYW1lYnVmZmVy ICpmYiA9IHBsYW5lX3N0YXRlLT5iYXNlLmZiOworCXUzMiBwbGFuZV9jb2xvcl9jdGwgPSAwOwor CisJcGxhbmVfY29sb3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BJUEVfR0FNTUFfRU5BQkxFOworCXBs YW5lX2NvbG9yX2N0bCB8PSBQTEFORV9DT0xPUl9QSVBFX0NTQ19FTkFCTEU7CisJcGxhbmVfY29s b3JfY3RsIHw9IFBMQU5FX0NPTE9SX1BMQU5FX0dBTU1BX0RJU0FCTEU7CisJcGxhbmVfY29sb3Jf Y3RsIHw9IGdsa19wbGFuZV9jb2xvcl9jdGxfYWxwaGEoZmItPmZvcm1hdC0+Zm9ybWF0KTsKKwor CXJldHVybiBwbGFuZV9jb2xvcl9jdGw7Cit9CisKIHN0YXRpYyBpbnQKIF9faW50ZWxfZGlzcGxh eV9yZXN1bWUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJICAgICAgIHN0cnVjdCBkcm1fYXRv bWljX3N0YXRlICpzdGF0ZSwKQEAgLTg0MjYsNyArODQ2MSw3IEBAIHNreWxha2VfZ2V0X2luaXRp YWxfcGxhbmVfY29uZmlnKHN0cnVjdCBpbnRlbF9jcnRjICpjcnRjLAogewogCXN0cnVjdCBkcm1f ZGV2aWNlICpkZXYgPSBjcnRjLT5iYXNlLmRldjsKIAlzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAq ZGV2X3ByaXYgPSB0b19pOTE1KGRldik7Ci0JdTMyIHZhbCwgYmFzZSwgb2Zmc2V0LCBzdHJpZGVf bXVsdCwgdGlsaW5nOworCXUzMiB2YWwsIGJhc2UsIG9mZnNldCwgc3RyaWRlX211bHQsIHRpbGlu ZywgYWxwaGE7CiAJaW50IHBpcGUgPSBjcnRjLT5waXBlOwogCWludCBmb3VyY2MsIHBpeGVsX2Zv cm1hdDsKIAl1bnNpZ25lZCBpbnQgYWxpZ25lZF9oZWlnaHQ7CkBAIC04NDQ4LDkgKzg0ODMsMTYg QEAgc2t5bGFrZV9nZXRfaW5pdGlhbF9wbGFuZV9jb25maWcoc3RydWN0IGludGVsX2NydGMgKmNy dGMsCiAJCWdvdG8gZXJyb3I7CiAKIAlwaXhlbF9mb3JtYXQgPSB2YWwgJiBQTEFORV9DVExfRk9S TUFUX01BU0s7CisKKwlpZiAoSU5URUxfR0VOKGRldl9wcml2KSA+PSAxMCB8fCBJU19HRU1JTklM QUtFKGRldl9wcml2KSkgeworCQlhbHBoYSA9IEk5MTVfUkVBRChQTEFORV9DT0xPUl9DVEwocGlw ZSwgMCkpOworCQlhbHBoYSAmPSBQTEFORV9DT0xPUl9BTFBIQV9NQVNLOworCX0gZWxzZSB7CisJ CWFscGhhID0gdmFsICYgUExBTkVfQ1RMX0FMUEhBX01BU0s7CisJfQorCiAJZm91cmNjID0gc2ts X2Zvcm1hdF90b19mb3VyY2MocGl4ZWxfZm9ybWF0LAotCQkJCSAgICAgIHZhbCAmIFBMQU5FX0NU TF9PUkRFUl9SR0JYLAotCQkJCSAgICAgIHZhbCAmIFBMQU5FX0NUTF9BTFBIQV9NQVNLKTsKKwkJ CQkgICAgICB2YWwgJiBQTEFORV9DVExfT1JERVJfUkdCWCwgYWxwaGEpOwogCWZiLT5mb3JtYXQg PSBkcm1fZm9ybWF0X2luZm8oZm91cmNjKTsKIAogCXRpbGluZyA9IHZhbCAmIFBMQU5FX0NUTF9U SUxFRF9NQVNLOwpAQCAtMTI4MzEsNiArMTI4NzMsOSBAQCBpbnRlbF9jaGVja19wcmltYXJ5X3Bs YW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCXN0YXRlLT5jdGwgPSBpOXh4X3BsYW5l X2N0bChjcnRjX3N0YXRlLCBzdGF0ZSk7CiAJfQogCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikg Pj0gMTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCXN0YXRlLT5jb2xvcl9jdGwgPSBn bGtfcGxhbmVfY29sb3JfY3RsKGNydGNfc3RhdGUsIHN0YXRlKTsKKwogCXJldHVybiAwOwogfQog CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCmluZGV4IDAwYjQ4ODY4ODA0Mi4uOTJiYzEzMjU3MDFi IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAorKysgYi9kcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaApAQCAtNDI1LDYgKzQyNSw5IEBAIHN0cnVjdCBp bnRlbF9wbGFuZV9zdGF0ZSB7CiAJLyogcGxhbmUgY29udHJvbCByZWdpc3RlciAqLwogCXUzMiBj dGw7CiAKKwkvKiBwbGFuZSBjb2xvciBjb250cm9sIHJlZ2lzdGVyICovCisJdTMyIGNvbG9yX2N0 bDsKKwogCS8qCiAJICogc2NhbGVyX2lkCiAJICogICAgPSAtMSA6IG5vdCB1c2luZyBhIHNjYWxl cgpAQCAtMTUwNCw2ICsxNTA3LDggQEAgc3RhdGljIGlubGluZSB1MzIgaW50ZWxfcGxhbmVfZ2d0 dF9vZmZzZXQoY29uc3Qgc3RydWN0IGludGVsX3BsYW5lX3N0YXRlICpzdGF0ZSkKIAlyZXR1cm4g aTkxNV9nZ3R0X29mZnNldChzdGF0ZS0+dm1hKTsKIH0KIAordTMyIGdsa19wbGFuZV9jb2xvcl9j dGwoY29uc3Qgc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCisJCQljb25zdCBz dHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlKTsKIHUzMiBza2xfcGxhbmVfY3Rs KGNvbnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRlLAogCQkgIGNvbnN0IHN0 cnVjdCBpbnRlbF9wbGFuZV9zdGF0ZSAqcGxhbmVfc3RhdGUpOwogdTMyIHNrbF9wbGFuZV9zdHJp ZGUoY29uc3Qgc3RydWN0IGRybV9mcmFtZWJ1ZmZlciAqZmIsIGludCBwbGFuZSwKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggNGZjZjgwY2E5MWRkLi5jZTYxNTcwNDk4MmEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC0yNjMsMTMgKzI2Myw5IEBAIHNrbF91 cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwKIAogCXNwaW5fbG9ja19pcnFz YXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAotCWlmIChJU19HRU1JTklM QUtFKGRldl9wcml2KSB8fCBJU19DQU5OT05MQUtFKGRldl9wcml2KSkgeworCWlmIChJTlRFTF9H RU4oZGV2X3ByaXYpID49IDEwIHx8IElTX0dFTUlOSUxBS0UoZGV2X3ByaXYpKQogCQlJOTE1X1dS SVRFX0ZXKFBMQU5FX0NPTE9SX0NUTChwaXBlLCBwbGFuZV9pZCksCi0JCQkgICAgICBQTEFORV9D T0xPUl9QSVBFX0dBTU1BX0VOQUJMRSB8Ci0JCQkgICAgICBQTEFORV9DT0xPUl9QSVBFX0NTQ19F TkFCTEUgfAotCQkJICAgICAgUExBTkVfQ09MT1JfUExBTkVfR0FNTUFfRElTQUJMRSk7Ci0JfQot CisJCQkgICAgICBwbGFuZV9zdGF0ZS0+Y29sb3JfY3RsKTsKIAlpZiAoa2V5LT5mbGFncykgewog CQlJOTE1X1dSSVRFX0ZXKFBMQU5FX0tFWVZBTChwaXBlLCBwbGFuZV9pZCksIGtleS0+bWluX3Zh bHVlKTsKIAkJSTkxNV9XUklURV9GVyhQTEFORV9LRVlNQVgocGlwZSwgcGxhbmVfaWQpLCBrZXkt Pm1heF92YWx1ZSk7CkBAIC05NzgsNiArOTc0LDkgQEAgaW50ZWxfY2hlY2tfc3ByaXRlX3BsYW5l KHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJCXN0YXRlLT5jdGwgPSBnNHhfc3ByaXRlX2N0 bChjcnRjX3N0YXRlLCBzdGF0ZSk7CiAJfQogCisJaWYgKElOVEVMX0dFTihkZXZfcHJpdikgPj0g MTAgfHwgSVNfR0VNSU5JTEFLRShkZXZfcHJpdikpCisJCXN0YXRlLT5jb2xvcl9jdGwgPSBnbGtf cGxhbmVfY29sb3JfY3RsKGNydGNfc3RhdGUsIHN0YXRlKTsKKwogCXJldHVybiAwOwogfQogCi0t IAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=