From: Ville Syrjala Subject: [PATCH 5/5] drm/i915: Implement dst colorkeying for VLV/CHV sprites Date: Tue, 29 May 2018 21:28:04 +0300 Message-ID: <20180529182804.8571-5-ville.syrjala@linux.intel.com> References: <20180529182804.8571-1-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B5DA6E513 for ; Tue, 29 May 2018 18:28:20 +0000 (UTC) In-Reply-To: <20180529182804.8571-1-ville.syrjala@linux.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 RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCk9u IFZMVi9DSFYgd2UgY2FuIHVzZSB0aGUgInNyYyBrZXkgd2luZG93IiBiaXQgb24gdGhlIHByaW1h cnkgcGxhbmUgdG8KaW1wbGVtbnQgc3ByaXRlIGRzdCBjb2xvcmtleWluZy4gVGhpcyBpcyBleGFj dGx5IHRoZSBzYW1lIG1lY2hhbmlzbSB0aGF0CndvdWxkIGJlIHVzZWQgb24gZ2VuMi00IGZvciBz cHJpdGUgQyBkc3QgY29sb3JrZXlpbmcgYXMgd2VsbC4KClRoZSBzbGlnaHQgY29tcGxpY2F0aW9u IHdpdGggdGhpcyBhcHByb2FjaCBpcyB0aGF0IHdlIGhhdmUgdG8gYWRqdXN0IHRoZQp6cG9zIG9m IHRoZSBwbGFuZXMgc2luY2Ugd2UncmUgc3RpbGwgdGVjaG5pY2FsbHkgZG9pbmcgc3JjIGNvbG9y IGtleWluZwpvbiB0aGUgcHJpbWFyeSwgaGVuY2UgdGhlIHByaW1hcnkgbXVzdCBzaXQgYWJvdmUg dGhlIHNwcml0ZXMuIEJ1dCBzaW5jZQp3ZSBub3cgaGF2ZSB3b3JraW5nIHpwb3MgY29udHJvbHMg b24gVkxWL0NIViB3ZSBjYW4gZG8gdGhpcyBwcmV0dHkKZWFzaWx5LgoKV29ya2luZyBkc3QgY29s b3JrZXlpbmcgbWFrZXMgZm9yIGEgbXVjaCBuaWNlciBzcHJpdGUgWHYgZXhwZXJpZW5jZS4KClNp Z25lZC1vZmYtYnk6IFZpbGxlIFN5cmrDpGzDpCA8dmlsbGUuc3lyamFsYUBsaW51eC5pbnRlbC5j b20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9yZWcuaCAgICAgICAgICAgfCAgOSAr KystCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9hdG9taWNfcGxhbmUuYyB8ICAzICsrCiBk cml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmMgICAgICB8IDg5ICsrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oICAg ICAgICAgIHwgIDMgKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jICAgICAg IHwgMjEgKysrKystLS0KIDUgZmlsZXMgY2hhbmdlZCwgMTEzIGluc2VydGlvbnMoKyksIDEyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCmluZGV4IDQ0ZWFjNWZmYzJjZS4uMDdl Yzk1OTA2ODY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKQEAgLTYwMDAsOCArNjAwMCw4IEBA IGVudW0gewogI2RlZmluZSAgIERJU1BQTEFORV9TRUxfUElQRV9TSElGVAkJMjQKICNkZWZpbmUg ICBESVNQUExBTkVfU0VMX1BJUEVfTUFTSwkJKDM8PERJU1BQTEFORV9TRUxfUElQRV9TSElGVCkK ICNkZWZpbmUgICBESVNQUExBTkVfU0VMX1BJUEUocGlwZSkJCSgocGlwZSk8PERJU1BQTEFORV9T RUxfUElQRV9TSElGVCkKKyNkZWZpbmUgICBESVNQUExBTkVfU1JDX0tFWV9XSU5ET1dfRU5BQkxF CSgxPDwyMykgLyogcGxhbmVzIEEvQiAqLwogI2RlZmluZSAgIERJU1BQTEFORV9TUkNfS0VZX0VO QUJMRQkJKDE8PDIyKQotI2RlZmluZSAgIERJU1BQTEFORV9TUkNfS0VZX0RJU0FCTEUJCTAKICNk ZWZpbmUgICBESVNQUExBTkVfTElORV9ET1VCTEUJCQkoMTw8MjApCiAjZGVmaW5lICAgRElTUFBM QU5FX05PX0xJTkVfRE9VQkxFCQkwCiAjZGVmaW5lICAgRElTUFBMQU5FX1NURVJFT19QT0xBUklU WV9GSVJTVAkwCkBAIC02MDE0LDggKzYwMTQsMTIgQEAgZW51bSB7CiAjZGVmaW5lIF9EU1BBQURE UgkJCQkweDcwMTg0CiAjZGVmaW5lIF9EU1BBU1RSSURFCQkJCTB4NzAxODgKICNkZWZpbmUgX0RT UEFQT1MJCQkJMHg3MDE4QyAvKiByZXNlcnZlZCAqLworI2RlZmluZSBfRFNQQUtFWVZBTAkJCQkw eDcwMTk0IC8qIHBsYW5lcyBBL0IgKi8KKyNkZWZpbmUgX0RTUEFNSU5LRVlWQUwJCQkJMHg3MDE5 NCAvKiBwbGFuZSBDICovCisjZGVmaW5lIF9EU1BBS0VZTVNLCQkJCTB4NzAxOTgKICNkZWZpbmUg X0RTUEFTSVpFCQkJCTB4NzAxOTAKICNkZWZpbmUgX0RTUEFTVVJGCQkJCTB4NzAxOUMgLyogOTY1 KyBvbmx5ICovCisjZGVmaW5lIF9EU1BBTUFYS0VZVkFMCQkJCTB4NzAxQTAgLyogcGxhbmUgQyAq LwogI2RlZmluZSBfRFNQQVRJTEVPRkYJCQkJMHg3MDFBNCAvKiA5NjUrIG9ubHkgKi8KICNkZWZp bmUgX0RTUEFPRkZTRVQJCQkJMHg3MDFBNCAvKiBIU1cgKi8KICNkZWZpbmUgX0RTUEFTVVJGTElW RQkJCQkweDcwMUFDCkBAIC02MDI0LDYgKzYwMjgsOSBAQCBlbnVtIHsKICNkZWZpbmUgRFNQQURE UihwbGFuZSkJCV9NTUlPX1BJUEUyKHBsYW5lLCBfRFNQQUFERFIpCiAjZGVmaW5lIERTUFNUUklE RShwbGFuZSkJX01NSU9fUElQRTIocGxhbmUsIF9EU1BBU1RSSURFKQogI2RlZmluZSBEU1BQT1Mo cGxhbmUpCQlfTU1JT19QSVBFMihwbGFuZSwgX0RTUEFQT1MpCisjZGVmaW5lIERTUEtFWVZBTChw bGFuZSkJX01NSU9fUElQRTIocGxhbmUsIF9EU1BBS0VZVkFMKQorI2RlZmluZSBEU1BNSU5LRVlW QUwocGxhbmUpCV9NTUlPX1BJUEUyKHBsYW5lLCBfRFNQQU1JTktFWVZBTCkKKyNkZWZpbmUgRFNQ S0VZTVNLKHBsYW5lKQlfTU1JT19QSVBFMihwbGFuZSwgX0RTUEFLRVlNU0spCiAjZGVmaW5lIERT UFNJWkUocGxhbmUpCQlfTU1JT19QSVBFMihwbGFuZSwgX0RTUEFTSVpFKQogI2RlZmluZSBEU1BT VVJGKHBsYW5lKQkJX01NSU9fUElQRTIocGxhbmUsIF9EU1BBU1VSRikKICNkZWZpbmUgRFNQVElM RU9GRihwbGFuZSkJX01NSU9fUElQRTIocGxhbmUsIF9EU1BBVElMRU9GRikKZGlmZiAtLWdpdCBh L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jIGIvZHJpdmVycy9ncHUv ZHJtL2k5MTUvaW50ZWxfYXRvbWljX3BsYW5lLmMKaW5kZXggYTVhMzEyMzU4OWU3Li5iMjlhZThj ZGVkMDYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2F0b21pY19wbGFuZS5jCkBAIC0y MDAsNiArMjAwLDkgQEAgaW50IGludGVsX3BsYW5lX2F0b21pY19jaGVja193aXRoX3N0YXRlKGNv bnN0IHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpvbGRfY3J0Y18KIAkgKi8KIAljcnRjX3N0YXRl LT5yYXdfenBvc1tpbnRlbF9wbGFuZS0+aWRdID0KIAkJaW50ZWxfcGxhbmVfcmF3X3pwb3MoY3J0 Y19zdGF0ZSwgaW50ZWxfc3RhdGUpOworCWNydGNfc3RhdGUtPnJhd19kc3RfY29sb3JrZXlbaW50 ZWxfcGxhbmUtPmlkXSA9CisJCWludGVsX3N0YXRlLT5iYXNlLnZpc2libGUgJiYKKwkJaW50ZWxf c3RhdGUtPmNrZXkuZmxhZ3MgJiBJOTE1X1NFVF9DT0xPUktFWV9ERVNUSU5BVElPTjsKIAogCXJl dHVybiBpbnRlbF9wbGFuZV9hdG9taWNfY2FsY19jaGFuZ2VzKG9sZF9jcnRjX3N0YXRlLAogCQkJ CQkgICAgICAgJmNydGNfc3RhdGUtPmJhc2UsCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kaXNwbGF5LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5 LmMKaW5kZXggMTExY2IwYzFkYTU0Li5iOWE4NWJmZTVkNjkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p bnRlbF9kaXNwbGF5LmMKQEAgLTMzMTQsNiArMzMxNCw3IEBAIHN0YXRpYyB2b2lkIGk5eHhfdXBk YXRlX3BsYW5lKHN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUsCiAJc3RydWN0IGRybV9pOTE1X3By aXZhdGUgKmRldl9wcml2ID0gdG9faTkxNShwbGFuZS0+YmFzZS5kZXYpOwogCWNvbnN0IHN0cnVj dCBkcm1fZnJhbWVidWZmZXIgKmZiID0gcGxhbmVfc3RhdGUtPmJhc2UuZmI7CiAJZW51bSBpOXh4 X3BsYW5lX2lkIGk5eHhfcGxhbmUgPSBwbGFuZS0+aTl4eF9wbGFuZTsKKwljb25zdCBzdHJ1Y3Qg ZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqa2V5ID0gJnBsYW5lX3N0YXRlLT5ja2V5OwogCXUz MiBsaW5lYXJfb2Zmc2V0OwogCXUzMiBkc3BjbnRyID0gcGxhbmVfc3RhdGUtPmN0bDsKIAlpOTE1 X3JlZ190IHJlZyA9IERTUENOVFIoaTl4eF9wbGFuZSk7CkBAIC0zMzI5LDggKzMzMzAsMTcgQEAg c3RhdGljIHZvaWQgaTl4eF91cGRhdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFuZSwK IAllbHNlCiAJCWRzcGFkZHJfb2Zmc2V0ID0gbGluZWFyX29mZnNldDsKIAorCWlmIChjcnRjX3N0 YXRlLT5kc3RfY29sb3JrZXlbcGxhbmUtPmlkXSkKKwkJZHNwY250ciB8PSBESVNQUExBTkVfU1JD X0tFWV9FTkFCTEUgfAorCQkJRElTUFBMQU5FX1NSQ19LRVlfV0lORE9XX0VOQUJMRTsKKwogCXNw aW5fbG9ja19pcnFzYXZlKCZkZXZfcHJpdi0+dW5jb3JlLmxvY2ssIGlycWZsYWdzKTsKIAorCWlm IChjcnRjX3N0YXRlLT5kc3RfY29sb3JrZXlbcGxhbmUtPmlkXSkgeworCQlJOTE1X1dSSVRFX0ZX KERTUEtFWVZBTChpOXh4X3BsYW5lKSwga2V5LT5taW5fdmFsdWUpOworCQlJOTE1X1dSSVRFX0ZX KERTUEtFWU1TSyhpOXh4X3BsYW5lKSwga2V5LT5jaGFubmVsX21hc2spOworCX0KKwogCWlmIChJ TlRFTF9HRU4oZGV2X3ByaXYpIDwgNCkgewogCQkvKiBwaXBlc3JjIGFuZCBkc3BzaXplIGNvbnRy b2wgdGhlIHNpemUgdGhhdCBpcyBzY2FsZWQgZnJvbSwKIAkJICogd2hpY2ggc2hvdWxkIGFsd2F5 cyBiZSB0aGUgdXNlcidzIHJlcXVlc3RlZCBzaXplLgpAQCAtMTA5MzYsNiArMTA5NDYsNyBAQCBj bGVhcl9pbnRlbF9jcnRjX3N0YXRlKHN0cnVjdCBpbnRlbF9jcnRjX3N0YXRlICpjcnRjX3N0YXRl KQogCXN0cnVjdCBpbnRlbF9zaGFyZWRfZHBsbCAqc2hhcmVkX2RwbGw7CiAJc3RydWN0IGludGVs X2NydGNfd21fc3RhdGUgd21fc3RhdGU7CiAJdTggcmF3X3pwb3NbSTkxNV9NQVhfUExBTkVTXTsK Kwl1OCByYXdfZHN0X2NvbG9ya2V5W0k5MTVfTUFYX1BMQU5FU107CiAJYm9vbCBmb3JjZV90aHJ1 LCBpcHNfZm9yY2VfZGlzYWJsZTsKIAogCS8qIEZJWE1FOiBiZWZvcmUgdGhlIHN3aXRjaCB0byBh dG9taWMgc3RhcnRlZCwgYSBuZXcgcGlwZV9jb25maWcgd2FzCkBAIC0xMDk1Miw2ICsxMDk2Myw3 IEBAIGNsZWFyX2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNf c3RhdGUpCiAJICAgIElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2 X3ByaXYpKQogCQl3bV9zdGF0ZSA9IGNydGNfc3RhdGUtPndtOwogCW1lbWNweShyYXdfenBvcywg Y3J0Y19zdGF0ZS0+cmF3X3pwb3MsIHNpemVvZihyYXdfenBvcykpOworCW1lbWNweShyYXdfZHN0 X2NvbG9ya2V5LCBjcnRjX3N0YXRlLT5yYXdfZHN0X2NvbG9ya2V5LCBzaXplb2YocmF3X2RzdF9j b2xvcmtleSkpOwogCiAJLyogS2VlcCBiYXNlIGRybV9jcnRjX3N0YXRlIGludGFjdCwgb25seSBj bGVhciBvdXIgZXh0ZW5kZWQgc3RydWN0ICovCiAJQlVJTERfQlVHX09OKG9mZnNldG9mKHN0cnVj dCBpbnRlbF9jcnRjX3N0YXRlLCBiYXNlKSk7CkBAIC0xMDk2Nyw2ICsxMDk3OSw3IEBAIGNsZWFy X2ludGVsX2NydGNfc3RhdGUoc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJ ICAgIElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKQog CQljcnRjX3N0YXRlLT53bSA9IHdtX3N0YXRlOwogCW1lbWNweShjcnRjX3N0YXRlLT5yYXdfenBv cywgcmF3X3pwb3MsIHNpemVvZihyYXdfenBvcykpOworCW1lbWNweShjcnRjX3N0YXRlLT5yYXdf ZHN0X2NvbG9ya2V5LCByYXdfZHN0X2NvbG9ya2V5LCBzaXplb2YocmF3X2RzdF9jb2xvcmtleSkp OwogfQogCiBzdGF0aWMgaW50CkBAIC0xMjI0Miw2ICsxMjI1NSw1NSBAQCBzdGF0aWMgdm9pZCB2 bHZfbm9ybWFsaXplX3pwb3Moc3RydWN0IGludGVsX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCiAJ fQogfQogCitzdGF0aWMgaW50IHZsdl9maXh1cF9jb2xvcmtleV96cG9zKHN0cnVjdCBpbnRlbF9j cnRjX3N0YXRlICpjcnRjX3N0YXRlKQoreworCS8qIGRpc2FibGUgZHN0IGNvbG9ya2V5IGlmIHRo ZSBwcmltYXJ5IGlzIGFib3ZlIHRoZSBzcHJpdGUgKi8KKwljcnRjX3N0YXRlLT5kc3RfY29sb3Jr ZXlbUExBTkVfU1BSSVRFMF0gPQorCQljcnRjX3N0YXRlLT5yYXdfZHN0X2NvbG9ya2V5W1BMQU5F X1NQUklURTBdICYmCisJCWNydGNfc3RhdGUtPnpwb3NbUExBTkVfU1BSSVRFMF0gPiBjcnRjX3N0 YXRlLT56cG9zW1BMQU5FX1BSSU1BUlldOworCisJY3J0Y19zdGF0ZS0+ZHN0X2NvbG9ya2V5W1BM QU5FX1NQUklURTFdID0KKwkJY3J0Y19zdGF0ZS0+cmF3X2RzdF9jb2xvcmtleVtQTEFORV9TUFJJ VEUxXSAmJgorCQljcnRjX3N0YXRlLT56cG9zW1BMQU5FX1NQUklURTFdID4gY3J0Y19zdGF0ZS0+ enBvc1tQTEFORV9QUklNQVJZXTsKKworCS8qIGxpZnQgdGhlIHByaW1hcnkgYWJvdmUgdGhlIHNw cml0ZXMgdGhhdCBoYXZlIGRzdCBjb2xvcmtleSBlbmFibGVkICovCisJaWYgKGNydGNfc3RhdGUt PmRzdF9jb2xvcmtleVtQTEFORV9TUFJJVEUwXSAmJgorCSAgICBjcnRjX3N0YXRlLT5kc3RfY29s b3JrZXlbUExBTkVfU1BSSVRFMV0pIHsKKwkJLyoKKwkJICogRklYTUUgc2hvdWxkIG1ha2Ugc3Vy ZSBib3RoIHBsYW5lcyBoYXZlCisJCSAqIHRoZSBzYW1lIGRzdCBjb2xvcmtleSB2YWx1ZSttYXNr LgorCQkgKi8KKwkJY3J0Y19zdGF0ZS0+enBvc1tQTEFORV9TUFJJVEUwXS0tOworCQljcnRjX3N0 YXRlLT56cG9zW1BMQU5FX1NQUklURTFdLS07CisJCWNydGNfc3RhdGUtPnpwb3NbUExBTkVfUFJJ TUFSWV0gPSAyOworCX0gZWxzZSBpZiAoY3J0Y19zdGF0ZS0+ZHN0X2NvbG9ya2V5W1BMQU5FX1NQ UklURTBdKSB7CisJCWlmIChjcnRjX3N0YXRlLT56cG9zW1BMQU5FX1NQUklURTFdIDwKKwkJICAg IGNydGNfc3RhdGUtPnpwb3NbUExBTkVfU1BSSVRFMF0pIHsKKwkJCURSTV9ERUJVR19LTVMoIlNw cml0ZSAwIGRzdCBjb2xvcmtleSBjb25mbGljdHMgd2l0aCB6cG9zXG4iKTsKKwkJCXJldHVybiAt RUlOVkFMOworCQl9CisKKwkJc3dhcChjcnRjX3N0YXRlLT56cG9zW1BMQU5FX1BSSU1BUlldLAor CQkgICAgIGNydGNfc3RhdGUtPnpwb3NbUExBTkVfU1BSSVRFMF0pOworCX0gZWxzZSBpZiAoY3J0 Y19zdGF0ZS0+ZHN0X2NvbG9ya2V5W1BMQU5FX1NQUklURTFdKSB7CisJCWlmIChjcnRjX3N0YXRl LT56cG9zW1BMQU5FX1NQUklURTBdIDwKKwkJICAgIGNydGNfc3RhdGUtPnpwb3NbUExBTkVfU1BS SVRFMV0pIHsKKwkJCURSTV9ERUJVR19LTVMoIlNwcml0ZSAxIGRzdCBjb2xvcmtleSBjb25mbGlj dHMgd2l0aCB6cG9zXG4iKTsKKwkJCXJldHVybiAtRUlOVkFMOworCQl9CisKKwkJc3dhcChjcnRj X3N0YXRlLT56cG9zW1BMQU5FX1BSSU1BUlldLAorCQkgICAgIGNydGNfc3RhdGUtPnpwb3NbUExB TkVfU1BSSVRFMV0pOworCX0KKworCS8qIGVuYWJsZSB0aGUgZHN0IGNvbG9ya2V5IG9uIHRoZSBw cmltYXJ5IGlmIGVpdGhlciBzcHJpdGUgbmVlZHMgaXQgKi8KKwljcnRjX3N0YXRlLT5kc3RfY29s b3JrZXlbUExBTkVfUFJJTUFSWV0gPQorCQljcnRjX3N0YXRlLT5kc3RfY29sb3JrZXlbUExBTkVf U1BSSVRFMF0gfHwKKwkJY3J0Y19zdGF0ZS0+ZHN0X2NvbG9ya2V5W1BMQU5FX1NQUklURTFdOwor CisJcmV0dXJuIDA7Cit9CisKIHN0YXRpYyBpbnQgdmx2X3VwZGF0ZV96cG9zKHN0cnVjdCBkcm1f aTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCSAgIHN0cnVjdCBpbnRlbF9hdG9taWNfc3RhdGUg KnN0YXRlKQogewpAQCAtMTIyNTEsMTYgKzEyMzEzLDI2IEBAIHN0YXRpYyBpbnQgdmx2X3VwZGF0 ZV96cG9zKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAogCWZvcl9lYWNoX29s ZG5ld19pbnRlbF9jcnRjX2luX3N0YXRlKHN0YXRlLCBjcnRjLCBvbGRfY3J0Y19zdGF0ZSwgbmV3 X2NydGNfc3RhdGUsIGkpIHsKIAkJc3RydWN0IGRybV9wbGFuZSAqcGxhbmU7CisJCWJvb2wgcHJp bWFyeV9jaGFuZ2VkOwogCQlib29sIHNwcml0ZXNfY2hhbmdlZDsKKwkJaW50IHJldDsKIAogCQl2 bHZfbm9ybWFsaXplX3pwb3MobmV3X2NydGNfc3RhdGUpOwogCisJCXJldCA9IHZsdl9maXh1cF9j b2xvcmtleV96cG9zKG5ld19jcnRjX3N0YXRlKTsKKwkJaWYgKHJldCkKKwkJCXJldHVybiByZXQ7 CisKKwkJcHJpbWFyeV9jaGFuZ2VkID0KKwkJCW5ld19jcnRjX3N0YXRlLT5kc3RfY29sb3JrZXlb UExBTkVfUFJJTUFSWV0gIT0KKwkJCW9sZF9jcnRjX3N0YXRlLT5kc3RfY29sb3JrZXlbUExBTkVf UFJJTUFSWV07CisKIAkJc3ByaXRlc19jaGFuZ2VkID0KIAkJCW1lbWNtcChuZXdfY3J0Y19zdGF0 ZS0+enBvcywKIAkJCSAgICAgICBvbGRfY3J0Y19zdGF0ZS0+enBvcywKIAkJCSAgICAgICBzaXpl b2YobmV3X2NydGNfc3RhdGUtPnpwb3MpKSAhPSAwOwogCi0JCWlmICghc3ByaXRlc19jaGFuZ2Vk KQorCQlpZiAoIXByaW1hcnlfY2hhbmdlZCAmJiAhc3ByaXRlc19jaGFuZ2VkKQogCQkJY29udGlu dWU7CiAKIAkJZHJtX2Zvcl9lYWNoX3BsYW5lX21hc2socGxhbmUsICZkZXZfcHJpdi0+ZHJtLApA QCAtMTIyNjgsMTQgKzEyMzQwLDIzIEBAIHN0YXRpYyBpbnQgdmx2X3VwZGF0ZV96cG9zKHN0cnVj dCBkcm1faTkxNV9wcml2YXRlICpkZXZfcHJpdiwKIAkJCXN0cnVjdCBkcm1fcGxhbmVfc3RhdGUg KnBsYW5lX3N0YXRlOwogCQkJZW51bSBwbGFuZV9pZCBwbGFuZV9pZCA9IHRvX2ludGVsX3BsYW5l KHBsYW5lKS0+aWQ7CiAKLQkJCWlmIChwbGFuZV9pZCA9PSBQTEFORV9DVVJTT1IgfHwKLQkJCSAg ICBwbGFuZV9pZCA9PSBQTEFORV9QUklNQVJZKQorCQkJaWYgKHBsYW5lX2lkID09IFBMQU5FX0NV UlNPUikKIAkJCQljb250aW51ZTsKIAorCQkJaWYgKHBsYW5lX2lkID09IFBMQU5FX1BSSU1BUlkp IHsKKwkJCQlpZiAoIXByaW1hcnlfY2hhbmdlZCkKKwkJCQkJY29udGludWU7CisJCQl9IGVsc2Ug eworCQkJCWlmICghc3ByaXRlc19jaGFuZ2VkKQorCQkJCQljb250aW51ZTsKKwkJCX0KKwogCQkJ LyoKIAkJCSAqIHpwb3MgaXMgY29uZmlndXJlZCB2aWEgc3ByaXRlIHJlZ2lzdGVycywgc28gbXVz dAogCQkJICogYWRkIHRoZW0gdG8gdGhlIHN0YXRlIGlmIGFueXRoaW5nIHNpZ25pZmljYW50Ci0J CQkgKiBjaGFuZ2VkLgorCQkJICogY2hhbmdlZC4gZHN0IGNvbG9ya2V5aW5nIGlzIGNvbmZpZ3Vy ZWQgdmlhIHRoZSBwcmltYXJ5CisJCQkgKiBwbGFuZSByZWdpc3RlcnMsIHNvIHNpbWlsYXJseSB3 ZSBtYXkgbmVlZCB0byByZWNvbmZpZ3VyZQorCQkJICogaXQgYXMgd2VsbC4KIAkJCSAqLwogCQkJ cGxhbmVfc3RhdGUgPSBkcm1fYXRvbWljX2dldF9wbGFuZV9zdGF0ZSgmc3RhdGUtPmJhc2UsIHBs YW5lKTsKIAkJCWlmIChJU19FUlIocGxhbmVfc3RhdGUpKQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYu aAppbmRleCA5OTRiOTQ3M2I4MTcuLjQxNWU4YWMwYjZlNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZHJ2LmgKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZHJ2LmgKQEAgLTg5NCw2ICs4OTQsOSBAQCBzdHJ1Y3QgaW50ZWxfY3J0Y19zdGF0ZSB7CiAJdTgg cmF3X3pwb3NbSTkxNV9NQVhfUExBTkVTXTsgLyogcmF3IHByb3BlcnR5IHZhbHVlIChvciAweGZm IGZvciBkaXNhYmxlZCBwbGFuZXMpICovCiAJdTggenBvc1tJOTE1X01BWF9QTEFORVNdOyAvKiBm aW5hbCB6cG9zIGZvciBlYWNoIHBsYW5lICovCiAKKwl1OCByYXdfZHN0X2NvbG9ya2V5W0k5MTVf TUFYX1BMQU5FU107IC8qIGRzdCBjb2xvcmtleSB5ZXMvbm8/ICovCisJdTggZHN0X2NvbG9ya2V5 W0k5MTVfTUFYX1BMQU5FU107IC8qIGRzdCBjb2xvcmtleSB5ZXMvbm8/ICovCisKIAkvKiBIRE1J IHNjcmFtYmxpbmcgc3RhdHVzICovCiAJYm9vbCBoZG1pX3NjcmFtYmxpbmc7CiAKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jIGIvZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfc3ByaXRlLmMKaW5kZXggMjI4ZWJhNTgyZDQ0Li4yMWUzNzlhYjM3Y2UgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2ludGVsX3Nwcml0ZS5jCkBAIC01NjQsNyArNTY0LDcgQEAgdmx2X3Vw ZGF0ZV9wbGFuZShzdHJ1Y3QgaW50ZWxfcGxhbmUgKnBsYW5lLAogCWlmIChJU19DSEVSUllWSUVX KGRldl9wcml2KSAmJiBwaXBlID09IFBJUEVfQikKIAkJY2h2X3VwZGF0ZV9jc2MocGxhbmVfc3Rh dGUpOwogCi0JaWYgKGtleS0+ZmxhZ3MpIHsKKwlpZiAoa2V5LT5mbGFncyAmIEk5MTVfU0VUX0NP TE9SS0VZX1NPVVJDRSkgewogCQlJOTE1X1dSSVRFX0ZXKFNQS0VZTUlOVkFMKHBpcGUsIHBsYW5l X2lkKSwga2V5LT5taW5fdmFsdWUpOwogCQlJOTE1X1dSSVRFX0ZXKFNQS0VZTUFYVkFMKHBpcGUs IHBsYW5lX2lkKSwga2V5LT5tYXhfdmFsdWUpOwogCQlJOTE1X1dSSVRFX0ZXKFNQS0VZTVNLKHBp cGUsIHBsYW5lX2lkKSwga2V5LT5jaGFubmVsX21hc2sgPj4gMjQpOwpAQCAtMTA5MiwxMyArMTA5 MiwxNSBAQCBpbnRlbF9jaGVja19zcHJpdGVfcGxhbmUoc3RydWN0IGludGVsX3BsYW5lICpwbGFu ZSwKIAogc3RhdGljIGJvb2wgaGFzX2RzdF9rZXlfaW5fcHJpbWFyeV9wbGFuZShzdHJ1Y3QgZHJt X2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpCiB7Ci0JcmV0dXJuIElOVEVMX0dFTihkZXZfcHJpdikg Pj0gOTsKKwlyZXR1cm4gSU5URUxfR0VOKGRldl9wcml2KSA+PSA5IHx8CisJCUlTX0NIRVJSWVZJ RVcoZGV2X3ByaXYpIHx8IElTX1ZBTExFWVZJRVcoZGV2X3ByaXYpOwogfQogCiBzdGF0aWMgdm9p ZCBpbnRlbF9wbGFuZV9zZXRfY2tleShzdHJ1Y3QgaW50ZWxfcGxhbmVfc3RhdGUgKnBsYW5lX3N0 YXRlLAogCQkJCSBjb25zdCBzdHJ1Y3QgZHJtX2ludGVsX3Nwcml0ZV9jb2xvcmtleSAqc2V0KQog ewogCXN0cnVjdCBpbnRlbF9wbGFuZSAqcGxhbmUgPSB0b19pbnRlbF9wbGFuZShwbGFuZV9zdGF0 ZS0+YmFzZS5wbGFuZSk7CisJc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2ID0gdG9f aTkxNShwbGFuZS0+YmFzZS5kZXYpOwogCXN0cnVjdCBkcm1faW50ZWxfc3ByaXRlX2NvbG9ya2V5 ICprZXkgPSAmcGxhbmVfc3RhdGUtPmNrZXk7CiAKIAkqa2V5ID0gKnNldDsKQEAgLTExMTQsOCAr MTExNiwxMyBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9zZXRfY2tleShzdHJ1Y3QgaW50ZWxf cGxhbmVfc3RhdGUgKnBsYW5lX3N0YXRlLAogCS8qCiAJICogT24gU0tMKyB3ZSB3YW50IGRzdCBr ZXkgZW5hYmxlZCBvbgogCSAqIHRoZSBwcmltYXJ5IGFuZCBub3Qgb24gdGhlIHNwcml0ZS4KKwkg KgorCSAqIE9uIFZMVi9DSFYgd2Ugd2FudCB0byBrZWVwIHRoZSBkc3Qga2V5IGZsYWcgZXZlbiBv biB0aGUKKwkgKiBzcHJpdGVzIHRvIG1ha2UgdGhlIGNydGNfc3RhdGUtPmRzdF9jb2xvcmtleVtd IHN0dWZmIHdvcmsuCisJICogdmx2X3VwZGF0ZV9wbGFuZSgpIHdvbid0IGRvIGFueXRoaW5nIHdp dGggdGhlIGRzdCBrZXkgZmxhZworCSAqIGFueXdheSwgc28gbGVhdmluZyBpdCBvbiBkb2Vzbid0 IGh1cnQuCiAJICovCi0JaWYgKHBsYW5lLT5pZCAhPSBQTEFORV9QUklNQVJZICYmCisJaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOSAmJiBwbGFuZS0+aWQgIT0gUExBTkVfUFJJTUFSWSAmJgog CSAgICBzZXQtPmZsYWdzICYgSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04pCiAJCWtleS0+ ZmxhZ3MgPSAwOwogfQpAQCAtMTE0MSwxMCArMTE0OCw2IEBAIGludCBpbnRlbF9zcHJpdGVfc2V0 X2NvbG9ya2V5X2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsCiAJaWYg KChzZXQtPmZsYWdzICYgKEk5MTVfU0VUX0NPTE9SS0VZX0RFU1RJTkFUSU9OIHwgSTkxNV9TRVRf Q09MT1JLRVlfU09VUkNFKSkgPT0gKEk5MTVfU0VUX0NPTE9SS0VZX0RFU1RJTkFUSU9OIHwgSTkx NV9TRVRfQ09MT1JLRVlfU09VUkNFKSkKIAkJcmV0dXJuIC1FSU5WQUw7CiAKLQlpZiAoKElTX1ZB TExFWVZJRVcoZGV2X3ByaXYpIHx8IElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSAmJgotCSAgICBz ZXQtPmZsYWdzICYgSTkxNV9TRVRfQ09MT1JLRVlfREVTVElOQVRJT04pCi0JCXJldHVybiAtRUlO VkFMOwotCiAJcGxhbmUgPSBkcm1fcGxhbmVfZmluZChkZXYsIGZpbGVfcHJpdiwgc2V0LT5wbGFu ZV9pZCk7CiAJaWYgKCFwbGFuZSB8fCBwbGFuZS0+dHlwZSAhPSBEUk1fUExBTkVfVFlQRV9PVkVS TEFZKQogCQlyZXR1cm4gLUVOT0VOVDsKQEAgLTExNzcsNiArMTE4MCwxMCBAQCBpbnQgaW50ZWxf c3ByaXRlX3NldF9jb2xvcmtleV9pb2N0bChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpk YXRhLAogCQkvKgogCQkgKiBPbiBzb21lIHBsYXRmb3JtcyB3ZSBoYXZlIHRvIGNvbmZpZ3VyZQog CQkgKiB0aGUgZHN0IGNvbG9ya2V5IG9uIHRoZSBwcmltYXJ5IHBsYW5lLgorCQkgKgorCQkgKiBG SVhNRSB0aGlzIHdvbid0IHdvcmsgcHJvcGVybHkgZm9yIG11bHRpcGxlCisJCSAqIHNwcml0ZSBw bGFuZXMgb24gVkxWL0NIViBpZiBlYWNoIGlzIHRyeWluZyB0bworCQkgKiB1c2UgYSBkaWZmZXJl bnQgY29sb3JrZXkgdmFsdWUvbWFzay4KIAkJICovCiAJCWlmICghcmV0ICYmIGhhc19kc3Rfa2V5 X2luX3ByaW1hcnlfcGxhbmUoZGV2X3ByaXYpKSB7CiAJCQlzdHJ1Y3QgaW50ZWxfY3J0YyAqY3J0 YyA9Ci0tIAoyLjE2LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=