From: Ville Syrjala Subject: [PATCH xf86-video-intel v2] sna: Add XV_COLORSPACE attribute support for sprite Xv adaptors Date: Fri, 2 Mar 2018 13:59:18 +0200 Message-ID: <20180302115918.20233-1-ville.syrjala@linux.intel.com> References: <20180214192108.2744-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD0786EE36 for ; Fri, 2 Mar 2018 11:59:22 +0000 (UTC) In-Reply-To: <20180214192108.2744-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 Cc: Jyri Sarha List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSB0aGUgbmV3ICJDT0xPUl9FTkNPRElORyIgcGxhbmUgcHJvcGVydHkgdG8gaW1wbGVtZW50IHRo ZQpYVl9DT0xPUlNQQUNFIHBvcnQgYXR0cmlidXRlIGZvciBzcHJpdGUgWHYgYWRhcHRvcnMuCgp2 MjogYXNzZXJ0KGNvbG9yc3BhY2UgPCBBUlJBWV9TSVpFKSAoQ2hyaXMpCgpDYzogSnlyaSBTYXJo YSA8anNhcmhhQHRpLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hyaXMtd2lsc29uLmNv LnVrPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5cmphbGFAbGludXgu aW50ZWwuY29tPgotLS0KIHNyYy9zbmEvc25hLmggICAgICAgICAgICAgIHwgICAxICsKIHNyYy9z bmEvc25hX2Rpc3BsYXkuYyAgICAgIHwgMTQ5ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLQogc3JjL3NuYS9zbmFfdmlkZW8uaCAgICAgICAgfCAgIDMgKwogc3Jj L3NuYS9zbmFfdmlkZW9fc3ByaXRlLmMgfCAgMjIgKysrKysrLQogNCBmaWxlcyBjaGFuZ2VkLCAx NDMgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL3NuYS9z bmEuaCBiL3NyYy9zbmEvc25hLmgKaW5kZXggNTI4M2NlNDM2YTNiLi5jOTA5N2QzZGIxNTggMTAw NjQ0Ci0tLSBhL3NyYy9zbmEvc25hLmgKKysrIGIvc3JjL3NuYS9zbmEuaApAQCAtNjM0LDYgKzYz NCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzbmFfcHJlc2VudF9jYW5jZWxfZmxpcChzdHJ1Y3Qg c25hICpzbmEpIHsgfQogCiBleHRlcm4gdW5zaWduZWQgc25hX2NydGNfY291bnRfc3ByaXRlcyh4 Zjg2Q3J0Y1B0ciBjcnRjKTsKIGV4dGVybiBib29sIHNuYV9jcnRjX3NldF9zcHJpdGVfcm90YXRp b24oeGY4NkNydGNQdHIgY3J0YywgdW5zaWduZWQgaWR4LCB1aW50MzJfdCByb3RhdGlvbik7Citl eHRlcm4gdm9pZCBzbmFfY3J0Y19zZXRfc3ByaXRlX2NvbG9yc3BhY2UoeGY4NkNydGNQdHIgY3J0 YywgdW5zaWduZWQgaWR4LCBpbnQgY29sb3JzcGFjZSk7CiBleHRlcm4gdWludDMyX3Qgc25hX2Ny dGNfdG9fc3ByaXRlKHhmODZDcnRjUHRyIGNydGMsIHVuc2lnbmVkIGlkeCk7CiBleHRlcm4gYm9v bCBzbmFfY3J0Y19pc190cmFuc2Zvcm1lZCh4Zjg2Q3J0Y1B0ciBjcnRjKTsKIApkaWZmIC0tZ2l0 IGEvc3JjL3NuYS9zbmFfZGlzcGxheS5jIGIvc3JjL3NuYS9zbmFfZGlzcGxheS5jCmluZGV4IGVh MmYxNDhkMjEzYy4uMDkxOTMyZjczOTcxIDEwMDY0NAotLS0gYS9zcmMvc25hL3NuYV9kaXNwbGF5 LmMKKysrIGIvc3JjL3NuYS9zbmFfZGlzcGxheS5jCkBAIC0yMjIsNiArMjIyLDEwIEBAIHN0cnVj dCBzbmFfY3J0YyB7CiAJCQl1aW50MzJfdCBzdXBwb3J0ZWQ7CiAJCQl1aW50MzJfdCBjdXJyZW50 OwogCQl9IHJvdGF0aW9uOworCQlzdHJ1Y3QgeworCQkJdWludDMyX3QgcHJvcDsKKwkJCXVpbnQ2 NF90IHZhbHVlc1syXTsKKwkJfSBjb2xvcl9lbmNvZGluZzsKIAkJc3RydWN0IGxpc3QgbGluazsK IAl9IHByaW1hcnk7CiAJc3RydWN0IGxpc3Qgc3ByaXRlczsKQEAgLTMyOTMsMTcgKzMyOTcsMTI1 IEBAIHN0YXRpYyBjb25zdCB4Zjg2Q3J0Y0Z1bmNzUmVjIHNuYV9jcnRjX2Z1bmNzID0gewogI2Vu ZGlmCiB9OwogCi1pbmxpbmUgc3RhdGljIGJvb2wgcHJvcF9pc19yb3RhdGlvbihzdHJ1Y3QgZHJt X21vZGVfZ2V0X3Byb3BlcnR5ICpwcm9wKQoraW5saW5lIHN0YXRpYyBib29sIHByb3BfaGFzX3R5 cGVfYW5kX25hbWUoY29uc3Qgc3RydWN0IGRybV9tb2RlX2dldF9wcm9wZXJ0eSAqcHJvcCwKKwkJ CQkJICB1bnNpZ25lZCBpbnQgdHlwZSwgY29uc3QgY2hhciAqbmFtZSkKIHsKLQlpZiAoKHByb3At PmZsYWdzICYgKDEgPDwgNSkpID09IDApCisJaWYgKChwcm9wLT5mbGFncyAmICgxIDw8IHR5cGUp KSA9PSAwKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAoc3RyY21wKHByb3AtPm5hbWUsICJyb3Rh dGlvbiIpKQorCWlmIChzdHJjbXAocHJvcC0+bmFtZSwgbmFtZSkpCiAJCXJldHVybiBmYWxzZTsK IAogCXJldHVybiB0cnVlOwogfQogCitpbmxpbmUgc3RhdGljIGJvb2wgcHJvcF9pc19yb3RhdGlv bihjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZ2V0X3Byb3BlcnR5ICpwcm9wKQoreworCXJldHVybiBw cm9wX2hhc190eXBlX2FuZF9uYW1lKHByb3AsIDUsICJyb3RhdGlvbiIpOworfQorCitzdGF0aWMg dm9pZCBwYXJzZV9yb3RhdGlvbl9wcm9wKHN0cnVjdCBzbmEgKnNuYSwgc3RydWN0IHBsYW5lICpw LAorCQkJCXN0cnVjdCBkcm1fbW9kZV9nZXRfcHJvcGVydHkgKnByb3AsCisJCQkJdWludDY0X3Qg dmFsdWUpCit7CisJc3RydWN0IGRybV9tb2RlX3Byb3BlcnR5X2VudW0gKmVudW1zOworCWludCBq OworCisJcC0+cm90YXRpb24ucHJvcCA9IHByb3AtPnByb3BfaWQ7CisJcC0+cm90YXRpb24uY3Vy cmVudCA9IHZhbHVlOworCisJREJHKCgiJXM6IGZvdW5kIHJvdGF0aW9uIHByb3BlcnR5IC5pZD0l ZCwgdmFsdWU9JWxkLCBudW1fZW51bXM9JWRcbiIsCisJICAgICBfX0ZVTkNUSU9OX18sIHByb3At PnByb3BfaWQsIHZhbHVlLCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzKSk7CisKKwllbnVtcyA9IG1h bGxvYyhwcm9wLT5jb3VudF9lbnVtX2Jsb2JzICogc2l6ZW9mKHN0cnVjdCBkcm1fbW9kZV9wcm9w ZXJ0eV9lbnVtKSk7CisJaWYgKCFlbnVtcykKKwkJcmV0dXJuOworCisJcHJvcC0+Y291bnRfdmFs dWVzID0gMDsKKwlwcm9wLT5lbnVtX2Jsb2JfcHRyID0gKHVpbnRwdHJfdCllbnVtczsKKworCWlm IChkcm1Jb2N0bChzbmEtPmtnZW0uZmQsIERSTV9JT0NUTF9NT0RFX0dFVFBST1BFUlRZLCBwcm9w KSkgeworCQlmcmVlKGVudW1zKTsKKwkJcmV0dXJuOworCX0KKworCS8qIFhYWCB3ZSBhc3N1bWUg dGhhdCB0aGUgbWFwcGluZyBiZXR3ZWVuIGtlcm5lbCBlbnVtIGFuZAorCSAqIFJhbmRSIHJlbWFp bnMgZml4ZWQgZm9yIG91ciBsaWZldGltZXMuCisJICovCisJVkcoVkFMR1JJTkRfTUFLRV9NRU1f REVGSU5FRChlbnVtcywgc2l6ZW9mKCplbnVtcykqcHJvcC0+Y291bnRfZW51bV9ibG9icykpOwor CWZvciAoaiA9IDA7IGogPCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzOyBqKyspIHsKKwkJREJHKCgi JXM6IHJvdGF0aW9uWyVkXSA9ICVzIFslbHhdXG4iLCBfX0ZVTkNUSU9OX18sCisJCSAgICAgaiwg ZW51bXNbal0ubmFtZSwgKGxvbmcpZW51bXNbal0udmFsdWUpKTsKKwkJcC0+cm90YXRpb24uc3Vw cG9ydGVkIHw9IDEgPDwgZW51bXNbal0udmFsdWU7CisJfQorCisJZnJlZShlbnVtcyk7Cit9CisK K2lubGluZSBzdGF0aWMgYm9vbCBwcm9wX2lzX2NvbG9yX2VuY29kaW5nKGNvbnN0IHN0cnVjdCBk cm1fbW9kZV9nZXRfcHJvcGVydHkgKnByb3ApCit7CisJcmV0dXJuIHByb3BfaGFzX3R5cGVfYW5k X25hbWUocHJvcCwgMywgIkNPTE9SX0VOQ09ESU5HIik7Cit9CisKK3N0YXRpYyB2b2lkIHBhcnNl X2NvbG9yX2VuY29kaW5nX3Byb3Aoc3RydWN0IHNuYSAqc25hLCBzdHJ1Y3QgcGxhbmUgKnAsCisJ CQkJICAgICAgc3RydWN0IGRybV9tb2RlX2dldF9wcm9wZXJ0eSAqcHJvcCwKKwkJCQkgICAgICB1 aW50NjRfdCB2YWx1ZSkKK3sKKwlzdHJ1Y3QgZHJtX21vZGVfcHJvcGVydHlfZW51bSAqZW51bXM7 CisJdW5zaWduZWQgaW50IHN1cHBvcnRlZCA9IDA7CisJaW50IGo7CisKKwlEQkcoKCIlczogZm91 bmQgY29sb3IgZW5jb2RpbmcgcHJvcGVydHkgLmlkPSVkLCB2YWx1ZT0lbGQsIG51bV9lbnVtcz0l ZFxuIiwKKwkgICAgIF9fRlVOQ1RJT05fXywgcHJvcC0+cHJvcF9pZCwgKGxvbmcpdmFsdWUsIHBy b3AtPmNvdW50X2VudW1fYmxvYnMpKTsKKworCWVudW1zID0gbWFsbG9jKHByb3AtPmNvdW50X2Vu dW1fYmxvYnMgKiBzaXplb2Yoc3RydWN0IGRybV9tb2RlX3Byb3BlcnR5X2VudW0pKTsKKwlpZiAo IWVudW1zKQorCQlyZXR1cm47CisKKwlwcm9wLT5jb3VudF92YWx1ZXMgPSAwOworCXByb3AtPmVu dW1fYmxvYl9wdHIgPSAodWludHB0cl90KWVudW1zOworCisJaWYgKGRybUlvY3RsKHNuYS0+a2dl bS5mZCwgRFJNX0lPQ1RMX01PREVfR0VUUFJPUEVSVFksIHByb3ApKSB7CisJCWZyZWUoZW51bXMp OworCQlyZXR1cm47CisJfQorCisJVkcoVkFMR1JJTkRfTUFLRV9NRU1fREVGSU5FRChlbnVtcywg c2l6ZW9mKCplbnVtcykqcHJvcC0+Y291bnRfZW51bV9ibG9icykpOworCWZvciAoaiA9IDA7IGog PCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzOyBqKyspIHsKKwkJaWYgKCFzdHJjbXAoZW51bXNbal0u bmFtZSwgIklUVS1SIEJULjYwMSBZQ2JDciIpKSB7CisJCQlwLT5jb2xvcl9lbmNvZGluZy52YWx1 ZXNbMF0gPSBlbnVtc1tqXS52YWx1ZTsKKwkJCXN1cHBvcnRlZCB8PSAxIDw8IDA7CisJCX0gZWxz ZSBpZiAoIXN0cmNtcChlbnVtc1tqXS5uYW1lLCAiSVRVLVIgQlQuNzA5IFlDYkNyIikpIHsKKwkJ CXAtPmNvbG9yX2VuY29kaW5nLnZhbHVlc1sxXSA9IGVudW1zW2pdLnZhbHVlOworCQkJc3VwcG9y dGVkIHw9IDEgPDwgMTsKKwkJfQorCX0KKworCWZyZWUoZW51bXMpOworCisJaWYgKHN1cHBvcnRl ZCA9PSAzKQorCQlwLT5jb2xvcl9lbmNvZGluZy5wcm9wID0gcHJvcC0+cHJvcF9pZDsKK30KKwor dm9pZCBzbmFfY3J0Y19zZXRfc3ByaXRlX2NvbG9yc3BhY2UoeGY4NkNydGNQdHIgY3J0YywKKwkJ CQkgICAgdW5zaWduZWQgaWR4LCBpbnQgY29sb3JzcGFjZSkKK3sKKwlzdHJ1Y3QgcGxhbmUgKnA7 CisKKwlhc3NlcnQodG9fc25hX2NydGMoY3J0YykpOworCWFzc2VydChjb2xvcnNwYWNlIDwgQVJS QVlfU0laRShwLT5jb2xvcl9lbmNvZGluZy52YWx1ZXMpKTsKKworCXAgPSBsb29rdXBfc3ByaXRl KHRvX3NuYV9jcnRjKGNydGMpLCBpZHgpOworCisJaWYgKCFwLT5jb2xvcl9lbmNvZGluZy5wcm9w KQorCQlyZXR1cm47CisKKwlkcm1Nb2RlT2JqZWN0U2V0UHJvcGVydHkodG9fc25hKGNydGMtPnNj cm4pLT5rZ2VtLmZkLAorCQkJCSBwLT5pZCwgRFJNX01PREVfT0JKRUNUX1BMQU5FLAorCQkJCSBw LT5jb2xvcl9lbmNvZGluZy5wcm9wLAorCQkJCSBwLT5jb2xvcl9lbmNvZGluZy52YWx1ZXNbY29s b3JzcGFjZV0pOworfQorCiBzdGF0aWMgaW50IHBsYW5lX2RldGFpbHMoc3RydWN0IHNuYSAqc25h LCBzdHJ1Y3QgcGxhbmUgKnApCiB7CiAjZGVmaW5lIE5fU1RBQ0tfUFJPUFMgMzIgLyogbXVzdCBi ZSBhIG11bHRpcGxlIG9mIDIgKi8KQEAgLTMzNjAsMzQgKzM0NzIsOSBAQCBzdGF0aWMgaW50IHBs YW5lX2RldGFpbHMoc3RydWN0IHNuYSAqc25hLCBzdHJ1Y3QgcGxhbmUgKnApCiAJCWlmIChzdHJj bXAocHJvcC5uYW1lLCAidHlwZSIpID09IDApIHsKIAkJCXR5cGUgPSB2YWx1ZXNbaV07CiAJCX0g ZWxzZSBpZiAocHJvcF9pc19yb3RhdGlvbigmcHJvcCkpIHsKLQkJCXN0cnVjdCBkcm1fbW9kZV9w cm9wZXJ0eV9lbnVtICplbnVtczsKLQotCQkJcC0+cm90YXRpb24ucHJvcCA9IHByb3BzW2ldOwot CQkJcC0+cm90YXRpb24uY3VycmVudCA9IHZhbHVlc1tpXTsKLQotCQkJREJHKCgiJXM6IGZvdW5k IHJvdGF0aW9uIHByb3BlcnR5IC5pZD0lZCwgdmFsdWU9JWxkLCBudW1fZW51bXM9JWRcbiIsCi0J CQkgICAgIF9fRlVOQ1RJT05fXywgcHJvcC5wcm9wX2lkLCAobG9uZyl2YWx1ZXNbaV0sIHByb3Au Y291bnRfZW51bV9ibG9icykpOwotCQkJZW51bXMgPSBtYWxsb2MocHJvcC5jb3VudF9lbnVtX2Js b2JzICogc2l6ZW9mKHN0cnVjdCBkcm1fbW9kZV9wcm9wZXJ0eV9lbnVtKSk7Ci0JCQlpZiAoZW51 bXMgIT0gTlVMTCkgewotCQkJCXByb3AuY291bnRfdmFsdWVzID0gMDsKLQkJCQlwcm9wLmVudW1f YmxvYl9wdHIgPSAodWludHB0cl90KWVudW1zOwotCi0JCQkJaWYgKGRybUlvY3RsKHNuYS0+a2dl bS5mZCwgRFJNX0lPQ1RMX01PREVfR0VUUFJPUEVSVFksICZwcm9wKSA9PSAwKSB7Ci0JCQkJCWlu dCBqOwotCi0JCQkJCS8qIFhYWCB3ZSBhc3N1bWUgdGhhdCB0aGUgbWFwcGluZyBiZXR3ZWVuIGtl cm5lbCBlbnVtIGFuZAotCQkJCQkgKiBSYW5kUiByZW1haW5zIGZpeGVkIGZvciBvdXIgbGlmZXRp bWVzLgotCQkJCQkgKi8KLQkJCQkJVkcoVkFMR1JJTkRfTUFLRV9NRU1fREVGSU5FRChlbnVtcywg c2l6ZW9mKCplbnVtcykqcHJvcC5jb3VudF9lbnVtX2Jsb2JzKSk7Ci0JCQkJCWZvciAoaiA9IDA7 IGogPCBwcm9wLmNvdW50X2VudW1fYmxvYnM7IGorKykgewotCQkJCQkJREJHKCgiJXM6IHJvdGF0 aW9uWyVkXSA9ICVzIFslbHhdXG4iLCBfX0ZVTkNUSU9OX18sCi0JCQkJCQkgICAgIGosIGVudW1z W2pdLm5hbWUsIChsb25nKWVudW1zW2pdLnZhbHVlKSk7Ci0JCQkJCQlwLT5yb3RhdGlvbi5zdXBw b3J0ZWQgfD0gMSA8PCBlbnVtc1tqXS52YWx1ZTsKLQkJCQkJfQotCQkJCX0KLQotCQkJCWZyZWUo ZW51bXMpOwotCQkJfQorCQkJcGFyc2Vfcm90YXRpb25fcHJvcChzbmEsIHAsICZwcm9wLCB2YWx1 ZXNbaV0pOworCQl9IGVsc2UgaWYgKHByb3BfaXNfY29sb3JfZW5jb2RpbmcoJnByb3ApKSB7CisJ CQlwYXJzZV9jb2xvcl9lbmNvZGluZ19wcm9wKHNuYSwgcCwgJnByb3AsIHZhbHVlc1tpXSk7CiAJ CX0KIAl9CiAKZGlmZiAtLWdpdCBhL3NyYy9zbmEvc25hX3ZpZGVvLmggYi9zcmMvc25hL3NuYV92 aWRlby5oCmluZGV4IDZiMWM4NjRjZTlkOC4uNmFiZjZkNTQwYjE4IDEwMDY0NAotLS0gYS9zcmMv c25hL3NuYV92aWRlby5oCisrKyBiL3NyYy9zbmEvc25hX3ZpZGVvLmgKQEAgLTEwMCw2ICsxMDAs OSBAQCBzdHJ1Y3Qgc25hX3ZpZGVvIHsKIAl1bnNpZ25lZCBjb2xvcl9rZXlfY2hhbmdlZDsKIAli b29sIGhhc19jb2xvcl9rZXk7CiAKKwl1bnNpZ25lZCBjb2xvcnNwYWNlOworCXVuc2lnbmVkIGNv bG9yc3BhY2VfY2hhbmdlZDsKKwogCS8qKiBZVVYgZGF0YSBidWZmZXJzICovCiAJc3RydWN0IGtn ZW1fYm8gKm9sZF9idWZbMl07CiAJc3RydWN0IGtnZW1fYm8gKmJ1ZjsKZGlmZiAtLWdpdCBhL3Ny Yy9zbmEvc25hX3ZpZGVvX3Nwcml0ZS5jIGIvc3JjL3NuYS9zbmFfdmlkZW9fc3ByaXRlLmMKaW5k ZXggNDQ4OThhNzQ4ZTFjLi5mNzEzYmEzNTZiNDEgMTAwNjQ0Ci0tLSBhL3NyYy9zbmEvc25hX3Zp ZGVvX3Nwcml0ZS5jCisrKyBiL3NyYy9zbmEvc25hX3ZpZGVvX3Nwcml0ZS5jCkBAIC02OSwxMSAr NjksMTIgQEAgc3RydWN0IGxvY2FsX21vZGVfc2V0X3BsYW5lIHsKIAogI2RlZmluZSBNQUtFX0FU T00oYSkgTWFrZUF0b20oYSwgc2l6ZW9mKGEpIC0gMSwgdHJ1ZSkKIAotc3RhdGljIEF0b20geHZD b2xvcktleSwgeHZBbHdheXNPblRvcCwgeHZTeW5jVG9WYmxhbms7CitzdGF0aWMgQXRvbSB4dkNv bG9yS2V5LCB4dkFsd2F5c09uVG9wLCB4dlN5bmNUb1ZibGFuaywgeHZDb2xvcnNwYWNlOwogCiBz dGF0aWMgWHZGb3JtYXRSZWMgZm9ybWF0c1tdID0geyB7MTV9LCB7MTZ9LCB7MjR9IH07CiBzdGF0 aWMgY29uc3QgWHZJbWFnZVJlYyBpbWFnZXNbXSA9IHsgWFZJTUFHRV9ZVVkyLCBYVklNQUdFX1VZ VlksIFhWTUNfUkdCODg4LCBYVk1DX1JHQjU2NSB9Owogc3RhdGljIGNvbnN0IFh2QXR0cmlidXRl UmVjIGF0dHJpYnNbXSA9IHsKKwl7IFh2U2V0dGFibGUgfCBYdkdldHRhYmxlLCAwLCAxLCAoY2hh ciAqKSJYVl9DT0xPUlNQQUNFIiB9LCAvKiBCVC42MDEsIEJULjcwOSAqLwogCXsgWHZTZXR0YWJs ZSB8IFh2R2V0dGFibGUsIDAsIDB4ZmZmZmZmLCAoY2hhciAqKSJYVl9DT0xPUktFWSIgfSwKIAl7 IFh2U2V0dGFibGUgfCBYdkdldHRhYmxlLCAwLCAxLCAoY2hhciAqKSJYVl9BTFdBWVNfT05fVE9Q IiB9LAogfTsKQEAgLTExOSw2ICsxMjAsMTAgQEAgc3RhdGljIGludCBzbmFfdmlkZW9fc3ByaXRl X3NldF9hdHRyKGRkU2V0UG9ydEF0dHJpYnV0ZV9BUkdTKQogCQl2aWRlby0+Y29sb3Jfa2V5ID0g dmFsdWU7CiAJCVJlZ2lvbkVtcHR5KCZ2aWRlby0+Y2xpcCk7CiAJCURCRygoIkNPTE9SS0VZID0g JWxkXG4iLCAobG9uZyl2YWx1ZSkpOworCX0gZWxzZSBpZiAoYXR0cmlidXRlID09IHh2Q29sb3Jz cGFjZSkgeworCQl2aWRlby0+Y29sb3JzcGFjZV9jaGFuZ2VkID0gfjA7CisJCXZpZGVvLT5jb2xv cnNwYWNlID0gdmFsdWU7CisJCURCRygoIkNPTE9SU1BBQ0UgPSAlbGRcbiIsIChsb25nKXZhbHVl KSk7CiAJfSBlbHNlIGlmIChhdHRyaWJ1dGUgPT0geHZTeW5jVG9WYmxhbmspIHsKIAkJREJHKCgi JXM6IFNZTkNfVE9fVkJMQU5LOiAlZCAtPiAlZFxuIiwgX19GVU5DVElPTl9fLAogCQkgICAgIHZp ZGVvLT5TeW5jVG9WYmxhbmssICEhdmFsdWUpKTsKQEAgLTE0MCw2ICsxNDUsOCBAQCBzdGF0aWMg aW50IHNuYV92aWRlb19zcHJpdGVfZ2V0X2F0dHIoZGRHZXRQb3J0QXR0cmlidXRlX0FSR1MpCiAK IAlpZiAoYXR0cmlidXRlID09IHh2Q29sb3JLZXkpCiAJCSp2YWx1ZSA9IHZpZGVvLT5jb2xvcl9r ZXk7CisJZWxzZSBpZiAoYXR0cmlidXRlID09IHh2Q29sb3JzcGFjZSkKKwkJKnZhbHVlID0gdmlk ZW8tPmNvbG9yc3BhY2U7CiAJZWxzZSBpZiAoYXR0cmlidXRlID09IHh2QWx3YXlzT25Ub3ApCiAJ CSp2YWx1ZSA9IHZpZGVvLT5BbHdheXNPblRvcDsKIAllbHNlIGlmIChhdHRyaWJ1dGUgPT0geHZT eW5jVG9WYmxhbmspCkBAIC0yNjUsNiArMjcyLDE2IEBAIHNuYV92aWRlb19zcHJpdGVfc2hvdyhz dHJ1Y3Qgc25hICpzbmEsCiAJCXZpZGVvLT5jb2xvcl9rZXlfY2hhbmdlZCAmPSB+KDEgPDwgcGlw ZSk7CiAJfQogCisJaWYgKHZpZGVvLT5jb2xvcnNwYWNlX2NoYW5nZWQgJiAoMSA8PCBwaXBlKSkg eworCQlEQkcoKCIlczogdXBkYXRpbmcgY29sb3JzcGFjZTogJXhcbiIsCisJCSAgICAgX19GVU5D VElPTl9fLCB2aWRlby0+Y29sb3JzcGFjZSkpOworCisJCXNuYV9jcnRjX3NldF9zcHJpdGVfY29s b3JzcGFjZShjcnRjLCB2aWRlby0+aWR4LAorCQkJCQkgICAgICAgdmlkZW8tPmNvbG9yc3BhY2Up OworCisJCXZpZGVvLT5jb2xvcnNwYWNlX2NoYW5nZWQgJj0gfigxIDw8IHBpcGUpOworCX0KKwog CXVwZGF0ZV9kc3RfYm94X3RvX2NydGNfY29vcmRzKHNuYSwgY3J0YywgZHN0Qm94KTsKIAlpZiAo ZnJhbWUtPnJvdGF0aW9uICYgKFJSX1JvdGF0ZV85MCB8IFJSX1JvdGF0ZV8yNzApKSB7CiAJCWlu dCB0bXAgPSBmcmFtZS0+d2lkdGg7CkBAIC03NjksNiArNzg2LDggQEAgdm9pZCBzbmFfdmlkZW9f c3ByaXRlX3NldHVwKHN0cnVjdCBzbmEgKnNuYSwgU2NyZWVuUHRyIHNjcmVlbikKIAkJdmlkZW8t PmFsaWdubWVudCA9IDY0OwogCQl2aWRlby0+Y29sb3Jfa2V5ID0gc25hX3ZpZGVvX3Nwcml0ZV9j b2xvcl9rZXkoc25hKTsKIAkJdmlkZW8tPmNvbG9yX2tleV9jaGFuZ2VkID0gfjA7CisJCXZpZGVv LT5jb2xvcnNwYWNlID0gMTsgLyogQlQuNzA5ICovCisJCXZpZGVvLT5jb2xvcnNwYWNlX2NoYW5n ZWQgPSB+MDsKIAkJdmlkZW8tPmhhc19jb2xvcl9rZXkgPSB0cnVlOwogCQl2aWRlby0+YnJpZ2h0 bmVzcyA9IC0xOTsJLyogKDI1NS8yMTkpICogLTE2ICovCiAJCXZpZGVvLT5jb250cmFzdCA9IDc1 OwkvKiAyNTUvMjE5ICogNjQgKi8KQEAgLTc4OSw2ICs4MDgsNyBAQCB2b2lkIHNuYV92aWRlb19z cHJpdGVfc2V0dXAoc3RydWN0IHNuYSAqc25hLCBTY3JlZW5QdHIgc2NyZWVuKQogCWFkYXB0b3It PmJhc2VfaWQgPSBhZGFwdG9yLT5wUG9ydHNbMF0uaWQ7CiAKIAl4dkNvbG9yS2V5ID0gTUFLRV9B VE9NKCJYVl9DT0xPUktFWSIpOworCXh2Q29sb3JzcGFjZSA9IE1BS0VfQVRPTSgiWFZfQ09MT1JT UEFDRSIpOwogCXh2QWx3YXlzT25Ub3AgPSBNQUtFX0FUT00oIlhWX0FMV0FZU19PTl9UT1AiKTsK IAl4dlN5bmNUb1ZibGFuayA9IE1BS0VfQVRPTSgiWFZfU1lOQ19UT19WQkxBTksiKTsKIAotLSAK Mi4xMy42CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJ bnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0 cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK