From: Robert Foss Subject: [PATCH i-g-t v1 20/32] tests/kms_plane_multiple: Add support for dynamic number of planes Date: Fri, 20 Jan 2017 12:45:42 -0500 Message-ID: <20170120174554.14195-21-robert.foss@collabora.com> References: <20170120174554.14195-1-robert.foss@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id E75B76EC51 for ; Fri, 20 Jan 2017 17:47:16 +0000 (UTC) In-Reply-To: <20170120174554.14195-1-robert.foss@collabora.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, Tomeu Vizoso , Maarten Lankhorst , Gustavo Padovan , Daniel Stone , Mika Kahola List-Id: intel-gfx@lists.freedesktop.org QWRkIGNoYW5nZXMgcmVmbGVjdGluZyB0aGUgbmV3IHN1cHBvcnQgZm9yIGR5bmFtaWMgbnVtYmVy IG9mIHBsYW5lcyBwZXIgcGlwZS4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQu Zm9zc0Bjb2xsYWJvcmEuY29tPgotLS0KIHRlc3RzL2ttc19wbGFuZV9tdWx0aXBsZS5jIHwgMjA5 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDEzMSBpbnNlcnRpb25zKCspLCA3OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90 ZXN0cy9rbXNfcGxhbmVfbXVsdGlwbGUuYyBiL3Rlc3RzL2ttc19wbGFuZV9tdWx0aXBsZS5jCmlu ZGV4IDJiNDNmMGM1Li43ZTA4YzFhNCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3BsYW5lX211bHRp cGxlLmMKKysrIGIvdGVzdHMva21zX3BsYW5lX211bHRpcGxlLmMKQEAgLTQ3LDggKzQ3LDggQEAg dHlwZWRlZiBzdHJ1Y3QgewogCWludCBkcm1fZmQ7CiAJaWd0X2Rpc3BsYXlfdCBkaXNwbGF5Owog CWlndF9waXBlX2NyY190ICpwaXBlX2NyYzsKLQlpZ3RfcGxhbmVfdCAqcGxhbmVbSUdUX01BWF9Q TEFORVNdOwotCXN0cnVjdCBpZ3RfZmIgZmJbSUdUX01BWF9QTEFORVNdOworCWlndF9wbGFuZV90 ICoqcGxhbmU7CisJc3RydWN0IGlndF9mYiAqZmI7CiB9IGRhdGFfdDsKIAogdHlwZWRlZiBzdHJ1 Y3QgewpAQCAtNzAsMjAgKzcwLDM1IEBAIHN0cnVjdCB7CiAvKgogICogQ29tbW9uIGNvZGUgYWNy b3NzIGFsbCB0ZXN0cywgYWN0aW5nIG9uIGRhdGFfdAogICovCi1zdGF0aWMgdm9pZCB0ZXN0X2lu aXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSkKK3N0YXRpYyB2b2lkIHRlc3RfaW5pdChk YXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLCBpbnQgbWF4X3BsYW5lcykKIHsKIAlkYXRhLT5w aXBlX2NyYyA9IGlndF9waXBlX2NyY19uZXcocGlwZSwgSU5URUxfUElQRV9DUkNfU09VUkNFX0FV VE8pOworCisJZGF0YS0+cGxhbmUgPSBtYWxsb2MobWF4X3BsYW5lcyAqIHNpemVvZihkYXRhLT5w bGFuZSkpOworCWlndF9hc3NlcnRfZihkYXRhLT5wbGFuZSAhPSBOVUxMLCAiRmFpbGVkIHRvIGFs bG9jYXRlIG1lbW9yeSBmb3IgcGxhbmVzXG4iKTsKKworCWRhdGEtPmZiID0gbWFsbG9jKG1heF9w bGFuZXMgKiBzaXplb2Yoc3RydWN0IGlndF9mYikpOworCWlndF9hc3NlcnRfZihkYXRhLT5mYiAh PSBOVUxMLCAiRmFpbGVkIHRvIGFsbG9jYXRlIG1lbW9yeSBmb3IgRkJzXG4iKTsKIH0KIAogc3Rh dGljIHZvaWQgdGVzdF9maW5pKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRwdXQsIGlu dCBtYXhfcGxhbmVzKQogewotCWZvciAoaW50IGkgPSBJR1RfUExBTkVfUFJJTUFSWTsgaSA8PSBt YXhfcGxhbmVzOyBpKyspCi0JCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxhbmVbaV0sIE5VTEwp OworCWZvciAoaW50IGkgPSAwOyBpIDw9IG1heF9wbGFuZXM7IGkrKykgeworCQlpZ3RfcGxhbmVf dCAqcGxhbmUgPSBkYXRhLT5wbGFuZVtpXTsKKwkJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFO RV9UWVBFX1BSSU1BUlkpCisJCQljb250aW51ZTsKKwkJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwg TlVMTCk7CisJfQogCiAJLyogcmVzZXQgdGhlIGNvbnN0cmFpbnQgb24gdGhlIHBpcGUgKi8KIAlp Z3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dCwgUElQRV9BTlkpOwogCiAJaWd0X3BpcGVfY3JjX2Zy ZWUoZGF0YS0+cGlwZV9jcmMpOworCisJZnJlZShkYXRhLT5wbGFuZSk7CisJZGF0YS0+cGxhbmUg PSBOVUxMOworCWZyZWUoZGF0YS0+ZmIpOworCWRhdGEtPmZiID0gTlVMTDsKIH0KIAogc3RhdGlj IHZvaWQKQEAgLTkxLDExICsxMDYsMTMgQEAgdGVzdF9ncmFiX2NyYyhkYXRhX3QgKmRhdGEsIGln dF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVtIHBpcGUgcGlwZSwgYm9vbCBhdG9taWMsCiAJICAgICAg Y29sb3JfdCAqY29sb3IsIHVpbnQ2NF90IHRpbGluZywgaWd0X2NyY190ICpjcmMgLyogb3V0ICov KQogewogCWRybU1vZGVNb2RlSW5mbyAqbW9kZTsKKwlpZ3RfcGxhbmVfdCAqcHJpbWFyeTsKIAlp bnQgcmV0LCBuOwogCiAJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUpOwogCi0JZGF0 YS0+cGxhbmVbSUdUX1BMQU5FX1BSSU1BUlldID0gaWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0 LCBJR1RfUExBTkVfUFJJTUFSWSk7CisJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5 cGUob3V0cHV0LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwlkYXRhLT5wbGFuZVtwcmltYXJ5 LT5pbmRleF0gPSBwcmltYXJ5OwogCiAJbW9kZSA9IGlndF9vdXRwdXRfZ2V0X21vZGUob3V0cHV0 KTsKIApAQCAtMTAzLDkgKzEyMCw5IEBAIHRlc3RfZ3JhYl9jcmMoZGF0YV90ICpkYXRhLCBpZ3Rf b3V0cHV0X3QgKm91dHB1dCwgZW51bSBwaXBlIHBpcGUsIGJvb2wgYXRvbWljLAogCQkJICAgIERS TV9GT1JNQVRfWFJHQjg4ODgsCiAJCQkgICAgTE9DQUxfRFJNX0ZPUk1BVF9NT0RfTk9ORSwKIAkJ CSAgICBjb2xvci0+cmVkLCBjb2xvci0+Z3JlZW4sIGNvbG9yLT5ibHVlLAotCQkJICAgICZkYXRh LT5mYltJR1RfUExBTkVfUFJJTUFSWV0pOworCQkJICAgICZkYXRhLT5mYltwcmltYXJ5LT5pbmRl eF0pOwogCi0JaWd0X3BsYW5lX3NldF9mYihkYXRhLT5wbGFuZVtJR1RfUExBTkVfUFJJTUFSWV0s ICZkYXRhLT5mYltJR1RfUExBTkVfUFJJTUFSWV0pOworCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+ cGxhbmVbcHJpbWFyeS0+aW5kZXhdLCAmZGF0YS0+ZmJbcHJpbWFyeS0+aW5kZXhdKTsKIAogCXJl dCA9IGlndF9kaXNwbGF5X3RyeV9jb21taXQyKCZkYXRhLT5kaXNwbGF5LAogCQkJCSAgICAgIGF0 b21pYyA/IENPTU1JVF9BVE9NSUMgOiBDT01NSVRfTEVHQUNZKTsKQEAgLTEyOCwyOSArMTQ1LDM1 IEBAIHRlc3RfZ3JhYl9jcmMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwgZW51 bSBwaXBlIHBpcGUsIGJvb2wgYXRvbWljLAogICovCiAKIHN0YXRpYyB2b2lkCi1jcmVhdGVfZmJf Zm9yX21vZGVfcG9zaXRpb24oZGF0YV90ICpkYXRhLCBkcm1Nb2RlTW9kZUluZm8gKm1vZGUsCitj cmVhdGVfZmJfZm9yX21vZGVfcG9zaXRpb24oZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91 dHB1dCwgZHJtTW9kZU1vZGVJbmZvICptb2RlLAogCQkJICAgIGNvbG9yX3QgKmNvbG9yLCBpbnQg KnJlY3RfeCwgaW50ICpyZWN0X3ksCiAJCQkgICAgaW50ICpyZWN0X3csIGludCAqcmVjdF9oLCB1 aW50NjRfdCB0aWxpbmcsCiAJCQkgICAgaW50IG1heF9wbGFuZXMpCiB7CiAJdW5zaWduZWQgaW50 IGZiX2lkOwogCWNhaXJvX3QgKmNyOworCWlndF9wbGFuZV90ICpwcmltYXJ5OworCisJcHJpbWFy eSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUob3V0cHV0LCBEUk1fUExBTkVfVFlQRV9QUklN QVJZKTsKIAogCWZiX2lkID0gaWd0X2NyZWF0ZV9mYihkYXRhLT5kcm1fZmQsCiAJCQkgICAgICBt b2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCiAJCQkgICAgICBEUk1fRk9STUFUX1hSR0I4 ODg4LAogCQkJICAgICAgdGlsaW5nLAotCQkJICAgICAgJmRhdGEtPmZiW0lHVF9QTEFORV9QUklN QVJZXSk7CisJCQkgICAgICAmZGF0YS0+ZmJbcHJpbWFyeS0+aW5kZXhdKTsKIAlpZ3RfYXNzZXJ0 KGZiX2lkKTsKIAotCWNyID0gaWd0X2dldF9jYWlyb19jdHgoZGF0YS0+ZHJtX2ZkLCAmZGF0YS0+ ZmJbSUdUX1BMQU5FX1BSSU1BUlldKTsKKwljciA9IGlndF9nZXRfY2Fpcm9fY3R4KGRhdGEtPmRy bV9mZCwgJmRhdGEtPmZiW3ByaW1hcnktPmluZGV4XSk7CiAJaWd0X3BhaW50X2NvbG9yKGNyLCBy ZWN0X3hbMF0sIHJlY3RfeVswXSwKIAkJCW1vZGUtPmhkaXNwbGF5LCBtb2RlLT52ZGlzcGxheSwK IAkJCWNvbG9yLT5yZWQsIGNvbG9yLT5ncmVlbiwgY29sb3ItPmJsdWUpOwogCi0JZm9yIChpbnQg aSA9IElHVF9QTEFORV8yOyBpIDw9IG1heF9wbGFuZXM7IGkrKykKKwlmb3IgKGludCBpID0gMDsg aSA8PSBtYXhfcGxhbmVzOyBpKyspIHsKKwkJaWYgKGRhdGEtPnBsYW5lW2ldLT50eXBlID09IERS TV9QTEFORV9UWVBFX1BSSU1BUlkpCisJCQljb250aW51ZTsKIAkJaWd0X3BhaW50X2NvbG9yKGNy LCByZWN0X3hbaV0sIHJlY3RfeVtpXSwKIAkJCQlyZWN0X3dbaV0sIHJlY3RfaFtpXSwgMC4wLCAw LjAsIDAuMCk7CisJCX0KIAogCWlndF9hc3NlcnQoY2Fpcm9fc3RhdHVzKGNyKSA9PSAwKTsKIAlj YWlyb19kZXN0cm95KGNyKTsKQEAgLTE1OCwzNyArMTgxLDUyIEBAIGNyZWF0ZV9mYl9mb3JfbW9k ZV9wb3NpdGlvbihkYXRhX3QgKmRhdGEsIGRybU1vZGVNb2RlSW5mbyAqbW9kZSwKIAogCiBzdGF0 aWMgdm9pZAotcHJlcGFyZV9wbGFuZXMoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgY29s b3JfdCAqY29sb3IsCitwcmVwYXJlX3BsYW5lcyhkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBl X2lkLCBjb2xvcl90ICpjb2xvciwKIAkgICAgICAgdWludDY0X3QgdGlsaW5nLCBpbnQgbWF4X3Bs YW5lcywgaWd0X291dHB1dF90ICpvdXRwdXQpCiB7CiAJZHJtTW9kZU1vZGVJbmZvICptb2RlOwot CWludCB4W0lHVF9NQVhfUExBTkVTXTsKLQlpbnQgeVtJR1RfTUFYX1BMQU5FU107Ci0JaW50IHNp emVbSUdUX01BWF9QTEFORVNdOworCWlndF9waXBlX3QgKnBpcGU7CisJaWd0X3BsYW5lX3QgKnBy aW1hcnk7CisJaW50ICp4OworCWludCAqeTsKKwlpbnQgKnNpemU7CiAJaW50IGk7CiAKLQlpZ3Rf b3V0cHV0X3NldF9waXBlKG91dHB1dCwgcGlwZSk7CisJaWd0X291dHB1dF9zZXRfcGlwZShvdXRw dXQsIHBpcGVfaWQpOworCXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1 dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CisJcGlwZSA9IHByaW1hcnktPnBpcGU7CisKKwl4 ID0gbWFsbG9jKHBpcGUtPm5fcGxhbmVzICogc2l6ZW9mKCp4KSk7CisJaWd0X2Fzc2VydF9mKHgs ICJGYWlsZWQgdG8gYWxsb2NhdGUgJWQgYnl0ZXMgZm9yIHZhcmlhYmxlIHhcbiIsIHBpcGUtPm5f cGxhbmVzICogc2l6ZW9mKCp4KSk7CisJeSA9IG1hbGxvYyhwaXBlLT5uX3BsYW5lcyAqIHNpemVv ZigqeSkpOworCWlndF9hc3NlcnRfZih4LCAiRmFpbGVkIHRvIGFsbG9jYXRlICVkIGJ5dGVzIGZv ciB2YXJpYWJsZSB5XG4iLCBwaXBlLT5uX3BsYW5lcyAqIHNpemVvZigqeSkpOworCXNpemUgPSBt YWxsb2MocGlwZS0+bl9wbGFuZXMgKiBzaXplb2YoKnNpemUpKTsKKwlpZ3RfYXNzZXJ0X2YoeCwg IkZhaWxlZCB0byBhbGxvY2F0ZSAlZCBieXRlcyBmb3IgdmFyaWFibGUgc2l6ZVxuIiwgcGlwZS0+ bl9wbGFuZXMgKiBzaXplb2YoKnNpemUpKTsKIAogCW1vZGUgPSBpZ3Rfb3V0cHV0X2dldF9tb2Rl KG91dHB1dCk7CiAKIAkvKiBwbGFuZXMgd2l0aCByYW5kb20gcG9zaXRpb25zICovCi0JeFtJR1Rf UExBTkVfUFJJTUFSWV0gPSAwOwotCXlbSUdUX1BMQU5FX1BSSU1BUlldID0gMDsKLQlmb3IgKGkg PSBJR1RfUExBTkVfMjsgaSA8PSBtYXhfcGxhbmVzOyBpKyspIHsKLQkJaWYgKGkgPT0gSUdUX1BM QU5FX0NVUlNPUikKKwl4W3ByaW1hcnktPmluZGV4XSA9IDA7CisJeVtwcmltYXJ5LT5pbmRleF0g PSAwOworCWZvciAoaSA9IDE7IGkgPD0gbWF4X3BsYW5lczsgaSsrKSB7CisJCWlndF9wbGFuZV90 ICpwbGFuZSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgaSk7CisKKwkJaWYgKHBsYW5l LT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCXNpemVbaV0gPSBTSVpFX0NVUlNP UjsKKwkJZWxzZSBpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKKwkJ CWNvbnRpbnVlOwogCQllbHNlCiAJCQlzaXplW2ldID0gU0laRV9QTEFORTsKIAogCQl4W2ldID0g cmFuZCgpICUgKG1vZGUtPmhkaXNwbGF5IC0gc2l6ZVtpXSk7CiAJCXlbaV0gPSByYW5kKCkgJSAo bW9kZS0+dmRpc3BsYXkgLSBzaXplW2ldKTsKIAotCQlkYXRhLT5wbGFuZVtpXSA9IGlndF9vdXRw dXRfZ2V0X3BsYW5lKG91dHB1dCwgaSk7CisJCWRhdGEtPnBsYW5lW2ldID0gcGxhbmU7CiAKIAkJ aWd0X2NyZWF0ZV9jb2xvcl9mYihkYXRhLT5kcm1fZmQsCiAJCQkJICAgIHNpemVbaV0sIHNpemVb aV0sCi0JCQkJICAgIGRhdGEtPnBsYW5lW2ldLT5pc19jdXJzb3IgPyBEUk1fRk9STUFUX0FSR0I4 ODg4IDogRFJNX0ZPUk1BVF9YUkdCODg4OCwKLQkJCQkgICAgZGF0YS0+cGxhbmVbaV0tPmlzX2N1 cnNvciA/IExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUgOiB0aWxpbmcsCisJCQkJICAgIGRhdGEt PnBsYW5lW2ldLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUiA/IERSTV9GT1JNQVRfQVJH Qjg4ODggOiBEUk1fRk9STUFUX1hSR0I4ODg4LAorCQkJCSAgICBkYXRhLT5wbGFuZVtpXS0+dHlw ZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FIDog dGlsaW5nLAogCQkJCSAgICBjb2xvci0+cmVkLCBjb2xvci0+Z3JlZW4sIGNvbG9yLT5ibHVlLAog CQkJCSAgICAmZGF0YS0+ZmJbaV0pOwogCkBAIC0xOTcsMTAgKzIzNSwxMCBAQCBwcmVwYXJlX3Bs YW5lcyhkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLCBjb2xvcl90ICpjb2xvciwKIAl9CiAK IAkvKiBwcmltYXJ5IHBsYW5lICovCi0JZGF0YS0+cGxhbmVbSUdUX1BMQU5FX1BSSU1BUlldID0g aWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0LCBJR1RfUExBTkVfUFJJTUFSWSk7Ci0JY3JlYXRl X2ZiX2Zvcl9tb2RlX3Bvc2l0aW9uKGRhdGEsIG1vZGUsIGNvbG9yLCB4LCB5LAorCWRhdGEtPnBs YW5lW3ByaW1hcnktPmluZGV4XSA9IHByaW1hcnk7CisJY3JlYXRlX2ZiX2Zvcl9tb2RlX3Bvc2l0 aW9uKGRhdGEsIG91dHB1dCwgbW9kZSwgY29sb3IsIHgsIHksCiAJCQkJICAgIHNpemUsIHNpemUs IHRpbGluZywgbWF4X3BsYW5lcyk7Ci0JaWd0X3BsYW5lX3NldF9mYihkYXRhLT5wbGFuZVtJR1Rf UExBTkVfUFJJTUFSWV0sICZkYXRhLT5mYltJR1RfUExBTkVfUFJJTUFSWV0pOworCWlndF9wbGFu ZV9zZXRfZmIoZGF0YS0+cGxhbmVbcHJpbWFyeS0+aW5kZXhdLCAmZGF0YS0+ZmJbcHJpbWFyeS0+ aW5kZXhdKTsKIH0KIAogc3RhdGljIHZvaWQKQEAgLTIzMiw3ICsyNzAsNyBAQCB0ZXN0X2F0b21p Y19wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBl LAogCQkgaWd0X291dHB1dF9uYW1lKG91dHB1dCksIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBt YXhfcGxhbmVzLAogCQkgaW5mbywgb3B0LnNlZWQpOwogCi0JdGVzdF9pbml0KGRhdGEsIHBpcGUp OworCXRlc3RfaW5pdChkYXRhLCBwaXBlLCBtYXhfcGxhbmVzKTsKIAogCXRlc3RfZ3JhYl9jcmMo ZGF0YSwgb3V0cHV0LCBwaXBlLCB0cnVlLCAmYmx1ZSwgdGlsaW5nLAogCQkgICAgICAmdGVzdC5y ZWZlcmVuY2VfY3JjKTsKQEAgLTI5OCw3ICszMzYsNyBAQCB0ZXN0X2xlZ2FjeV9wbGFuZV9wb3Np dGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLAogCQkgaWd0X291 dHB1dF9uYW1lKG91dHB1dCksIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzLAog CQkgaW5mbywgb3B0LnNlZWQpOwogCi0JdGVzdF9pbml0KGRhdGEsIHBpcGUpOworCXRlc3RfaW5p dChkYXRhLCBwaXBlLCBtYXhfcGxhbmVzKTsKIAogCXRlc3RfZ3JhYl9jcmMoZGF0YSwgb3V0cHV0 LCBwaXBlLCBmYWxzZSwgJmJsdWUsIHRpbGluZywKIAkJICAgICAgJnRlc3QucmVmZXJlbmNlX2Ny Yyk7CkBAIC0zNjcsNTQgKzQwNSw3MSBAQCB0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGFfdCAqZGF0 YSwgZW51bSBwaXBlIHBpcGUsIGJvb2wgYXRvbWljLCBpbnQgbWF4X3BsYW5lcywKIH0KIAogc3Rh dGljIHZvaWQKLXJ1bl90ZXN0c19mb3JfcGlwZV9wbGFuZShkYXRhX3QgKmRhdGEsIGVudW0gcGlw ZSBwaXBlLCBpbnQgbWF4X3BsYW5lcykKK3J1bl90ZXN0c19mb3JfcGlwZV9wbGFuZShkYXRhX3Qg KmRhdGEsIGVudW0gcGlwZSBwaXBlKQogewotCWlndF9zdWJ0ZXN0X2YoImxlZ2FjeS1waXBlLSVz LXRpbGluZy1ub25lLXBsYW5lcy0lZCIsCi0JCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUp LCBtYXhfcGxhbmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBt YXhfcGxhbmVzLAotCQkJCSAgICBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FKTsKLQotCWlndF9z dWJ0ZXN0X2YoImF0b21pYy1waXBlLSVzLXRpbGluZy1ub25lLXBsYW5lcy0lZCIsCi0JCSAgICAg IGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0 aW9uKGRhdGEsIHBpcGUsIHRydWUsIG1heF9wbGFuZXMsCi0JCQkJICAgIExPQ0FMX0k5MTVfRk9S TUFUX01PRF9YX1RJTEVEKTsKLQotCWlndF9zdWJ0ZXN0X2YoImxlZ2FjeS1waXBlLSVzLXRpbGlu Zy14LXBsYW5lcy0lZCIsCi0JCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxh bmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBtYXhfcGxhbmVz LAotCQkJCSAgICBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWF9USUxFRCk7Ci0KLQlpZ3Rfc3VidGVz dF9mKCJhdG9taWMtcGlwZS0lcy10aWxpbmcteC1wbGFuZXMtJWQiLAotCQkgICAgICBrbXN0ZXN0 X3BpcGVfbmFtZShwaXBlKSwgbWF4X3BsYW5lcykKLQkJdGVzdF9wbGFuZV9wb3NpdGlvbihkYXRh LCBwaXBlLCB0cnVlLCBtYXhfcGxhbmVzLAotCQkJCSAgICBMT0NBTF9JOTE1X0ZPUk1BVF9NT0Rf WF9USUxFRCk7Ci0KLQlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlwZS0lcy10aWxpbmcteS1wbGFu ZXMtJWQiLAotCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSwgbWF4X3BsYW5lcykKLQkJ dGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhLCBwaXBlLCBmYWxzZSwgbWF4X3BsYW5lcywKLQkJCQkg ICAgTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQpOwotCi0JaWd0X3N1YnRlc3RfZigiYXRv bWljLXBpcGUtJXMtdGlsaW5nLXktcGxhbmVzLSVkIiwKLQkJICAgICAga21zdGVzdF9waXBlX25h bWUocGlwZSksIG1heF9wbGFuZXMpCi0JCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwg dHJ1ZSwgbWF4X3BsYW5lcywKLQkJCQkgICAgTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQp OwotCi0JaWd0X3N1YnRlc3RfZigibGVnYWN5LXBpcGUtJXMtdGlsaW5nLXlmLXBsYW5lcy0lZCIs Ci0JCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzKQotCQl0ZXN0X3Bs YW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBtYXhfcGxhbmVzLAotCQkJCSAgICBMT0NB TF9JOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpOwotCi0JaWd0X3N1YnRlc3RfZigiYXRvbWljLXBp cGUtJXMtdGlsaW5nLXlmLXBsYW5lcy0lZCIsCi0JCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBp cGUpLCBtYXhfcGxhbmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIHRydWUs IG1heF9wbGFuZXMsCi0JCQkJICAgIExPQ0FMX0k5MTVfRk9STUFUX01PRF9ZZl9USUxFRCk7Ci19 CisJaWd0X3N1YnRlc3RfZigibGVnYWN5LXBpcGUtJXMtdGlsaW5nLW5vbmUtcGxhbmVzIiwKKwkJ ICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSkpIHsKKwkJaW50IG5fcGxhbmVzID0gZGF0YS0+ ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lczsKKwkJZm9yIChpbnQgcGxhbmVzID0gMDsgcGxh bmVzIDwgbl9wbGFuZXM7IHBsYW5lcysrKQorCQkJdGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhLCBw aXBlLCBmYWxzZSwgcGxhbmVzLAorCQkJCUxPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUpOworCX0K IAotc3RhdGljIHZvaWQKLXJ1bl90ZXN0c19mb3JfcGlwZShkYXRhX3QgKmRhdGEsIGVudW0gcGlw ZSBwaXBlKQotewotCWZvciAoaW50IHBsYW5lcyA9IElHVF9QTEFORV9QUklNQVJZOyBwbGFuZXMg PCBJR1RfTUFYX1BMQU5FUzsgcGxhbmVzKyspCi0JCXJ1bl90ZXN0c19mb3JfcGlwZV9wbGFuZShk YXRhLCBwaXBlLCBwbGFuZXMpOworCWlndF9zdWJ0ZXN0X2YoImF0b21pYy1waXBlLSVzLXRpbGlu Zy1ub25lLXBsYW5lcyIsCisJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKSB7CisJCWlu dCBuX3BsYW5lcyA9IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJCWZvciAo aW50IHBsYW5lcyA9IDA7IHBsYW5lcyA8IG5fcGxhbmVzOyBwbGFuZXMrKykKKwkJCXRlc3RfcGxh bmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgdHJ1ZSwgcGxhbmVzLAorCQkJCUxPQ0FMX0k5MTVfRk9S TUFUX01PRF9YX1RJTEVEKTsKKwl9CisKKwlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlwZS0lcy10 aWxpbmcteC1wbGFuZXMiLAorCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSkgeworCQlp bnQgbl9wbGFuZXMgPSBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzOworCQlmb3Ig KGludCBwbGFuZXMgPSAwOyBwbGFuZXMgPCBuX3BsYW5lczsgcGxhbmVzKyspCisJCQl0ZXN0X3Bs YW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBwbGFuZXMsCisJCQkJTE9DQUxfSTkxNV9G T1JNQVRfTU9EX1hfVElMRUQpOworCX0KKworCWlndF9zdWJ0ZXN0X2YoImF0b21pYy1waXBlLSVz LXRpbGluZy14LXBsYW5lcyIsCisJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKSB7CisJ CWludCBuX3BsYW5lcyA9IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJCWZv ciAoaW50IHBsYW5lcyA9IDA7IHBsYW5lcyA8IG5fcGxhbmVzOyBwbGFuZXMrKykKKwkJCXRlc3Rf cGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgdHJ1ZSwgcGxhbmVzLAorCQkJCUxPQ0FMX0k5MTVf Rk9STUFUX01PRF9YX1RJTEVEKTsKKwl9CisKKwlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlwZS0l cy10aWxpbmcteS1wbGFuZXMiLAorCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSkgewor CQlpbnQgbl9wbGFuZXMgPSBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzOworCQlm b3IgKGludCBwbGFuZXMgPSAwOyBwbGFuZXMgPCBuX3BsYW5lczsgcGxhbmVzKyspCisJCQl0ZXN0 X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBwbGFuZXMsCisJCQkJTE9DQUxfSTkx NV9GT1JNQVRfTU9EX1lfVElMRUQpOworCX0KKworCWlndF9zdWJ0ZXN0X2YoImF0b21pYy1waXBl LSVzLXRpbGluZy15LXBsYW5lcyIsCisJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKSB7 CisJCWludCBuX3BsYW5lcyA9IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJ CWZvciAoaW50IHBsYW5lcyA9IDA7IHBsYW5lcyA8IG5fcGxhbmVzOyBwbGFuZXMrKykKKwkJCXRl c3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgdHJ1ZSwgcGxhbmVzLAorCQkJCUxPQ0FMX0k5 MTVfRk9STUFUX01PRF9ZX1RJTEVEKTsKKwl9CisKKwlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlw ZS0lcy10aWxpbmcteWYtcGxhbmVzIiwKKwkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSkp IHsKKwkJaW50IG5fcGxhbmVzID0gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lczsK KwkJZm9yIChpbnQgcGxhbmVzID0gMDsgcGxhbmVzIDwgbl9wbGFuZXM7IHBsYW5lcysrKQorCQkJ dGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhLCBwaXBlLCBmYWxzZSwgcGxhbmVzLAorCQkJCUxPQ0FM X0k5MTVfRk9STUFUX01PRF9ZZl9USUxFRCk7CisJfQorCisJaWd0X3N1YnRlc3RfZigiYXRvbWlj LXBpcGUtJXMtdGlsaW5nLXlmLXBsYW5lcyIsCisJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBp cGUpKSB7CisJCWludCBuX3BsYW5lcyA9IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFu ZXM7CisJCWZvciAoaW50IHBsYW5lcyA9IDA7IHBsYW5lcyA8IG5fcGxhbmVzOyBwbGFuZXMrKykK KwkJCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgdHJ1ZSwgcGxhbmVzLAorCQkJCUxP Q0FMX0k5MTVfRk9STUFUX01PRF9ZZl9USUxFRCk7CisJfQogfQogCiBzdGF0aWMgZGF0YV90IGRh dGE7CkBAIC00NjEsMTUgKzUxNiwxMyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltd KQogCiAJaWd0X2ZpeHR1cmUgewogCQlkYXRhLmRybV9mZCA9IGRybV9vcGVuX2RyaXZlcl9tYXN0 ZXIoRFJJVkVSX0lOVEVMKTsKLQogCQlrbXN0ZXN0X3NldF92dF9ncmFwaGljc19tb2RlKCk7Ci0K IAkJaWd0X3JlcXVpcmVfcGlwZV9jcmMoKTsKIAkJaWd0X2Rpc3BsYXlfaW5pdCgmZGF0YS5kaXNw bGF5LCBkYXRhLmRybV9mZCk7CiAJfQogCiAJZm9yIChpbnQgcGlwZSA9IDA7IHBpcGUgPCBJOTE1 X01BWF9QSVBFUzsgcGlwZSsrKQotCQlydW5fdGVzdHNfZm9yX3BpcGUoJmRhdGEsIHBpcGUpOwor CQlydW5fdGVzdHNfZm9yX3BpcGVfcGxhbmUoJmRhdGEsIHBpcGUpOwogCiAJaWd0X2ZpeHR1cmUg ewogCQlpZ3RfZGlzcGxheV9maW5pKCZkYXRhLmRpc3BsYXkpOwotLSAKMi4xMS4wCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGlu ZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK