From: Ville Syrjala Subject: [PATCH xf86-video-intel] sna: Add XV_COLORSPACE attribute support for sprite Xv adaptors Date: Wed, 14 Feb 2018 21:21:08 +0200 Message-ID: <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 mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B6166E298 for ; Wed, 14 Feb 2018 19:21:12 +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: Jyri Sarha List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KClVz ZSB0aGUgbmV3ICJDT0xPUl9FTkNPRElORyIgcGxhbmUgcHJvcGVydHkgdG8gaW1wbGVtZW50IHRo ZQpYVl9DT0xPUlNQQUNFIHBvcnQgYXR0cmlidXRlIGZvciBzcHJpdGUgWHYgYWRhcHRvcnMuCgpD YzogSnlyaSBTYXJoYSA8anNhcmhhQHRpLmNvbT4KQ2M6IENocmlzIFdpbHNvbiA8Y2hyaXNAY2hy aXMtd2lsc29uLmNvLnVrPgpTaWduZWQtb2ZmLWJ5OiBWaWxsZSBTeXJqw6Rsw6QgPHZpbGxlLnN5 cmphbGFAbGludXguaW50ZWwuY29tPgotLS0KIHNyYy9zbmEvc25hLmggICAgICAgICAgICAgIHwg ICAxICsKIHNyYy9zbmEvc25hX2Rpc3BsYXkuYyAgICAgIHwgMTQ4ICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLQogc3JjL3NuYS9zbmFfdmlkZW8uaCAgICAgICAg fCAgIDMgKwogc3JjL3NuYS9zbmFfdmlkZW9fc3ByaXRlLmMgfCAgMjIgKysrKysrLQogNCBmaWxl cyBjaGFuZ2VkLCAxNDIgaW5zZXJ0aW9ucygrKSwgMzIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvc3JjL3NuYS9zbmEuaCBiL3NyYy9zbmEvc25hLmgKaW5kZXggNTI4M2NlNDM2YTNiLi5jOTA5 N2QzZGIxNTggMTAwNjQ0Ci0tLSBhL3NyYy9zbmEvc25hLmgKKysrIGIvc3JjL3NuYS9zbmEuaApA QCAtNjM0LDYgKzYzNCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBzbmFfcHJlc2VudF9jYW5jZWxf ZmxpcChzdHJ1Y3Qgc25hICpzbmEpIHsgfQogCiBleHRlcm4gdW5zaWduZWQgc25hX2NydGNfY291 bnRfc3ByaXRlcyh4Zjg2Q3J0Y1B0ciBjcnRjKTsKIGV4dGVybiBib29sIHNuYV9jcnRjX3NldF9z cHJpdGVfcm90YXRpb24oeGY4NkNydGNQdHIgY3J0YywgdW5zaWduZWQgaWR4LCB1aW50MzJfdCBy b3RhdGlvbik7CitleHRlcm4gdm9pZCBzbmFfY3J0Y19zZXRfc3ByaXRlX2NvbG9yc3BhY2UoeGY4 NkNydGNQdHIgY3J0YywgdW5zaWduZWQgaWR4LCBpbnQgY29sb3JzcGFjZSk7CiBleHRlcm4gdWlu dDMyX3Qgc25hX2NydGNfdG9fc3ByaXRlKHhmODZDcnRjUHRyIGNydGMsIHVuc2lnbmVkIGlkeCk7 CiBleHRlcm4gYm9vbCBzbmFfY3J0Y19pc190cmFuc2Zvcm1lZCh4Zjg2Q3J0Y1B0ciBjcnRjKTsK IApkaWZmIC0tZ2l0IGEvc3JjL3NuYS9zbmFfZGlzcGxheS5jIGIvc3JjL3NuYS9zbmFfZGlzcGxh eS5jCmluZGV4IGVhMmYxNDhkMjEzYy4uODZhYTcxMWY4ODZkIDEwMDY0NAotLS0gYS9zcmMvc25h L3NuYV9kaXNwbGF5LmMKKysrIGIvc3JjL3NuYS9zbmFfZGlzcGxheS5jCkBAIC0yMjIsNiArMjIy LDEwIEBAIHN0cnVjdCBzbmFfY3J0YyB7CiAJCQl1aW50MzJfdCBzdXBwb3J0ZWQ7CiAJCQl1aW50 MzJfdCBjdXJyZW50OwogCQl9IHJvdGF0aW9uOworCQlzdHJ1Y3QgeworCQkJdWludDMyX3QgcHJv cDsKKwkJCXVpbnQ2NF90IHZhbHVlc1syXTsKKwkJfSBjb2xvcl9lbmNvZGluZzsKIAkJc3RydWN0 IGxpc3QgbGluazsKIAl9IHByaW1hcnk7CiAJc3RydWN0IGxpc3Qgc3ByaXRlczsKQEAgLTMyOTMs MTcgKzMyOTcsMTI0IEBAIHN0YXRpYyBjb25zdCB4Zjg2Q3J0Y0Z1bmNzUmVjIHNuYV9jcnRjX2Z1 bmNzID0gewogI2VuZGlmCiB9OwogCi1pbmxpbmUgc3RhdGljIGJvb2wgcHJvcF9pc19yb3RhdGlv bihzdHJ1Y3QgZHJtX21vZGVfZ2V0X3Byb3BlcnR5ICpwcm9wKQoraW5saW5lIHN0YXRpYyBib29s IHByb3BfaGFzX3R5cGVfYW5kX25hbWUoY29uc3Qgc3RydWN0IGRybV9tb2RlX2dldF9wcm9wZXJ0 eSAqcHJvcCwKKwkJCQkJICB1bnNpZ25lZCBpbnQgdHlwZSwgY29uc3QgY2hhciAqbmFtZSkKIHsK LQlpZiAoKHByb3AtPmZsYWdzICYgKDEgPDwgNSkpID09IDApCisJaWYgKChwcm9wLT5mbGFncyAm ICgxIDw8IHR5cGUpKSA9PSAwKQogCQlyZXR1cm4gZmFsc2U7CiAKLQlpZiAoc3RyY21wKHByb3At Pm5hbWUsICJyb3RhdGlvbiIpKQorCWlmIChzdHJjbXAocHJvcC0+bmFtZSwgbmFtZSkpCiAJCXJl dHVybiBmYWxzZTsKIAogCXJldHVybiB0cnVlOwogfQogCitpbmxpbmUgc3RhdGljIGJvb2wgcHJv cF9pc19yb3RhdGlvbihjb25zdCBzdHJ1Y3QgZHJtX21vZGVfZ2V0X3Byb3BlcnR5ICpwcm9wKQor eworCXJldHVybiBwcm9wX2hhc190eXBlX2FuZF9uYW1lKHByb3AsIDUsICJyb3RhdGlvbiIpOwor fQorCitzdGF0aWMgdm9pZCBwYXJzZV9yb3RhdGlvbl9wcm9wKHN0cnVjdCBzbmEgKnNuYSwgc3Ry dWN0IHBsYW5lICpwLAorCQkJCXN0cnVjdCBkcm1fbW9kZV9nZXRfcHJvcGVydHkgKnByb3AsCisJ CQkJdWludDY0X3QgdmFsdWUpCit7CisJc3RydWN0IGRybV9tb2RlX3Byb3BlcnR5X2VudW0gKmVu dW1zOworCWludCBqOworCisJcC0+cm90YXRpb24ucHJvcCA9IHByb3AtPnByb3BfaWQ7CisJcC0+ cm90YXRpb24uY3VycmVudCA9IHZhbHVlOworCisJREJHKCgiJXM6IGZvdW5kIHJvdGF0aW9uIHBy b3BlcnR5IC5pZD0lZCwgdmFsdWU9JWxkLCBudW1fZW51bXM9JWRcbiIsCisJICAgICBfX0ZVTkNU SU9OX18sIHByb3AtPnByb3BfaWQsIHZhbHVlLCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzKSk7CisK KwllbnVtcyA9IG1hbGxvYyhwcm9wLT5jb3VudF9lbnVtX2Jsb2JzICogc2l6ZW9mKHN0cnVjdCBk cm1fbW9kZV9wcm9wZXJ0eV9lbnVtKSk7CisJaWYgKCFlbnVtcykKKwkJcmV0dXJuOworCisJcHJv cC0+Y291bnRfdmFsdWVzID0gMDsKKwlwcm9wLT5lbnVtX2Jsb2JfcHRyID0gKHVpbnRwdHJfdCll bnVtczsKKworCWlmIChkcm1Jb2N0bChzbmEtPmtnZW0uZmQsIERSTV9JT0NUTF9NT0RFX0dFVFBS T1BFUlRZLCBwcm9wKSkgeworCQlmcmVlKGVudW1zKTsKKwkJcmV0dXJuOworCX0KKworCS8qIFhY WCB3ZSBhc3N1bWUgdGhhdCB0aGUgbWFwcGluZyBiZXR3ZWVuIGtlcm5lbCBlbnVtIGFuZAorCSAq IFJhbmRSIHJlbWFpbnMgZml4ZWQgZm9yIG91ciBsaWZldGltZXMuCisJICovCisJVkcoVkFMR1JJ TkRfTUFLRV9NRU1fREVGSU5FRChlbnVtcywgc2l6ZW9mKCplbnVtcykqcHJvcC0+Y291bnRfZW51 bV9ibG9icykpOworCWZvciAoaiA9IDA7IGogPCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzOyBqKysp IHsKKwkJREJHKCgiJXM6IHJvdGF0aW9uWyVkXSA9ICVzIFslbHhdXG4iLCBfX0ZVTkNUSU9OX18s CisJCSAgICAgaiwgZW51bXNbal0ubmFtZSwgKGxvbmcpZW51bXNbal0udmFsdWUpKTsKKwkJcC0+ cm90YXRpb24uc3VwcG9ydGVkIHw9IDEgPDwgZW51bXNbal0udmFsdWU7CisJfQorCisJZnJlZShl bnVtcyk7Cit9CisKK2lubGluZSBzdGF0aWMgYm9vbCBwcm9wX2lzX2NvbG9yX2VuY29kaW5nKGNv bnN0IHN0cnVjdCBkcm1fbW9kZV9nZXRfcHJvcGVydHkgKnByb3ApCit7CisJcmV0dXJuIHByb3Bf aGFzX3R5cGVfYW5kX25hbWUocHJvcCwgMywgIkNPTE9SX0VOQ09ESU5HIik7Cit9CisKK3N0YXRp YyB2b2lkIHBhcnNlX2NvbG9yX2VuY29kaW5nX3Byb3Aoc3RydWN0IHNuYSAqc25hLCBzdHJ1Y3Qg cGxhbmUgKnAsCisJCQkJICAgICAgc3RydWN0IGRybV9tb2RlX2dldF9wcm9wZXJ0eSAqcHJvcCwK KwkJCQkgICAgICB1aW50NjRfdCB2YWx1ZSkKK3sKKwlzdHJ1Y3QgZHJtX21vZGVfcHJvcGVydHlf ZW51bSAqZW51bXM7CisJdW5zaWduZWQgaW50IHN1cHBvcnRlZCA9IDA7CisJaW50IGo7CisKKwlE QkcoKCIlczogZm91bmQgY29sb3IgZW5jb2RpbmcgcHJvcGVydHkgLmlkPSVkLCB2YWx1ZT0lbGQs IG51bV9lbnVtcz0lZFxuIiwKKwkgICAgIF9fRlVOQ1RJT05fXywgcHJvcC0+cHJvcF9pZCwgKGxv bmcpdmFsdWUsIHByb3AtPmNvdW50X2VudW1fYmxvYnMpKTsKKworCWVudW1zID0gbWFsbG9jKHBy b3AtPmNvdW50X2VudW1fYmxvYnMgKiBzaXplb2Yoc3RydWN0IGRybV9tb2RlX3Byb3BlcnR5X2Vu dW0pKTsKKwlpZiAoIWVudW1zKQorCQlyZXR1cm47CisKKwlwcm9wLT5jb3VudF92YWx1ZXMgPSAw OworCXByb3AtPmVudW1fYmxvYl9wdHIgPSAodWludHB0cl90KWVudW1zOworCisJaWYgKGRybUlv Y3RsKHNuYS0+a2dlbS5mZCwgRFJNX0lPQ1RMX01PREVfR0VUUFJPUEVSVFksIHByb3ApKSB7CisJ CWZyZWUoZW51bXMpOworCQlyZXR1cm47CisJfQorCisJVkcoVkFMR1JJTkRfTUFLRV9NRU1fREVG SU5FRChlbnVtcywgc2l6ZW9mKCplbnVtcykqcHJvcC0+Y291bnRfZW51bV9ibG9icykpOworCWZv ciAoaiA9IDA7IGogPCBwcm9wLT5jb3VudF9lbnVtX2Jsb2JzOyBqKyspIHsKKwkJaWYgKCFzdHJj bXAoZW51bXNbal0ubmFtZSwgIklUVS1SIEJULjYwMSBZQ2JDciIpKSB7CisJCQlwLT5jb2xvcl9l bmNvZGluZy52YWx1ZXNbMF0gPSBlbnVtc1tqXS52YWx1ZTsKKwkJCXN1cHBvcnRlZCB8PSAxIDw8 IDA7CisJCX0gZWxzZSBpZiAoIXN0cmNtcChlbnVtc1tqXS5uYW1lLCAiSVRVLVIgQlQuNzA5IFlD YkNyIikpIHsKKwkJCXAtPmNvbG9yX2VuY29kaW5nLnZhbHVlc1sxXSA9IGVudW1zW2pdLnZhbHVl OworCQkJc3VwcG9ydGVkIHw9IDEgPDwgMTsKKwkJfQorCX0KKworCWZyZWUoZW51bXMpOworCisJ aWYgKHN1cHBvcnRlZCA9PSAzKQorCQlwLT5jb2xvcl9lbmNvZGluZy5wcm9wID0gcHJvcC0+cHJv cF9pZDsKK30KKwordm9pZCBzbmFfY3J0Y19zZXRfc3ByaXRlX2NvbG9yc3BhY2UoeGY4NkNydGNQ dHIgY3J0YywKKwkJCQkgICAgdW5zaWduZWQgaWR4LCBpbnQgY29sb3JzcGFjZSkKK3sKKwlzdHJ1 Y3QgcGxhbmUgKnA7CisKKwlhc3NlcnQodG9fc25hX2NydGMoY3J0YykpOworCisJcCA9IGxvb2t1 cF9zcHJpdGUodG9fc25hX2NydGMoY3J0YyksIGlkeCk7CisKKwlpZiAoIXAtPmNvbG9yX2VuY29k aW5nLnByb3ApCisJCXJldHVybjsKKworCWRybU1vZGVPYmplY3RTZXRQcm9wZXJ0eSh0b19zbmEo Y3J0Yy0+c2NybiktPmtnZW0uZmQsCisJCQkJIHAtPmlkLCBEUk1fTU9ERV9PQkpFQ1RfUExBTkUs CisJCQkJIHAtPmNvbG9yX2VuY29kaW5nLnByb3AsCisJCQkJIHAtPmNvbG9yX2VuY29kaW5nLnZh bHVlc1tjb2xvcnNwYWNlXSk7Cit9CisKIHN0YXRpYyBpbnQgcGxhbmVfZGV0YWlscyhzdHJ1Y3Qg c25hICpzbmEsIHN0cnVjdCBwbGFuZSAqcCkKIHsKICNkZWZpbmUgTl9TVEFDS19QUk9QUyAzMiAv KiBtdXN0IGJlIGEgbXVsdGlwbGUgb2YgMiAqLwpAQCAtMzM2MCwzNCArMzQ3MSw5IEBAIHN0YXRp YyBpbnQgcGxhbmVfZGV0YWlscyhzdHJ1Y3Qgc25hICpzbmEsIHN0cnVjdCBwbGFuZSAqcCkKIAkJ aWYgKHN0cmNtcChwcm9wLm5hbWUsICJ0eXBlIikgPT0gMCkgewogCQkJdHlwZSA9IHZhbHVlc1tp XTsKIAkJfSBlbHNlIGlmIChwcm9wX2lzX3JvdGF0aW9uKCZwcm9wKSkgewotCQkJc3RydWN0IGRy bV9tb2RlX3Byb3BlcnR5X2VudW0gKmVudW1zOwotCi0JCQlwLT5yb3RhdGlvbi5wcm9wID0gcHJv cHNbaV07Ci0JCQlwLT5yb3RhdGlvbi5jdXJyZW50ID0gdmFsdWVzW2ldOwotCi0JCQlEQkcoKCIl czogZm91bmQgcm90YXRpb24gcHJvcGVydHkgLmlkPSVkLCB2YWx1ZT0lbGQsIG51bV9lbnVtcz0l ZFxuIiwKLQkJCSAgICAgX19GVU5DVElPTl9fLCBwcm9wLnByb3BfaWQsIChsb25nKXZhbHVlc1tp XSwgcHJvcC5jb3VudF9lbnVtX2Jsb2JzKSk7Ci0JCQllbnVtcyA9IG1hbGxvYyhwcm9wLmNvdW50 X2VudW1fYmxvYnMgKiBzaXplb2Yoc3RydWN0IGRybV9tb2RlX3Byb3BlcnR5X2VudW0pKTsKLQkJ CWlmIChlbnVtcyAhPSBOVUxMKSB7Ci0JCQkJcHJvcC5jb3VudF92YWx1ZXMgPSAwOwotCQkJCXBy b3AuZW51bV9ibG9iX3B0ciA9ICh1aW50cHRyX3QpZW51bXM7Ci0KLQkJCQlpZiAoZHJtSW9jdGwo c25hLT5rZ2VtLmZkLCBEUk1fSU9DVExfTU9ERV9HRVRQUk9QRVJUWSwgJnByb3ApID09IDApIHsK LQkJCQkJaW50IGo7Ci0KLQkJCQkJLyogWFhYIHdlIGFzc3VtZSB0aGF0IHRoZSBtYXBwaW5nIGJl dHdlZW4ga2VybmVsIGVudW0gYW5kCi0JCQkJCSAqIFJhbmRSIHJlbWFpbnMgZml4ZWQgZm9yIG91 ciBsaWZldGltZXMuCi0JCQkJCSAqLwotCQkJCQlWRyhWQUxHUklORF9NQUtFX01FTV9ERUZJTkVE KGVudW1zLCBzaXplb2YoKmVudW1zKSpwcm9wLmNvdW50X2VudW1fYmxvYnMpKTsKLQkJCQkJZm9y IChqID0gMDsgaiA8IHByb3AuY291bnRfZW51bV9ibG9iczsgaisrKSB7Ci0JCQkJCQlEQkcoKCIl czogcm90YXRpb25bJWRdID0gJXMgWyVseF1cbiIsIF9fRlVOQ1RJT05fXywKLQkJCQkJCSAgICAg aiwgZW51bXNbal0ubmFtZSwgKGxvbmcpZW51bXNbal0udmFsdWUpKTsKLQkJCQkJCXAtPnJvdGF0 aW9uLnN1cHBvcnRlZCB8PSAxIDw8IGVudW1zW2pdLnZhbHVlOwotCQkJCQl9Ci0JCQkJfQotCi0J CQkJZnJlZShlbnVtcyk7Ci0JCQl9CisJCQlwYXJzZV9yb3RhdGlvbl9wcm9wKHNuYSwgcCwgJnBy b3AsIHZhbHVlc1tpXSk7CisJCX0gZWxzZSBpZiAocHJvcF9pc19jb2xvcl9lbmNvZGluZygmcHJv cCkpIHsKKwkJCXBhcnNlX2NvbG9yX2VuY29kaW5nX3Byb3Aoc25hLCBwLCAmcHJvcCwgdmFsdWVz W2ldKTsKIAkJfQogCX0KIApkaWZmIC0tZ2l0IGEvc3JjL3NuYS9zbmFfdmlkZW8uaCBiL3NyYy9z bmEvc25hX3ZpZGVvLmgKaW5kZXggNmIxYzg2NGNlOWQ4Li42YWJmNmQ1NDBiMTggMTAwNjQ0Ci0t LSBhL3NyYy9zbmEvc25hX3ZpZGVvLmgKKysrIGIvc3JjL3NuYS9zbmFfdmlkZW8uaApAQCAtMTAw LDYgKzEwMCw5IEBAIHN0cnVjdCBzbmFfdmlkZW8gewogCXVuc2lnbmVkIGNvbG9yX2tleV9jaGFu Z2VkOwogCWJvb2wgaGFzX2NvbG9yX2tleTsKIAorCXVuc2lnbmVkIGNvbG9yc3BhY2U7CisJdW5z aWduZWQgY29sb3JzcGFjZV9jaGFuZ2VkOworCiAJLyoqIFlVViBkYXRhIGJ1ZmZlcnMgKi8KIAlz dHJ1Y3Qga2dlbV9ibyAqb2xkX2J1ZlsyXTsKIAlzdHJ1Y3Qga2dlbV9ibyAqYnVmOwpkaWZmIC0t Z2l0IGEvc3JjL3NuYS9zbmFfdmlkZW9fc3ByaXRlLmMgYi9zcmMvc25hL3NuYV92aWRlb19zcHJp dGUuYwppbmRleCA0NDg5OGE3NDhlMWMuLmY3MTNiYTM1NmI0MSAxMDA2NDQKLS0tIGEvc3JjL3Nu YS9zbmFfdmlkZW9fc3ByaXRlLmMKKysrIGIvc3JjL3NuYS9zbmFfdmlkZW9fc3ByaXRlLmMKQEAg LTY5LDExICs2OSwxMiBAQCBzdHJ1Y3QgbG9jYWxfbW9kZV9zZXRfcGxhbmUgewogCiAjZGVmaW5l IE1BS0VfQVRPTShhKSBNYWtlQXRvbShhLCBzaXplb2YoYSkgLSAxLCB0cnVlKQogCi1zdGF0aWMg QXRvbSB4dkNvbG9yS2V5LCB4dkFsd2F5c09uVG9wLCB4dlN5bmNUb1ZibGFuazsKK3N0YXRpYyBB dG9tIHh2Q29sb3JLZXksIHh2QWx3YXlzT25Ub3AsIHh2U3luY1RvVmJsYW5rLCB4dkNvbG9yc3Bh Y2U7CiAKIHN0YXRpYyBYdkZvcm1hdFJlYyBmb3JtYXRzW10gPSB7IHsxNX0sIHsxNn0sIHsyNH0g fTsKIHN0YXRpYyBjb25zdCBYdkltYWdlUmVjIGltYWdlc1tdID0geyBYVklNQUdFX1lVWTIsIFhW SU1BR0VfVVlWWSwgWFZNQ19SR0I4ODgsIFhWTUNfUkdCNTY1IH07CiBzdGF0aWMgY29uc3QgWHZB dHRyaWJ1dGVSZWMgYXR0cmlic1tdID0geworCXsgWHZTZXR0YWJsZSB8IFh2R2V0dGFibGUsIDAs IDEsIChjaGFyICopIlhWX0NPTE9SU1BBQ0UiIH0sIC8qIEJULjYwMSwgQlQuNzA5ICovCiAJeyBY dlNldHRhYmxlIHwgWHZHZXR0YWJsZSwgMCwgMHhmZmZmZmYsIChjaGFyICopIlhWX0NPTE9SS0VZ IiB9LAogCXsgWHZTZXR0YWJsZSB8IFh2R2V0dGFibGUsIDAsIDEsIChjaGFyICopIlhWX0FMV0FZ U19PTl9UT1AiIH0sCiB9OwpAQCAtMTE5LDYgKzEyMCwxMCBAQCBzdGF0aWMgaW50IHNuYV92aWRl b19zcHJpdGVfc2V0X2F0dHIoZGRTZXRQb3J0QXR0cmlidXRlX0FSR1MpCiAJCXZpZGVvLT5jb2xv cl9rZXkgPSB2YWx1ZTsKIAkJUmVnaW9uRW1wdHkoJnZpZGVvLT5jbGlwKTsKIAkJREJHKCgiQ09M T1JLRVkgPSAlbGRcbiIsIChsb25nKXZhbHVlKSk7CisJfSBlbHNlIGlmIChhdHRyaWJ1dGUgPT0g eHZDb2xvcnNwYWNlKSB7CisJCXZpZGVvLT5jb2xvcnNwYWNlX2NoYW5nZWQgPSB+MDsKKwkJdmlk ZW8tPmNvbG9yc3BhY2UgPSB2YWx1ZTsKKwkJREJHKCgiQ09MT1JTUEFDRSA9ICVsZFxuIiwgKGxv bmcpdmFsdWUpKTsKIAl9IGVsc2UgaWYgKGF0dHJpYnV0ZSA9PSB4dlN5bmNUb1ZibGFuaykgewog CQlEQkcoKCIlczogU1lOQ19UT19WQkxBTks6ICVkIC0+ICVkXG4iLCBfX0ZVTkNUSU9OX18sCiAJ CSAgICAgdmlkZW8tPlN5bmNUb1ZibGFuaywgISF2YWx1ZSkpOwpAQCAtMTQwLDYgKzE0NSw4IEBA IHN0YXRpYyBpbnQgc25hX3ZpZGVvX3Nwcml0ZV9nZXRfYXR0cihkZEdldFBvcnRBdHRyaWJ1dGVf QVJHUykKIAogCWlmIChhdHRyaWJ1dGUgPT0geHZDb2xvcktleSkKIAkJKnZhbHVlID0gdmlkZW8t PmNvbG9yX2tleTsKKwllbHNlIGlmIChhdHRyaWJ1dGUgPT0geHZDb2xvcnNwYWNlKQorCQkqdmFs dWUgPSB2aWRlby0+Y29sb3JzcGFjZTsKIAllbHNlIGlmIChhdHRyaWJ1dGUgPT0geHZBbHdheXNP blRvcCkKIAkJKnZhbHVlID0gdmlkZW8tPkFsd2F5c09uVG9wOwogCWVsc2UgaWYgKGF0dHJpYnV0 ZSA9PSB4dlN5bmNUb1ZibGFuaykKQEAgLTI2NSw2ICsyNzIsMTYgQEAgc25hX3ZpZGVvX3Nwcml0 ZV9zaG93KHN0cnVjdCBzbmEgKnNuYSwKIAkJdmlkZW8tPmNvbG9yX2tleV9jaGFuZ2VkICY9IH4o MSA8PCBwaXBlKTsKIAl9CiAKKwlpZiAodmlkZW8tPmNvbG9yc3BhY2VfY2hhbmdlZCAmICgxIDw8 IHBpcGUpKSB7CisJCURCRygoIiVzOiB1cGRhdGluZyBjb2xvcnNwYWNlOiAleFxuIiwKKwkJICAg ICBfX0ZVTkNUSU9OX18sIHZpZGVvLT5jb2xvcnNwYWNlKSk7CisKKwkJc25hX2NydGNfc2V0X3Nw cml0ZV9jb2xvcnNwYWNlKGNydGMsIHZpZGVvLT5pZHgsCisJCQkJCSAgICAgICB2aWRlby0+Y29s b3JzcGFjZSk7CisKKwkJdmlkZW8tPmNvbG9yc3BhY2VfY2hhbmdlZCAmPSB+KDEgPDwgcGlwZSk7 CisJfQorCiAJdXBkYXRlX2RzdF9ib3hfdG9fY3J0Y19jb29yZHMoc25hLCBjcnRjLCBkc3RCb3gp OwogCWlmIChmcmFtZS0+cm90YXRpb24gJiAoUlJfUm90YXRlXzkwIHwgUlJfUm90YXRlXzI3MCkp IHsKIAkJaW50IHRtcCA9IGZyYW1lLT53aWR0aDsKQEAgLTc2OSw2ICs3ODYsOCBAQCB2b2lkIHNu YV92aWRlb19zcHJpdGVfc2V0dXAoc3RydWN0IHNuYSAqc25hLCBTY3JlZW5QdHIgc2NyZWVuKQog CQl2aWRlby0+YWxpZ25tZW50ID0gNjQ7CiAJCXZpZGVvLT5jb2xvcl9rZXkgPSBzbmFfdmlkZW9f c3ByaXRlX2NvbG9yX2tleShzbmEpOwogCQl2aWRlby0+Y29sb3Jfa2V5X2NoYW5nZWQgPSB+MDsK KwkJdmlkZW8tPmNvbG9yc3BhY2UgPSAxOyAvKiBCVC43MDkgKi8KKwkJdmlkZW8tPmNvbG9yc3Bh Y2VfY2hhbmdlZCA9IH4wOwogCQl2aWRlby0+aGFzX2NvbG9yX2tleSA9IHRydWU7CiAJCXZpZGVv LT5icmlnaHRuZXNzID0gLTE5OwkvKiAoMjU1LzIxOSkgKiAtMTYgKi8KIAkJdmlkZW8tPmNvbnRy YXN0ID0gNzU7CS8qIDI1NS8yMTkgKiA2NCAqLwpAQCAtNzg5LDYgKzgwOCw3IEBAIHZvaWQgc25h X3ZpZGVvX3Nwcml0ZV9zZXR1cChzdHJ1Y3Qgc25hICpzbmEsIFNjcmVlblB0ciBzY3JlZW4pCiAJ YWRhcHRvci0+YmFzZV9pZCA9IGFkYXB0b3ItPnBQb3J0c1swXS5pZDsKIAogCXh2Q29sb3JLZXkg PSBNQUtFX0FUT00oIlhWX0NPTE9SS0VZIik7CisJeHZDb2xvcnNwYWNlID0gTUFLRV9BVE9NKCJY Vl9DT0xPUlNQQUNFIik7CiAJeHZBbHdheXNPblRvcCA9IE1BS0VfQVRPTSgiWFZfQUxXQVlTX09O X1RPUCIpOwogCXh2U3luY1RvVmJsYW5rID0gTUFLRV9BVE9NKCJYVl9TWU5DX1RPX1ZCTEFOSyIp OwogCi0tIAoyLjEzLjYKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVs LWdmeAo=