From: Neil Armstrong Subject: [PATCH 4/5] drm/meson: Add YUV420 output support Date: Mon, 20 May 2019 15:37:52 +0200 Message-ID: <20190520133753.23871-5-narmstrong@baylibre.com> References: <20190520133753.23871-1-narmstrong@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1607A8929D for ; Mon, 20 May 2019 13:38:04 +0000 (UTC) Received: by mail-wm1-x343.google.com with SMTP id t5so11732112wmh.3 for ; Mon, 20 May 2019 06:38:04 -0700 (PDT) In-Reply-To: <20190520133753.23871-1-narmstrong@baylibre.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com Cc: jernej.skrabec@siol.net, Neil Armstrong , maxime.ripard@bootlin.com, jonas@kwiboo.se, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, hverkuil@xs4all.nl, linux-amlogic@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaCBhZGRzIHN1cHBvcnQgZm9yIHRoZSBZVVY0MjAgb3V0cHV0IGZyb20gdGhlIEFt bG9naWMgTWVzb24gU29DcwpWaWRlbyBQcm9jZXNzaW5nIFVuaXQgdG8gdGhlIEhETUkgQ29udHJv bGxlci4KClRoZSBZVVY0MjAgaXMgb2J0YWluZWQgYnkgZ2VuZXJhdGluZyBhIFlVVjQ0NCBwaXhl bCBzdHJlYW0gbGlrZQp0aGUgY2xhc3NpYyBIRE1JIGRpc3BsYXkgbW9kZXMsIGJ1dCB0aGVuIHRo ZSBWaWRlbyBFbmNvZGVyIG91dHB1dApjYW4gYmUgY29uZmlndXJlZCB0byBkb3duLXNhbXBsZSB0 aGUgWVVWNDQ0IHBpeGVsIHN0cmVhbSB0byBhIFlVVjQyMApzdHJlYW0uCkluIGFkZGl0aW9uIGlm IHBpeGVsIHN0cmVhbSBkb3duLXNhbXBsaW5nLCB0aGUgWSBDYiBDciBjb21wb25lbnRzIG11c3QK YWxzbyBiZSBtYXBwZWQgZGlmZmVyZW50bHkgdG8gYWxpZ24gd2l0aCB0aGUgSERNSTIuMCBzcGVj aWZpY2F0aW9ucy4KClRoaXMgbW9kZSBuZWVkcyBhIGRpZmZlcmVudCBjbG9jayBnZW5lcmF0aW9u IHNjaGVtZSBzaW5jZSB0aGUgVE1EUyBQSFkKY2xvY2sgbXVzdCBtYXRjaCB0aGUgMTB4IHJhdGlv biB3aXRoIHRoZSBZVVY0MjAgcGl4ZWwgY2xvY2ssIGJ1dAp0aGUgdmlkZW8gZW5jb2RlciBtdXN0 IHJ1biBhdCAyeCB0aGUgcGl4ZWwgY2xvY2suCgpUaGlzIHBhdGNoIGFkZHMgdGhlIFRNRFMgUEhZ IGNsb2NrIHZhbHVlIGluIGFsbCB0aGUgdmlkZW8gY2xvY2sgc2V0dXAKaW4gb3JkZXIgdG8gYmV0 dGVyIHN1cHBvcnQgdGhlc2Ugc3BlY2lmaWMgdXNlcyBjYXNlcyBhbmQgc3dpdGNoCnRvIHRoZSBD b21tb24gQ2xvY2sgZnJhbWV3b3JrIGZvciBjbG9ja3MgaGFuZGxpbmcgaW4gdGhlIGZ1dHVyZS4K CldoZW4gNDIwIGlzIG5lZWRlZCwgaXQgY2FsbHMgZHJtX2JyaWRnZV9mb3JtYXRfc2V0KCkgZm9y IG5vdGlmeSB0aGUKYnJpZGdlIHRoZSBpbnB1dCBmb3JtYXQgaGFzIGNoYW5nZWQgdG8gWVVWNDIw LgoKU2lnbmVkLW9mZi1ieTogTmVpbCBBcm1zdHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUuY29t PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kd19oZG1pLmMgICB8IDEwMCArKysr KysrKysrKysrKysrKysrLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmMg ICAgICB8ICA5MyArKysrKysrKysrKysrKysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVzb24v bWVzb25fdmNsay5oICAgICAgfCAgIDcgKy0KIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92 ZW5jLmMgICAgICB8ICAgNiArLQogZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuaCAg ICAgIHwgIDExICsrKwogZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmNfY3Zicy5jIHwg ICAzICstCiA2IGZpbGVzIGNoYW5nZWQsIDE3NCBpbnNlcnRpb25zKCspLCA0NiBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fZHdfaGRtaS5jIGIv ZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2R3X2hkbWkuYwppbmRleCA3NzlkYTIxMTQzYjku LjVkNjdlMmJlYmE1OCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2R3 X2hkbWkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fZHdfaGRtaS5jCkBAIC0x NTksNiArMTU5LDcgQEAgc3RydWN0IG1lc29uX2R3X2hkbWkgewogCXN0cnVjdCByZWd1bGF0b3Ig KmhkbWlfc3VwcGx5OwogCXUzMiBpcnFfc3RhdDsKIAlzdHJ1Y3QgZHdfaGRtaSAqaGRtaTsKKwl1 bnNpZ25lZCBsb25nIGlucHV0X2J1c19mb3JtYXQ7CiB9OwogI2RlZmluZSBlbmNvZGVyX3RvX21l c29uX2R3X2hkbWkoeCkgXAogCWNvbnRhaW5lcl9vZih4LCBzdHJ1Y3QgbWVzb25fZHdfaGRtaSwg ZW5jb2RlcikKQEAgLTMwOCw2ICszMDksMTAgQEAgc3RhdGljIHZvaWQgbWVzb25faGRtaV9waHlf c2V0dXBfbW9kZShzdHJ1Y3QgbWVzb25fZHdfaGRtaSAqZHdfaGRtaSwKIAlzdHJ1Y3QgbWVzb25f ZHJtICpwcml2ID0gZHdfaGRtaS0+cHJpdjsKIAl1bnNpZ25lZCBpbnQgcGl4ZWxfY2xvY2sgPSBt b2RlLT5jbG9jazsKIAorCS8qIEZvciA0MjAsIHBpeGVsIGNsb2NrIGlzIGhhbGYgdW5saWtlIHZl bmMgY2xvY2sgKi8KKwlpZiAoZHdfaGRtaS0+aW5wdXRfYnVzX2Zvcm1hdCA9PSBNRURJQV9CVVNf Rk1UX1VZWVZZWThfMF81WDI0KQorCQlwaXhlbF9jbG9jayAvPSAyOworCiAJaWYgKGR3X2hkbWlf aXNfY29tcGF0aWJsZShkd19oZG1pLCAiYW1sb2dpYyxtZXNvbi1neGwtZHctaGRtaSIpIHx8CiAJ ICAgIGR3X2hkbWlfaXNfY29tcGF0aWJsZShkd19oZG1pLCAiYW1sb2dpYyxtZXNvbi1neG0tZHct aGRtaSIpKSB7CiAJCWlmIChwaXhlbF9jbG9jayA+PSAzNzEyNTApIHsKQEAgLTM4MywyNSArMzg4 LDM2IEBAIHN0YXRpYyB2b2lkIGR3X2hkbWlfc2V0X3ZjbGsoc3RydWN0IG1lc29uX2R3X2hkbWkg KmR3X2hkbWksCiB7CiAJc3RydWN0IG1lc29uX2RybSAqcHJpdiA9IGR3X2hkbWktPnByaXY7CiAJ aW50IHZpYyA9IGRybV9tYXRjaF9jZWFfbW9kZShtb2RlKTsKKwl1bnNpZ25lZCBpbnQgcGh5X2Zy ZXE7CiAJdW5zaWduZWQgaW50IHZjbGtfZnJlcTsKIAl1bnNpZ25lZCBpbnQgdmVuY19mcmVxOwog CXVuc2lnbmVkIGludCBoZG1pX2ZyZXE7CiAKIAl2Y2xrX2ZyZXEgPSBtb2RlLT5jbG9jazsKIAor CS8qIEZvciA0MjAsIHBpeGVsIGNsb2NrIGlzIGhhbGYgdW5saWtlIHZlbmMgY2xvY2sgKi8KKwlp ZiAoZHdfaGRtaS0+aW5wdXRfYnVzX2Zvcm1hdCA9PSBNRURJQV9CVVNfRk1UX1VZWVZZWThfMF81 WDI0KQorCQl2Y2xrX2ZyZXEgLz0gMjsKKworCS8qIFRNRFMgY2xvY2sgaXMgcGl4ZWxfY2xvY2sg KiAxMCAqLworCXBoeV9mcmVxID0gdmNsa19mcmVxICogMTA7CisKIAlpZiAoIXZpYykgewotCQlt ZXNvbl92Y2xrX3NldHVwKHByaXYsIE1FU09OX1ZDTEtfVEFSR0VUX0RNVCwgdmNsa19mcmVxLAot CQkJCSB2Y2xrX2ZyZXEsIHZjbGtfZnJlcSwgZmFsc2UpOworCQltZXNvbl92Y2xrX3NldHVwKHBy aXYsIE1FU09OX1ZDTEtfVEFSR0VUX0RNVCwgcGh5X2ZyZXEsCisJCQkJIHZjbGtfZnJlcSwgdmNs a19mcmVxLCB2Y2xrX2ZyZXEsIGZhbHNlKTsKIAkJcmV0dXJuOwogCX0KIAorCS8qIDQ4MGkvNTc2 aSBuZWVkcyBnbG9iYWwgcGl4ZWwgZG91YmxpbmcgKi8KIAlpZiAobW9kZS0+ZmxhZ3MgJiBEUk1f TU9ERV9GTEFHX0RCTENMSykKIAkJdmNsa19mcmVxICo9IDI7CiAKIAl2ZW5jX2ZyZXEgPSB2Y2xr X2ZyZXE7CiAJaGRtaV9mcmVxID0gdmNsa19mcmVxOwogCi0JaWYgKG1lc29uX3ZlbmNfaGRtaV92 ZW5jX3JlcGVhdCh2aWMpKQorCS8qIFZFTkMgZG91YmxlIHBpeGVscyBmb3IgMTA4MGksIDcyMHAg YW5kIFlVVjQyMCBtb2RlcyAqLworCWlmIChtZXNvbl92ZW5jX2hkbWlfdmVuY19yZXBlYXQodmlj KSB8fAorCSAgICBkd19oZG1pLT5pbnB1dF9idXNfZm9ybWF0ID09IE1FRElBX0JVU19GTVRfVVlZ VllZOF8wXzVYMjQpCiAJCXZlbmNfZnJlcSAqPSAyOwogCiAJdmNsa19mcmVxID0gbWF4KHZlbmNf ZnJlcSwgaGRtaV9mcmVxKTsKQEAgLTQwOSwxMSArNDI1LDExIEBAIHN0YXRpYyB2b2lkIGR3X2hk bWlfc2V0X3ZjbGsoc3RydWN0IG1lc29uX2R3X2hkbWkgKmR3X2hkbWksCiAJaWYgKG1vZGUtPmZs YWdzICYgRFJNX01PREVfRkxBR19EQkxDTEspCiAJCXZlbmNfZnJlcSAvPSAyOwogCi0JRFJNX0RF QlVHX0RSSVZFUigidmNsazolZCB2ZW5jPSVkIGhkbWk9JWQgZW5jaT0lZFxuIiwKLQkJdmNsa19m cmVxLCB2ZW5jX2ZyZXEsIGhkbWlfZnJlcSwKKwlEUk1fREVCVUdfRFJJVkVSKCJ2Y2xrOiVkIHBo eT0lZCB2ZW5jPSVkIGhkbWk9JWQgZW5jaT0lZFxuIiwKKwkJcGh5X2ZyZXEsIHZjbGtfZnJlcSwg dmVuY19mcmVxLCBoZG1pX2ZyZXEsCiAJCXByaXYtPnZlbmMuaGRtaV91c2VfZW5jaSk7CiAKLQlt ZXNvbl92Y2xrX3NldHVwKHByaXYsIE1FU09OX1ZDTEtfVEFSR0VUX0hETUksIHZjbGtfZnJlcSwK KwltZXNvbl92Y2xrX3NldHVwKHByaXYsIE1FU09OX1ZDTEtfVEFSR0VUX0hETUksIHBoeV9mcmVx LCB2Y2xrX2ZyZXEsCiAJCQkgdmVuY19mcmVxLCBoZG1pX2ZyZXEsIHByaXYtPnZlbmMuaGRtaV91 c2VfZW5jaSk7CiB9CiAKQEAgLTQ0Niw4ICs0NjIsOSBAQCBzdGF0aWMgaW50IGR3X2hkbWlfcGh5 X2luaXQoc3RydWN0IGR3X2hkbWkgKmhkbWksIHZvaWQgKmRhdGEsCiAJLyogRW5hYmxlIG5vcm1h bCBvdXRwdXQgdG8gUEhZICovCiAJZHdfaGRtaS0+ZGF0YS0+dG9wX3dyaXRlKGR3X2hkbWksIEhE TUlUWF9UT1BfQklTVF9DTlRMLCBCSVQoMTIpKTsKIAotCS8qIFRNRFMgcGF0dGVybiBzZXR1cCAo VE9GSVggSGFuZGxlIHRoZSBZVVY0MjAgY2FzZSkgKi8KLQlpZiAobW9kZS0+Y2xvY2sgPiAzNDAw MDApIHsKKwkvKiBUTURTIHBhdHRlcm4gc2V0dXAgKi8KKwlpZiAobW9kZS0+Y2xvY2sgPiAzNDAw MDAgJiYKKwkgICAgZHdfaGRtaS0+aW5wdXRfYnVzX2Zvcm1hdCA9PSBNRURJQV9CVVNfRk1UX1lV VjhfMVgyNCkgewogCQlkd19oZG1pLT5kYXRhLT50b3Bfd3JpdGUoZHdfaGRtaSwgSERNSVRYX1RP UF9UTURTX0NMS19QVFROXzAxLAogCQkJCSAgMCk7CiAJCWR3X2hkbWktPmRhdGEtPnRvcF93cml0 ZShkd19oZG1pLCBIRE1JVFhfVE9QX1RNRFNfQ0xLX1BUVE5fMjMsCkBAIC02MjIsNiArNjM5LDgg QEAgZHdfaGRtaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsCiAJ CSAgIGNvbnN0IHN0cnVjdCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQogewogCXN0cnVjdCBtZXNv bl9kcm0gKnByaXYgPSBjb25uZWN0b3ItPmRldi0+ZGV2X3ByaXZhdGU7CisJYm9vbCBpc19oZG1p Ml9zaW5rID0gY29ubmVjdG9yLT5kaXNwbGF5X2luZm8uaGRtaS5zY2RjLnN1cHBvcnRlZDsKKwl1 bnNpZ25lZCBpbnQgcGh5X2ZyZXE7CiAJdW5zaWduZWQgaW50IHZjbGtfZnJlcTsKIAl1bnNpZ25l ZCBpbnQgdmVuY19mcmVxOwogCXVuc2lnbmVkIGludCBoZG1pX2ZyZXE7CkBAIC02MzAsOSArNjQ5 LDExIEBAIGR3X2hkbWlfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9y LAogCiAJRFJNX0RFQlVHX0RSSVZFUigiTW9kZWxpbmUgIiBEUk1fTU9ERV9GTVQgIlxuIiwgRFJN X01PREVfQVJHKG1vZGUpKTsKIAotCS8qIElmIHNpbmsgbWF4IFRNRFMgY2xvY2ssIHdlIHJlamVj dCB0aGUgbW9kZSAqLworCS8qIElmIHNpbmsgZG9lcyBub3Qgc3VwcG9ydCA1NDBNSHosIHJlamVj dCB0aGUgbm9uLTQyMCBIRE1JMiBtb2RlcyAqLwogCWlmIChjb25uZWN0b3ItPmRpc3BsYXlfaW5m by5tYXhfdG1kc19jbG9jayAmJgotCSAgICBtb2RlLT5jbG9jayA+IGNvbm5lY3Rvci0+ZGlzcGxh eV9pbmZvLm1heF90bWRzX2Nsb2NrKQorCSAgICBtb2RlLT5jbG9jayA+IGNvbm5lY3Rvci0+ZGlz cGxheV9pbmZvLm1heF90bWRzX2Nsb2NrICYmCisJICAgICFkcm1fbW9kZV9pc180MjBfb25seSgm Y29ubmVjdG9yLT5kaXNwbGF5X2luZm8sIG1vZGUpICYmCisJICAgICFkcm1fbW9kZV9pc180MjBf YWxzbygmY29ubmVjdG9yLT5kaXNwbGF5X2luZm8sIG1vZGUpKQogCQlyZXR1cm4gTU9ERV9CQUQ7 CiAKIAkvKiBDaGVjayBhZ2FpbnN0IG5vbi1WSUMgc3VwcG9ydGVkIG1vZGVzICovCkBAIC02NDgs NiArNjY5LDE1IEBAIGR3X2hkbWlfbW9kZV92YWxpZChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yLAogCiAJdmNsa19mcmVxID0gbW9kZS0+Y2xvY2s7CiAKKwkvKiBGb3IgNDIwLCBwaXhl bCBjbG9jayBpcyBoYWxmIHVubGlrZSB2ZW5jIGNsb2NrICovCisJaWYgKGRybV9tb2RlX2lzXzQy MF9vbmx5KCZjb25uZWN0b3ItPmRpc3BsYXlfaW5mbywgbW9kZSkgfHwKKwkgICAgKCFpc19oZG1p Ml9zaW5rICYmCisJICAgICBkcm1fbW9kZV9pc180MjBfYWxzbygmY29ubmVjdG9yLT5kaXNwbGF5 X2luZm8sIG1vZGUpKSkKKwkJdmNsa19mcmVxIC89IDI7CisKKwkvKiBUTURTIGNsb2NrIGlzIHBp eGVsX2Nsb2NrICogMTAgKi8KKwlwaHlfZnJlcSA9IHZjbGtfZnJlcSAqIDEwOworCiAJLyogNDgw aS81NzZpIG5lZWRzIGdsb2JhbCBwaXhlbCBkb3VibGluZyAqLwogCWlmIChtb2RlLT5mbGFncyAm IERSTV9NT0RFX0ZMQUdfREJMQ0xLKQogCQl2Y2xrX2ZyZXEgKj0gMjsKQEAgLTY1NSw4ICs2ODUs MTEgQEAgZHdfaGRtaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Is CiAJdmVuY19mcmVxID0gdmNsa19mcmVxOwogCWhkbWlfZnJlcSA9IHZjbGtfZnJlcTsKIAotCS8q IFZFTkMgZG91YmxlIHBpeGVscyBmb3IgMTA4MGkgYW5kIDcyMHAgbW9kZXMgKi8KLQlpZiAobWVz b25fdmVuY19oZG1pX3ZlbmNfcmVwZWF0KHZpYykpCisJLyogVkVOQyBkb3VibGUgcGl4ZWxzIGZv ciAxMDgwaSwgNzIwcCBhbmQgWVVWNDIwIG1vZGVzICovCisJaWYgKG1lc29uX3ZlbmNfaGRtaV92 ZW5jX3JlcGVhdCh2aWMpIHx8CisJICAgIGRybV9tb2RlX2lzXzQyMF9vbmx5KCZjb25uZWN0b3It PmRpc3BsYXlfaW5mbywgbW9kZSkgfHwKKwkgICAgKCFpc19oZG1pMl9zaW5rICYmCisJICAgICBk cm1fbW9kZV9pc180MjBfYWxzbygmY29ubmVjdG9yLT5kaXNwbGF5X2luZm8sIG1vZGUpKSkKIAkJ dmVuY19mcmVxICo9IDI7CiAKIAl2Y2xrX2ZyZXEgPSBtYXgodmVuY19mcmVxLCBoZG1pX2ZyZXEp OwpAQCAtNjY0LDEwICs2OTcsMTAgQEAgZHdfaGRtaV9tb2RlX3ZhbGlkKHN0cnVjdCBkcm1fY29u bmVjdG9yICpjb25uZWN0b3IsCiAJaWYgKG1vZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19EQkxD TEspCiAJCXZlbmNfZnJlcSAvPSAyOwogCi0JZGV2X2RiZyhjb25uZWN0b3ItPmRldi0+ZGV2LCAi JXM6IHZjbGs6JWQgdmVuYz0lZCBoZG1pPSVkXG4iLCBfX2Z1bmNfXywKLQkJdmNsa19mcmVxLCB2 ZW5jX2ZyZXEsIGhkbWlfZnJlcSk7CisJZGV2X2RiZyhjb25uZWN0b3ItPmRldi0+ZGV2LCAiJXM6 IHZjbGs6JWQgcGh5PSVkIHZlbmM9JWQgaGRtaT0lZFxuIiwKKwkJX19mdW5jX18sIHBoeV9mcmVx LCB2Y2xrX2ZyZXEsIHZlbmNfZnJlcSwgaGRtaV9mcmVxKTsKIAotCXJldHVybiBtZXNvbl92Y2xr X3ZpY19zdXBwb3J0ZWRfZnJlcSh2Y2xrX2ZyZXEpOworCXJldHVybiBtZXNvbl92Y2xrX3ZpY19z dXBwb3J0ZWRfZnJlcShwaHlfZnJlcSwgdmNsa19mcmVxKTsKIH0KIAogLyogRW5jb2RlciAqLwpA QCAtNjg1LDYgKzcxOCwyNCBAQCBzdGF0aWMgaW50IG1lc29uX3ZlbmNfaGRtaV9lbmNvZGVyX2F0 b21pY19jaGVjayhzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCQkJCXN0cnVjdCBkcm1f Y3J0Y19zdGF0ZSAqY3J0Y19zdGF0ZSwKIAkJCQkJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg KmNvbm5fc3RhdGUpCiB7CisJc3RydWN0IG1lc29uX2R3X2hkbWkgKmR3X2hkbWkgPSBlbmNvZGVy X3RvX21lc29uX2R3X2hkbWkoZW5jb2Rlcik7CisJc3RydWN0IGRybV9kaXNwbGF5X2luZm8gKmlu Zm8gPSAmY29ubl9zdGF0ZS0+Y29ubmVjdG9yLT5kaXNwbGF5X2luZm87CisJc3RydWN0IGRybV9k aXNwbGF5X21vZGUgKm1vZGUgPSAmY3J0Y19zdGF0ZS0+bW9kZTsKKwlib29sIGlzX2hkbWkyX3Np bmsgPQorCQljb25uX3N0YXRlLT5jb25uZWN0b3ItPmRpc3BsYXlfaW5mby5oZG1pLnNjZGMuc3Vw cG9ydGVkOworCisJaWYgKGRybV9tb2RlX2lzXzQyMF9vbmx5KGluZm8sIG1vZGUpIHx8CisJICAg ICghaXNfaGRtaTJfc2luayAmJiBkcm1fbW9kZV9pc180MjBfYWxzbyhpbmZvLCBtb2RlKSkpCisJ CWR3X2hkbWktPmlucHV0X2J1c19mb3JtYXQgPSBNRURJQV9CVVNfRk1UX1VZWVZZWThfMF81WDI0 OworCWVsc2UKKwkJZHdfaGRtaS0+aW5wdXRfYnVzX2Zvcm1hdCA9IE1FRElBX0JVU19GTVRfWVVW OF8xWDI0OworCisJLyogU3BlY2lmeSB0aGUgZW5jb2RlciBvdXRwdXQgZm9ybWF0IHRvIHRoZSBi cmlkZ2UgKi8KKwlpZiAoIWRybV9icmlkZ2VfZm9ybWF0X3NldChlbmNvZGVyLT5icmlkZ2UsCisJ CQkJICAgZHdfaGRtaS0+aW5wdXRfYnVzX2Zvcm1hdCwKKwkJCQkgICBWNEwyX1lDQkNSX0VOQ183 MDkpKQorCQlyZXR1cm4gLUVJTlZBTDsKKwogCXJldHVybiAwOwogfQogCkBAIC03MjIsMTcgKzc3 MywyOSBAQCBzdGF0aWMgdm9pZCBtZXNvbl92ZW5jX2hkbWlfZW5jb2Rlcl9tb2RlX3NldChzdHJ1 Y3QgZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJc3RydWN0IG1lc29uX2R3X2hkbWkgKmR3X2hkbWkg PSBlbmNvZGVyX3RvX21lc29uX2R3X2hkbWkoZW5jb2Rlcik7CiAJc3RydWN0IG1lc29uX2RybSAq cHJpdiA9IGR3X2hkbWktPnByaXY7CiAJaW50IHZpYyA9IGRybV9tYXRjaF9jZWFfbW9kZShtb2Rl KTsKKwl1bnNpZ25lZCBpbnQgeWNyY2JfbWFwID0gTUVTT05fVkVOQ19NQVBfQ0JfWV9DUjsKKwli b29sIHl1djQyMF9tb2RlID0gZmFsc2U7CiAKIAlEUk1fREVCVUdfRFJJVkVSKCJcIiVzXCIgdmlj ICVkXG4iLCBtb2RlLT5uYW1lLCB2aWMpOwogCisJaWYgKGR3X2hkbWktPmlucHV0X2J1c19mb3Jt YXQgPT0gTUVESUFfQlVTX0ZNVF9VWVlWWVk4XzBfNVgyNCkgeworCQl5Y3JjYl9tYXAgPSBNRVNP Tl9WRU5DX01BUF9DUl9ZX0NCOworCQl5dXY0MjBfbW9kZSA9IHRydWU7CisJfQorCiAJLyogVkVO QyArIFZFTkMtRFZJIE1vZGUgc2V0dXAgKi8KLQltZXNvbl92ZW5jX2hkbWlfbW9kZV9zZXQocHJp diwgdmljLCBtb2RlKTsKKwltZXNvbl92ZW5jX2hkbWlfbW9kZV9zZXQocHJpdiwgdmljLCB5Y3Jj Yl9tYXAsIHl1djQyMF9tb2RlLCBtb2RlKTsKIAogCS8qIFZDTEsgU2V0IGNsb2NrICovCiAJZHdf aGRtaV9zZXRfdmNsayhkd19oZG1pLCBtb2RlKTsKIAotCS8qIFNldHVwIFlVVjQ0NCB0byBIRE1J LVRYLCBubyAxMGJpdCBkaXBoZXJpbmcgKi8KLQl3cml0ZWxfcmVsYXhlZCgwLCBwcml2LT5pb19i YXNlICsgX1JFRyhWUFVfSERNSV9GTVRfQ1RSTCkpOworCWlmIChkd19oZG1pLT5pbnB1dF9idXNf Zm9ybWF0ID09IE1FRElBX0JVU19GTVRfVVlZVllZOF8wXzVYMjQpCisJCS8qIFNldHVwIFlVVjQy MCB0byBIRE1JLVRYLCBubyAxMGJpdCBkaXBoZXJpbmcgKi8KKwkJd3JpdGVsX3JlbGF4ZWQoMiB8 ICgyIDw8IDIpLAorCQkJICAgICAgIHByaXYtPmlvX2Jhc2UgKyBfUkVHKFZQVV9IRE1JX0ZNVF9D VFJMKSk7CisJZWxzZQorCQkvKiBTZXR1cCBZVVY0NDQgdG8gSERNSS1UWCwgbm8gMTBiaXQgZGlw aGVyaW5nICovCisJCXdyaXRlbF9yZWxheGVkKDAsIHByaXYtPmlvX2Jhc2UgKyBfUkVHKFZQVV9I RE1JX0ZNVF9DVFJMKSk7CiB9CiAKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2VuY29kZXJfaGVs cGVyX2Z1bmNzCkBAIC05NzcsNiArMTA0MCw3IEBAIHN0YXRpYyBpbnQgbWVzb25fZHdfaGRtaV9i aW5kKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLAogCWR3X3BsYXRf ZGF0YS0+cGh5X2RhdGEgPSBtZXNvbl9kd19oZG1pOwogCWR3X3BsYXRfZGF0YS0+aW5wdXRfYnVz X2Zvcm1hdCA9IE1FRElBX0JVU19GTVRfWVVWOF8xWDI0OwogCWR3X3BsYXRfZGF0YS0+aW5wdXRf YnVzX2VuY29kaW5nID0gVjRMMl9ZQ0JDUl9FTkNfNzA5OworCWR3X3BsYXRfZGF0YS0+eWNiY3Jf NDIwX2FsbG93ZWQgPSB0cnVlOwogCiAJcGxhdGZvcm1fc2V0X2RydmRhdGEocGRldiwgbWVzb25f ZHdfaGRtaSk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xr LmMgYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmNsay5jCmluZGV4IGIzOTAzNDc0NTQ0 NC4uNDQyNTBlZmY4YTNmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25f dmNsay5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92Y2xrLmMKQEAgLTM2NCwx MiArMzY0LDE3IEBAIGVudW0gewogLyogMjk3MCAvMSAvMSAvMSAvNSAvMiAgPT4gLzEgLzEgKi8K IAlNRVNPTl9WQ0xLX0hETUlfMjk3MDAwLAogLyogNTk0MCAvMSAvMSAvMiAvNSAvMSAgPT4gLzEg LzEgKi8KLQlNRVNPTl9WQ0xLX0hETUlfNTk0MDAwCisJTUVTT05fVkNMS19IRE1JXzU5NDAwMCwK Ky8qIDI5NzAgLzEgLzEgLzEgLzUgLzEgID0+IC8xIC8yICovCisJTUVTT05fVkNMS19IRE1JXzU5 NDAwMF9ZVVY0MjAsCiB9OwogCiBzdHJ1Y3QgbWVzb25fdmNsa19wYXJhbXMgeworCXVuc2lnbmVk IGludCBwbGxfZnJlcTsKKwl1bnNpZ25lZCBpbnQgcGh5X2ZyZXE7CisJdW5zaWduZWQgaW50IHZj bGtfZnJlcTsKKwl1bnNpZ25lZCBpbnQgdmVuY19mcmVxOwogCXVuc2lnbmVkIGludCBwaXhlbF9m cmVxOwotCXVuc2lnbmVkIGludCBwbGxfYmFzZV9mcmVxOwogCXVuc2lnbmVkIGludCBwbGxfb2Qx OwogCXVuc2lnbmVkIGludCBwbGxfb2QyOwogCXVuc2lnbmVkIGludCBwbGxfb2QzOwpAQCAtMzc3 LDggKzM4MiwxMSBAQCBzdHJ1Y3QgbWVzb25fdmNsa19wYXJhbXMgewogCXVuc2lnbmVkIGludCB2 Y2xrX2RpdjsKIH0gcGFyYW1zW10gPSB7CiAJW01FU09OX1ZDTEtfSERNSV9FTkNJXzU0MDAwXSA9 IHsKKwkJLnBsbF9mcmVxID0gNDMyMDAwMCwKKwkJLnBoeV9mcmVxID0gMjcwMDAwLAorCQkudmNs a19mcmVxID0gNTQwMDAsCisJCS52ZW5jX2ZyZXEgPSA1NDAwMCwKIAkJLnBpeGVsX2ZyZXEgPSA1 NDAwMCwKLQkJLnBsbF9iYXNlX2ZyZXEgPSA0MzIwMDAwLAogCQkucGxsX29kMSA9IDQsCiAJCS5w bGxfb2QyID0gNCwKIAkJLnBsbF9vZDMgPSAxLApAQCAtMzg2LDggKzM5NCwxMSBAQCBzdHJ1Y3Qg bWVzb25fdmNsa19wYXJhbXMgewogCQkudmNsa19kaXYgPSAxLAogCX0sCiAJW01FU09OX1ZDTEtf SERNSV9ERFJfNTQwMDBdID0gewotCQkucGl4ZWxfZnJlcSA9IDU0MDAwLAotCQkucGxsX2Jhc2Vf ZnJlcSA9IDQzMjAwMDAsCisJCS5wbGxfZnJlcSA9IDQzMjAwMDAsCisJCS5waHlfZnJlcSA9IDI3 MDAwMCwKKwkJLnZjbGtfZnJlcSA9IDU0MDAwLAorCQkudmVuY19mcmVxID0gNTQwMDAsCisJCS5w aXhlbF9mcmVxID0gMjcwMDAsCiAJCS5wbGxfb2QxID0gNCwKIAkJLnBsbF9vZDIgPSA0LAogCQku cGxsX29kMyA9IDEsCkBAIC0zOTUsOCArNDA2LDExIEBAIHN0cnVjdCBtZXNvbl92Y2xrX3BhcmFt cyB7CiAJCS52Y2xrX2RpdiA9IDEsCiAJfSwKIAlbTUVTT05fVkNMS19IRE1JX0REUl8xNDg1MDBd ID0gewotCQkucGl4ZWxfZnJlcSA9IDE0ODUwMCwKLQkJLnBsbF9iYXNlX2ZyZXEgPSAyOTcwMDAw LAorCQkucGxsX2ZyZXEgPSAyOTcwMDAwLAorCQkucGh5X2ZyZXEgPSA3NDI1MDAsCisJCS52Y2xr X2ZyZXEgPSAxNDg1MDAsCisJCS52ZW5jX2ZyZXEgPSAxNDg1MDAsCisJCS5waXhlbF9mcmVxID0g NzQyNTAsCiAJCS5wbGxfb2QxID0gNCwKIAkJLnBsbF9vZDIgPSAxLAogCQkucGxsX29kMyA9IDEs CkBAIC00MDQsOCArNDE4LDExIEBAIHN0cnVjdCBtZXNvbl92Y2xrX3BhcmFtcyB7CiAJCS52Y2xr X2RpdiA9IDEsCiAJfSwKIAlbTUVTT05fVkNMS19IRE1JXzc0MjUwXSA9IHsKKwkJLnBsbF9mcmVx ID0gMjk3MDAwMCwKKwkJLnBoeV9mcmVxID0gNzQyNTAwLAorCQkudmNsa19mcmVxID0gNzQyNTAs CisJCS52ZW5jX2ZyZXEgPSA3NDI1MCwKIAkJLnBpeGVsX2ZyZXEgPSA3NDI1MCwKLQkJLnBsbF9i YXNlX2ZyZXEgPSAyOTcwMDAwLAogCQkucGxsX29kMSA9IDIsCiAJCS5wbGxfb2QyID0gMiwKIAkJ LnBsbF9vZDMgPSAyLApAQCAtNDEzLDggKzQzMCwxMSBAQCBzdHJ1Y3QgbWVzb25fdmNsa19wYXJh bXMgewogCQkudmNsa19kaXYgPSAxLAogCX0sCiAJW01FU09OX1ZDTEtfSERNSV8xNDg1MDBdID0g eworCQkucGxsX2ZyZXEgPSAyOTcwMDAwLAorCQkucGh5X2ZyZXEgPSAxNDg1MDAwLAorCQkudmNs a19mcmVxID0gMTQ4NTAwLAorCQkudmVuY19mcmVxID0gMTQ4NTAwLAogCQkucGl4ZWxfZnJlcSA9 IDE0ODUwMCwKLQkJLnBsbF9iYXNlX2ZyZXEgPSAyOTcwMDAwLAogCQkucGxsX29kMSA9IDEsCiAJ CS5wbGxfb2QyID0gMiwKIAkJLnBsbF9vZDMgPSAyLApAQCAtNDIyLDggKzQ0MiwxMSBAQCBzdHJ1 Y3QgbWVzb25fdmNsa19wYXJhbXMgewogCQkudmNsa19kaXYgPSAxLAogCX0sCiAJW01FU09OX1ZD TEtfSERNSV8yOTcwMDBdID0geworCQkucGxsX2ZyZXEgPSA1OTQwMDAwLAorCQkucGh5X2ZyZXEg PSAyOTcwMDAwLAorCQkudmVuY19mcmVxID0gMjk3MDAwLAorCQkudmNsa19mcmVxID0gMjk3MDAw LAogCQkucGl4ZWxfZnJlcSA9IDI5NzAwMCwKLQkJLnBsbF9iYXNlX2ZyZXEgPSA1OTQwMDAwLAog CQkucGxsX29kMSA9IDIsCiAJCS5wbGxfb2QyID0gMSwKIAkJLnBsbF9vZDMgPSAxLApAQCAtNDMx LDE0ICs0NTQsMjkgQEAgc3RydWN0IG1lc29uX3ZjbGtfcGFyYW1zIHsKIAkJLnZjbGtfZGl2ID0g MiwKIAl9LAogCVtNRVNPTl9WQ0xLX0hETUlfNTk0MDAwXSA9IHsKKwkJLnBsbF9mcmVxID0gNTk0 MDAwMCwKKwkJLnBoeV9mcmVxID0gNTk0MDAwMCwKKwkJLnZlbmNfZnJlcSA9IDU5NDAwMCwKKwkJ LnZjbGtfZnJlcSA9IDU5NDAwMCwKIAkJLnBpeGVsX2ZyZXEgPSA1OTQwMDAsCi0JCS5wbGxfYmFz ZV9mcmVxID0gNTk0MDAwMCwKIAkJLnBsbF9vZDEgPSAxLAogCQkucGxsX29kMiA9IDEsCiAJCS5w bGxfb2QzID0gMiwKIAkJLnZpZF9wbGxfZGl2ID0gVklEX1BMTF9ESVZfNSwKIAkJLnZjbGtfZGl2 ID0gMSwKIAl9LAorCVtNRVNPTl9WQ0xLX0hETUlfNTk0MDAwX1lVVjQyMF0gPSB7CisJCS5wbGxf ZnJlcSA9IDU5NDAwMDAsCisJCS5waHlfZnJlcSA9IDI5NzAwMDAsCisJCS52ZW5jX2ZyZXEgPSA1 OTQwMDAsCisJCS52Y2xrX2ZyZXEgPSA1OTQwMDAsCisJCS5waXhlbF9mcmVxID0gMjk3MDAwLAor CQkucGxsX29kMSA9IDIsCisJCS5wbGxfb2QyID0gMSwKKwkJLnBsbF9vZDMgPSAxLAorCQkudmlk X3BsbF9kaXYgPSBWSURfUExMX0RJVl81LAorCQkudmNsa19kaXYgPSAxLAorCX0sCiAJeyAvKiBz ZW50aW5lbCAqLyB9LAogfTsKIApAQCAtNjk2LDYgKzczNCw3IEBAIHN0YXRpYyB2b2lkIG1lc29u X2hkbWlfcGxsX2dlbmVyaWNfc2V0KHN0cnVjdCBtZXNvbl9kcm0gKnByaXYsCiAJdW5zaWduZWQg aW50IG9kLCBtLCBmcmFjLCBvZDEsIG9kMiwgb2QzOwogCiAJaWYgKG1lc29uX2hkbWlfcGxsX2Zp bmRfcGFyYW1zKHByaXYsIHBsbF9mcmVxLCAmbSwgJmZyYWMsICZvZCkpIHsKKwkJLyogT0QyIGdv ZXMgdG8gdGhlIFBIWSwgYW5kIG5lZWRzIHRvIGJlICoxMCwgc28ga2VlcCBPRDM9MSAqLwogCQlv ZDMgPSAxOwogCQlpZiAob2QgPCA0KSB7CiAJCQlvZDEgPSAyOwpAQCAtNzE4LDIxICs3NTcsMjgg QEAgc3RhdGljIHZvaWQgbWVzb25faGRtaV9wbGxfZ2VuZXJpY19zZXQoc3RydWN0IG1lc29uX2Ry bSAqcHJpdiwKIH0KIAogZW51bSBkcm1fbW9kZV9zdGF0dXMKLW1lc29uX3ZjbGtfdmljX3N1cHBv cnRlZF9mcmVxKHVuc2lnbmVkIGludCBmcmVxKQorbWVzb25fdmNsa192aWNfc3VwcG9ydGVkX2Zy ZXEodW5zaWduZWQgaW50IHBoeV9mcmVxLAorCQkJICAgICAgdW5zaWduZWQgaW50IHZjbGtfZnJl cSkKIHsKIAlpbnQgaTsKIAotCURSTV9ERUJVR19EUklWRVIoImZyZXEgPSAlZFxuIiwgZnJlcSk7 CisJRFJNX0RFQlVHX0RSSVZFUigicGh5X2ZyZXEgPSAlZCB2Y2xrX2ZyZXEgPSAlZFxuIiwKKwkJ CSBwaHlfZnJlcSwgdmNsa19mcmVxKTsKIAogCWZvciAoaSA9IDAgOyBwYXJhbXNbaV0ucGl4ZWxf ZnJlcSA7ICsraSkgewogCQlEUk1fREVCVUdfRFJJVkVSKCJpID0gJWQgcGl4ZWxfZnJlcSA9ICVk IGFsdCA9ICVkXG4iLAogCQkJCSBpLCBwYXJhbXNbaV0ucGl4ZWxfZnJlcSwKIAkJCQkgRlJFUV8x MDAwXzEwMDEocGFyYW1zW2ldLnBpeGVsX2ZyZXEpKTsKKwkJRFJNX0RFQlVHX0RSSVZFUigiaSA9 ICVkIHBoeV9mcmVxID0gJWQgYWx0ID0gJWRcbiIsCisJCQkJIGksIHBhcmFtc1tpXS5waHlfZnJl cSwKKwkJCQkgRlJFUV8xMDAwXzEwMDEocGFyYW1zW2ldLnBoeV9mcmVxLzEwKSoxMCk7CiAJCS8q IE1hdGNoIHN0cmljdCBmcmVxdWVuY3kgKi8KLQkJaWYgKGZyZXEgPT0gcGFyYW1zW2ldLnBpeGVs X2ZyZXEpCisJCWlmIChwaHlfZnJlcSA9PSBwYXJhbXNbaV0ucGh5X2ZyZXEgJiYKKwkJICAgIHZj bGtfZnJlcSA9PSBwYXJhbXNbaV0udmNsa19mcmVxKQogCQkJcmV0dXJuIE1PREVfT0s7CiAJCS8q IE1hdGNoIDEwMDAvMTAwMSB2YXJpYW50ICovCi0JCWlmIChmcmVxID09IEZSRVFfMTAwMF8xMDAx KHBhcmFtc1tpXS5waXhlbF9mcmVxKSkKKwkJaWYgKHBoeV9mcmVxID09IChGUkVRXzEwMDBfMTAw MShwYXJhbXNbaV0ucGh5X2ZyZXEvMTApKjEwKSAmJgorCQkgICAgdmNsa19mcmVxID09IEZSRVFf MTAwMF8xMDAxKHBhcmFtc1tpXS52Y2xrX2ZyZXEpKQogCQkJcmV0dXJuIE1PREVfT0s7CiAJfQog CkBAIC05NjAsOCArMTAwNiw5IEBAIHN0YXRpYyB2b2lkIG1lc29uX3ZjbGtfc2V0KHN0cnVjdCBt ZXNvbl9kcm0gKnByaXYsIHVuc2lnbmVkIGludCBwbGxfYmFzZV9mcmVxLAogfQogCiB2b2lkIG1l c29uX3ZjbGtfc2V0dXAoc3RydWN0IG1lc29uX2RybSAqcHJpdiwgdW5zaWduZWQgaW50IHRhcmdl dCwKLQkJICAgICAgdW5zaWduZWQgaW50IHZjbGtfZnJlcSwgdW5zaWduZWQgaW50IHZlbmNfZnJl cSwKLQkJICAgICAgdW5zaWduZWQgaW50IGRhY19mcmVxLCBib29sIGhkbWlfdXNlX2VuY2kpCisJ CSAgICAgIHVuc2lnbmVkIGludCBwaHlfZnJlcSwgdW5zaWduZWQgaW50IHZjbGtfZnJlcSwKKwkJ ICAgICAgdW5zaWduZWQgaW50IHZlbmNfZnJlcSwgdW5zaWduZWQgaW50IGRhY19mcmVxLAorCQkg ICAgICBib29sIGhkbWlfdXNlX2VuY2kpCiB7CiAJYm9vbCB2aWNfYWx0ZXJuYXRlX2Nsb2NrID0g ZmFsc2U7CiAJdW5zaWduZWQgaW50IGZyZXE7CkBAIC05ODAsNyArMTAyNyw3IEBAIHZvaWQgbWVz b25fdmNsa19zZXR1cChzdHJ1Y3QgbWVzb25fZHJtICpwcml2LCB1bnNpZ25lZCBpbnQgdGFyZ2V0 LAogCQkgKiAtIHZlbmNfZGl2ID0gMQogCQkgKiAtIGVuY3AgZW5jb2RlcgogCQkgKi8KLQkJbWVz b25fdmNsa19zZXQocHJpdiwgdmNsa19mcmVxICogMTAsIDAsIDAsIDAsCisJCW1lc29uX3ZjbGtf c2V0KHByaXYsIHBoeV9mcmVxLCAwLCAwLCAwLAogCQkJICAgICAgIFZJRF9QTExfRElWXzUsIDIs IDEsIDEsIGZhbHNlLCBmYWxzZSk7CiAJCXJldHVybjsKIAl9CkBAIC0xMDAyLDkgKzEwNDksMTEg QEAgdm9pZCBtZXNvbl92Y2xrX3NldHVwKHN0cnVjdCBtZXNvbl9kcm0gKnByaXYsIHVuc2lnbmVk IGludCB0YXJnZXQsCiAJfQogCiAJZm9yIChmcmVxID0gMCA7IHBhcmFtc1tmcmVxXS5waXhlbF9m cmVxIDsgKytmcmVxKSB7Ci0JCWlmICh2Y2xrX2ZyZXEgPT0gcGFyYW1zW2ZyZXFdLnBpeGVsX2Zy ZXEgfHwKLQkJICAgIHZjbGtfZnJlcSA9PSBGUkVRXzEwMDBfMTAwMShwYXJhbXNbZnJlcV0ucGl4 ZWxfZnJlcSkpIHsKLQkJCWlmICh2Y2xrX2ZyZXEgIT0gcGFyYW1zW2ZyZXFdLnBpeGVsX2ZyZXEp CisJCWlmICgocGh5X2ZyZXEgPT0gcGFyYW1zW2ZyZXFdLnBoeV9mcmVxIHx8CisJCSAgICAgcGh5 X2ZyZXEgPT0gRlJFUV8xMDAwXzEwMDEocGFyYW1zW2ZyZXFdLnBoeV9mcmVxLzEwKSoxMCkgJiYK KwkJICAgICh2Y2xrX2ZyZXEgPT0gcGFyYW1zW2ZyZXFdLnZjbGtfZnJlcSB8fAorCQkgICAgIHZj bGtfZnJlcSA9PSBGUkVRXzEwMDBfMTAwMShwYXJhbXNbZnJlcV0udmNsa19mcmVxKSkpIHsKKwkJ CWlmICh2Y2xrX2ZyZXEgIT0gcGFyYW1zW2ZyZXFdLnZjbGtfZnJlcSkKIAkJCQl2aWNfYWx0ZXJu YXRlX2Nsb2NrID0gdHJ1ZTsKIAkJCWVsc2UKIAkJCQl2aWNfYWx0ZXJuYXRlX2Nsb2NrID0gZmFs c2U7CkBAIC0xMDMzLDcgKzEwODIsNyBAQCB2b2lkIG1lc29uX3ZjbGtfc2V0dXAoc3RydWN0IG1l c29uX2RybSAqcHJpdiwgdW5zaWduZWQgaW50IHRhcmdldCwKIAkJcmV0dXJuOwogCX0KIAotCW1l c29uX3ZjbGtfc2V0KHByaXYsIHBhcmFtc1tmcmVxXS5wbGxfYmFzZV9mcmVxLAorCW1lc29uX3Zj bGtfc2V0KHByaXYsIHBhcmFtc1tmcmVxXS5wbGxfZnJlcSwKIAkJICAgICAgIHBhcmFtc1tmcmVx XS5wbGxfb2QxLCBwYXJhbXNbZnJlcV0ucGxsX29kMiwKIAkJICAgICAgIHBhcmFtc1tmcmVxXS5w bGxfb2QzLCBwYXJhbXNbZnJlcV0udmlkX3BsbF9kaXYsCiAJCSAgICAgICBwYXJhbXNbZnJlcV0u dmNsa19kaXYsIGhkbWlfdHhfZGl2LCB2ZW5jX2RpdiwKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9tZXNvbi9tZXNvbl92Y2xrLmggYi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmNs ay5oCmluZGV4IDRiZDg3NTJkYTAyYS4uYzRkMTlkZGZjZDc5IDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbWVzb24vbWVzb25fdmNsay5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9t ZXNvbl92Y2xrLmgKQEAgLTMzLDEwICszMywxMSBAQCBlbnVtIHsKIGVudW0gZHJtX21vZGVfc3Rh dHVzCiBtZXNvbl92Y2xrX2RtdF9zdXBwb3J0ZWRfZnJlcShzdHJ1Y3QgbWVzb25fZHJtICpwcml2 LCB1bnNpZ25lZCBpbnQgZnJlcSk7CiBlbnVtIGRybV9tb2RlX3N0YXR1cwotbWVzb25fdmNsa192 aWNfc3VwcG9ydGVkX2ZyZXEodW5zaWduZWQgaW50IGZyZXEpOworbWVzb25fdmNsa192aWNfc3Vw cG9ydGVkX2ZyZXEodW5zaWduZWQgaW50IHBoeV9mcmVxLCB1bnNpZ25lZCBpbnQgdmNsa19mcmVx KTsKIAogdm9pZCBtZXNvbl92Y2xrX3NldHVwKHN0cnVjdCBtZXNvbl9kcm0gKnByaXYsIHVuc2ln bmVkIGludCB0YXJnZXQsCi0JCSAgICAgIHVuc2lnbmVkIGludCB2Y2xrX2ZyZXEsIHVuc2lnbmVk IGludCB2ZW5jX2ZyZXEsCi0JCSAgICAgIHVuc2lnbmVkIGludCBkYWNfZnJlcSwgYm9vbCBoZG1p X3VzZV9lbmNpKTsKKwkJICAgICAgdW5zaWduZWQgaW50IHBoeV9mcmVxLCB1bnNpZ25lZCBpbnQg dmNsa19mcmVxLAorCQkgICAgICB1bnNpZ25lZCBpbnQgdmVuY19mcmVxLCB1bnNpZ25lZCBpbnQg ZGFjX2ZyZXEsCisJCSAgICAgIGJvb2wgaGRtaV91c2VfZW5jaSk7CiAKICNlbmRpZiAvKiBfX01F U09OX1ZDTEtfSCAqLwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3Zl bmMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jLmMKaW5kZXggNmZhY2E3MzEz MzM5Li41NDYwYzQ0Mzk2MTIgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNv bl92ZW5jLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuYwpAQCAtOTU4 LDYgKzk1OCw4IEBAIGJvb2wgbWVzb25fdmVuY19oZG1pX3ZlbmNfcmVwZWF0KGludCB2aWMpCiBF WFBPUlRfU1lNQk9MX0dQTChtZXNvbl92ZW5jX2hkbWlfdmVuY19yZXBlYXQpOwogCiB2b2lkIG1l c29uX3ZlbmNfaGRtaV9tb2RlX3NldChzdHJ1Y3QgbWVzb25fZHJtICpwcml2LCBpbnQgdmljLAor CQkJICAgICAgdW5zaWduZWQgaW50IHljcmNiX21hcCwKKwkJCSAgICAgIGJvb2wgeXV2NDIwX21v ZGUsCiAJCQkgICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSkKIHsKIAl1bmlvbiBt ZXNvbl9oZG1pX3ZlbmNfbW9kZSAqdm1vZGUgPSBOVUxMOwpAQCAtMTUwOCw4ICsxNTEwLDggQEAg dm9pZCBtZXNvbl92ZW5jX2hkbWlfbW9kZV9zZXQoc3RydWN0IG1lc29uX2RybSAqcHJpdiwgaW50 IHZpYywKIAl3cml0ZWxfcmVsYXhlZCgodXNlX2VuY2kgPyAxIDogMikgfAogCQkgICAgICAgKG1v ZGUtPmZsYWdzICYgRFJNX01PREVfRkxBR19QSFNZTkMgPyAxIDw8IDIgOiAwKSB8CiAJCSAgICAg ICAobW9kZS0+ZmxhZ3MgJiBEUk1fTU9ERV9GTEFHX1BWU1lOQyA/IDEgPDwgMyA6IDApIHwKLQkJ ICAgICAgIDQgPDwgNSB8Ci0JCSAgICAgICAodmVuY19yZXBlYXQgPyAxIDw8IDggOiAwKSB8CisJ CSAgICAgICAoeWNyY2JfbWFwIDw8IDUpIHwKKwkJICAgICAgICh2ZW5jX3JlcGVhdCB8fCB5dXY0 MjBfbW9kZSA/IDEgPDwgOCA6IDApIHwKIAkJICAgICAgIChoZG1pX3JlcGVhdCA/IDEgPDwgMTIg OiAwKSwKIAkJICAgICAgIHByaXYtPmlvX2Jhc2UgKyBfUkVHKFZQVV9IRE1JX1NFVFRJTkcpKTsK IApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuaCBiL2RyaXZl cnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jLmgKaW5kZXggOTdlYWViYmZhMGM0Li41NTgwYmYz OGUzODEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jLmgKKysr IGIvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX3ZlbmMuaApAQCAtMzMsNiArMzMsMTUgQEAg ZW51bSB7CiAJTUVTT05fVkVOQ19NT0RFX0hETUksCiB9OwogCitlbnVtIHsKKwlNRVNPTl9WRU5D X01BUF9DUl9ZX0NCID0gMCwKKwlNRVNPTl9WRU5DX01BUF9ZX0NCX0NSLAorCU1FU09OX1ZFTkNf TUFQX1lfQ1JfQ0IsCisJTUVTT05fVkVOQ19NQVBfQ0JfQ1JfWSwKKwlNRVNPTl9WRU5DX01BUF9D Ql9ZX0NSLAorCU1FU09OX1ZFTkNfTUFQX0NSX0NCX1ksCit9OworCiBzdHJ1Y3QgbWVzb25fY3Zi c19lbmNpX21vZGUgewogCXVuc2lnbmVkIGludCBtb2RlX3RhZzsKIAl1bnNpZ25lZCBpbnQgaHNv X2JlZ2luOyAvKiBIU08gYmVnaW4gcG9zaXRpb24gKi8KQEAgLTcwLDYgKzc5LDggQEAgZXh0ZXJu IHN0cnVjdCBtZXNvbl9jdmJzX2VuY2lfbW9kZSBtZXNvbl9jdmJzX2VuY2lfbnRzYzsKIHZvaWQg bWVzb25fdmVuY2lfY3Zic19tb2RlX3NldChzdHJ1Y3QgbWVzb25fZHJtICpwcml2LAogCQkJICAg ICAgIHN0cnVjdCBtZXNvbl9jdmJzX2VuY2lfbW9kZSAqbW9kZSk7CiB2b2lkIG1lc29uX3ZlbmNf aGRtaV9tb2RlX3NldChzdHJ1Y3QgbWVzb25fZHJtICpwcml2LCBpbnQgdmljLAorCQkJICAgICAg dW5zaWduZWQgaW50IHljcmNiX21hcCwKKwkJCSAgICAgIGJvb2wgeXV2NDIwX21vZGUsCiAJCQkg ICAgICBzdHJ1Y3QgZHJtX2Rpc3BsYXlfbW9kZSAqbW9kZSk7CiB1bnNpZ25lZCBpbnQgbWVzb25f dmVuY2lfZ2V0X2ZpZWxkKHN0cnVjdCBtZXNvbl9kcm0gKnByaXYpOwogCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuY19jdmJzLmMgYi9kcml2ZXJzL2dwdS9kcm0v bWVzb24vbWVzb25fdmVuY19jdmJzLmMKaW5kZXggMmM1MzQxYzg4MWM0Li5jMWJiYzYwMWNmMTMg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92ZW5jX2N2YnMuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdmVuY19jdmJzLmMKQEAgLTIxOCw3ICsyMTgs OCBAQCBzdGF0aWMgdm9pZCBtZXNvbl92ZW5jX2N2YnNfZW5jb2Rlcl9tb2RlX3NldChzdHJ1Y3Qg ZHJtX2VuY29kZXIgKmVuY29kZXIsCiAJCQkvKiBTZXR1cCAyN01IeiB2Y2xrMiBmb3IgRU5DSSBh bmQgVkRBQyAqLwogCQkJbWVzb25fdmNsa19zZXR1cChwcml2LCBNRVNPTl9WQ0xLX1RBUkdFVF9D VkJTLAogCQkJCQkgTUVTT05fVkNMS19DVkJTLCBNRVNPTl9WQ0xLX0NWQlMsCi0JCQkJCSBNRVNP Tl9WQ0xLX0NWQlMsIHRydWUpOworCQkJCQkgTUVTT05fVkNMS19DVkJTLCBNRVNPTl9WQ0xLX0NW QlMsCisJCQkJCSB0cnVlKTsKIAkJCWJyZWFrOwogCQl9CiAJfQotLSAKMi4yMS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=