From: Robert Foss Subject: [PATCH i-g-t v3 20/33] tests/kms_plane_multiple: Add support for dynamic number of planes Date: Mon, 30 Jan 2017 09:12:11 -0500 Message-ID: <20170130141224.25063-21-robert.foss@collabora.com> References: <20170130141224.25063-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 9CADF6E504 for ; Mon, 30 Jan 2017 14:13:00 +0000 (UTC) In-Reply-To: <20170130141224.25063-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 , Petri Latvala List-Id: intel-gfx@lists.freedesktop.org QWRkIGNoYW5nZXMgcmVmbGVjdGluZyB0aGUgbmV3IHN1cHBvcnQgZm9yIGR5bmFtaWMgbnVtYmVy IG9mIHBsYW5lcyBwZXIgcGlwZS4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQu Zm9zc0Bjb2xsYWJvcmEuY29tPgpSZXZpZXdlZC1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xh QGludGVsLmNvbT4KLS0tCiB0ZXN0cy9rbXNfcGxhbmVfbXVsdGlwbGUuYyB8IDIzMiArKysrKysr KysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAx NDUgaW5zZXJ0aW9ucygrKSwgODcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMva21z X3BsYW5lX211bHRpcGxlLmMgYi90ZXN0cy9rbXNfcGxhbmVfbXVsdGlwbGUuYwppbmRleCAyYjQz ZjBjNS4uYmI4NDg3ODQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wbGFuZV9tdWx0aXBsZS5jCisr KyBiL3Rlc3RzL2ttc19wbGFuZV9tdWx0aXBsZS5jCkBAIC00Nyw4ICs0Nyw4IEBAIHR5cGVkZWYg c3RydWN0IHsKIAlpbnQgZHJtX2ZkOwogCWlndF9kaXNwbGF5X3QgZGlzcGxheTsKIAlpZ3RfcGlw ZV9jcmNfdCAqcGlwZV9jcmM7Ci0JaWd0X3BsYW5lX3QgKnBsYW5lW0lHVF9NQVhfUExBTkVTXTsK LQlzdHJ1Y3QgaWd0X2ZiIGZiW0lHVF9NQVhfUExBTkVTXTsKKwlpZ3RfcGxhbmVfdCAqKnBsYW5l OworCXN0cnVjdCBpZ3RfZmIgKmZiOwogfSBkYXRhX3Q7CiAKIHR5cGVkZWYgc3RydWN0IHsKQEAg LTcwLDIwICs3MCwzOCBAQCBzdHJ1Y3QgewogLyoKICAqIENvbW1vbiBjb2RlIGFjcm9zcyBhbGwg dGVzdHMsIGFjdGluZyBvbiBkYXRhX3QKICAqLwotc3RhdGljIHZvaWQgdGVzdF9pbml0KGRhdGFf dCAqZGF0YSwgZW51bSBwaXBlIHBpcGUpCitzdGF0aWMgdm9pZCB0ZXN0X2luaXQoZGF0YV90ICpk YXRhLCBlbnVtIHBpcGUgcGlwZSwgaW50IG5fcGxhbmVzKQogewogCWRhdGEtPnBpcGVfY3JjID0g aWd0X3BpcGVfY3JjX25ldyhwaXBlLCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7CisKKwlk YXRhLT5wbGFuZSA9IGNhbGxvYyhuX3BsYW5lcywgc2l6ZW9mKGRhdGEtPnBsYW5lKSk7CisJaWd0 X2Fzc2VydF9mKGRhdGEtPnBsYW5lICE9IE5VTEwsICJGYWlsZWQgdG8gYWxsb2NhdGUgbWVtb3J5 IGZvciBwbGFuZXNcbiIpOworCisJZGF0YS0+ZmIgPSBjYWxsb2Mobl9wbGFuZXMsIHNpemVvZihz dHJ1Y3QgaWd0X2ZiKSk7CisJaWd0X2Fzc2VydF9mKGRhdGEtPmZiICE9IE5VTEwsICJGYWlsZWQg dG8gYWxsb2NhdGUgbWVtb3J5IGZvciBGQnNcbiIpOwogfQogCi1zdGF0aWMgdm9pZCB0ZXN0X2Zp bmkoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwgaW50IG1heF9wbGFuZXMpCitz dGF0aWMgdm9pZCB0ZXN0X2ZpbmkoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwg aW50IG5fcGxhbmVzKQogewotCWZvciAoaW50IGkgPSBJR1RfUExBTkVfUFJJTUFSWTsgaSA8PSBt YXhfcGxhbmVzOyBpKyspCi0JCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxhbmVbaV0sIE5VTEwp OworCWZvciAoaW50IGkgPSAwOyBpIDwgbl9wbGFuZXM7IGkrKykgeworCQlpZ3RfcGxhbmVfdCAq cGxhbmUgPSBkYXRhLT5wbGFuZVtpXTsKKwkJaWYgKCFwbGFuZSkKKwkJCWNvbnRpbnVlOworCQlp ZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKKwkJCWNvbnRpbnVlOwor CQlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lLCBOVUxMKTsKKwkJZGF0YS0+cGxhbmVbaV0gPSBOVUxM OworCX0KIAogCS8qIHJlc2V0IHRoZSBjb25zdHJhaW50IG9uIHRoZSBwaXBlICovCiAJaWd0X291 dHB1dF9zZXRfcGlwZShvdXRwdXQsIFBJUEVfQU5ZKTsKIAogCWlndF9waXBlX2NyY19mcmVlKGRh dGEtPnBpcGVfY3JjKTsKKworCWZyZWUoZGF0YS0+cGxhbmUpOworCWRhdGEtPnBsYW5lID0gTlVM TDsKKwlmcmVlKGRhdGEtPmZiKTsKKwlkYXRhLT5mYiA9IE5VTEw7CiB9CiAKIHN0YXRpYyB2b2lk CkBAIC05MSwxMSArMTA5LDEzIEBAIHRlc3RfZ3JhYl9jcmMoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0 cHV0X3QgKm91dHB1dCwgZW51bSBwaXBlIHBpcGUsIGJvb2wgYXRvbWljLAogCSAgICAgIGNvbG9y X3QgKmNvbG9yLCB1aW50NjRfdCB0aWxpbmcsIGlndF9jcmNfdCAqY3JjIC8qIG91dCAqLykKIHsK IAlkcm1Nb2RlTW9kZUluZm8gKm1vZGU7CisJaWd0X3BsYW5lX3QgKnByaW1hcnk7CiAJaW50IHJl dCwgbjsKIAogCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKIAotCWRhdGEtPnBs YW5lW0lHVF9QTEFORV9QUklNQVJZXSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgSUdU X1BMQU5FX1BSSU1BUlkpOworCXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91 dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CisJZGF0YS0+cGxhbmVbcHJpbWFyeS0+aW5k ZXhdID0gcHJpbWFyeTsKIAogCW1vZGUgPSBpZ3Rfb3V0cHV0X2dldF9tb2RlKG91dHB1dCk7CiAK QEAgLTEwMyw5ICsxMjMsOSBAQCB0ZXN0X2dyYWJfY3JjKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1 dF90ICpvdXRwdXQsIGVudW0gcGlwZSBwaXBlLCBib29sIGF0b21pYywKIAkJCSAgICBEUk1fRk9S TUFUX1hSR0I4ODg4LAogCQkJICAgIExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUsCiAJCQkgICAg Y29sb3ItPnJlZCwgY29sb3ItPmdyZWVuLCBjb2xvci0+Ymx1ZSwKLQkJCSAgICAmZGF0YS0+ZmJb SUdUX1BMQU5FX1BSSU1BUlldKTsKKwkJCSAgICAmZGF0YS0+ZmJbcHJpbWFyeS0+aW5kZXhdKTsK IAotCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxhbmVbSUdUX1BMQU5FX1BSSU1BUlldLCAmZGF0 YS0+ZmJbSUdUX1BMQU5FX1BSSU1BUlldKTsKKwlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBsYW5l W3ByaW1hcnktPmluZGV4XSwgJmRhdGEtPmZiW3ByaW1hcnktPmluZGV4XSk7CiAKIAlyZXQgPSBp Z3RfZGlzcGxheV90cnlfY29tbWl0MigmZGF0YS0+ZGlzcGxheSwKIAkJCQkgICAgICBhdG9taWMg PyBDT01NSVRfQVRPTUlDIDogQ09NTUlUX0xFR0FDWSk7CkBAIC0xMjgsMjkgKzE0OCwzNSBAQCB0 ZXN0X2dyYWJfY3JjKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRwdXQsIGVudW0gcGlw ZSBwaXBlLCBib29sIGF0b21pYywKICAqLwogCiBzdGF0aWMgdm9pZAotY3JlYXRlX2ZiX2Zvcl9t b2RlX3Bvc2l0aW9uKGRhdGFfdCAqZGF0YSwgZHJtTW9kZU1vZGVJbmZvICptb2RlLAorY3JlYXRl X2ZiX2Zvcl9tb2RlX3Bvc2l0aW9uKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRwdXQs IGRybU1vZGVNb2RlSW5mbyAqbW9kZSwKIAkJCSAgICBjb2xvcl90ICpjb2xvciwgaW50ICpyZWN0 X3gsIGludCAqcmVjdF95LAogCQkJICAgIGludCAqcmVjdF93LCBpbnQgKnJlY3RfaCwgdWludDY0 X3QgdGlsaW5nLAogCQkJICAgIGludCBtYXhfcGxhbmVzKQogewogCXVuc2lnbmVkIGludCBmYl9p ZDsKIAljYWlyb190ICpjcjsKKwlpZ3RfcGxhbmVfdCAqcHJpbWFyeTsKKworCXByaW1hcnkgPSBp Z3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7 CiAKIAlmYl9pZCA9IGlndF9jcmVhdGVfZmIoZGF0YS0+ZHJtX2ZkLAogCQkJICAgICAgbW9kZS0+ aGRpc3BsYXksIG1vZGUtPnZkaXNwbGF5LAogCQkJICAgICAgRFJNX0ZPUk1BVF9YUkdCODg4OCwK IAkJCSAgICAgIHRpbGluZywKLQkJCSAgICAgICZkYXRhLT5mYltJR1RfUExBTkVfUFJJTUFSWV0p OworCQkJICAgICAgJmRhdGEtPmZiW3ByaW1hcnktPmluZGV4XSk7CiAJaWd0X2Fzc2VydChmYl9p ZCk7CiAKLQljciA9IGlndF9nZXRfY2Fpcm9fY3R4KGRhdGEtPmRybV9mZCwgJmRhdGEtPmZiW0lH VF9QTEFORV9QUklNQVJZXSk7CisJY3IgPSBpZ3RfZ2V0X2NhaXJvX2N0eChkYXRhLT5kcm1fZmQs ICZkYXRhLT5mYltwcmltYXJ5LT5pbmRleF0pOwogCWlndF9wYWludF9jb2xvcihjciwgcmVjdF94 WzBdLCByZWN0X3lbMF0sCiAJCQltb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCiAJCQlj b2xvci0+cmVkLCBjb2xvci0+Z3JlZW4sIGNvbG9yLT5ibHVlKTsKIAotCWZvciAoaW50IGkgPSBJ R1RfUExBTkVfMjsgaSA8PSBtYXhfcGxhbmVzOyBpKyspCisJZm9yIChpbnQgaSA9IDA7IGkgPD0g bWF4X3BsYW5lczsgaSsrKSB7CisJCWlmIChkYXRhLT5wbGFuZVtpXS0+dHlwZSA9PSBEUk1fUExB TkVfVFlQRV9QUklNQVJZKQorCQkJY29udGludWU7CiAJCWlndF9wYWludF9jb2xvcihjciwgcmVj dF94W2ldLCByZWN0X3lbaV0sCiAJCQkJcmVjdF93W2ldLCByZWN0X2hbaV0sIDAuMCwgMC4wLCAw LjApOworCQl9CiAKIAlpZ3RfYXNzZXJ0KGNhaXJvX3N0YXR1cyhjcikgPT0gMCk7CiAJY2Fpcm9f ZGVzdHJveShjcik7CkBAIC0xNTgsMjQgKzE4NCwzOSBAQCBjcmVhdGVfZmJfZm9yX21vZGVfcG9z aXRpb24oZGF0YV90ICpkYXRhLCBkcm1Nb2RlTW9kZUluZm8gKm1vZGUsCiAKIAogc3RhdGljIHZv aWQKLXByZXBhcmVfcGxhbmVzKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIGNvbG9yX3Qg KmNvbG9yLAorcHJlcGFyZV9wbGFuZXMoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZV9pZCwg Y29sb3JfdCAqY29sb3IsCiAJICAgICAgIHVpbnQ2NF90IHRpbGluZywgaW50IG1heF9wbGFuZXMs IGlndF9vdXRwdXRfdCAqb3V0cHV0KQogewogCWRybU1vZGVNb2RlSW5mbyAqbW9kZTsKLQlpbnQg eFtJR1RfTUFYX1BMQU5FU107Ci0JaW50IHlbSUdUX01BWF9QTEFORVNdOwotCWludCBzaXplW0lH VF9NQVhfUExBTkVTXTsKKwlpZ3RfcGlwZV90ICpwaXBlOworCWlndF9wbGFuZV90ICpwcmltYXJ5 OworCWludCAqeDsKKwlpbnQgKnk7CisJaW50ICpzaXplOwogCWludCBpOwogCi0JaWd0X291dHB1 dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUpOworCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBw aXBlX2lkKTsKKwlwcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERS TV9QTEFORV9UWVBFX1BSSU1BUlkpOworCXBpcGUgPSBwcmltYXJ5LT5waXBlOworCisJeCA9IG1h bGxvYyhwaXBlLT5uX3BsYW5lcyAqIHNpemVvZigqeCkpOworCWlndF9hc3NlcnRfZih4LCAiRmFp bGVkIHRvIGFsbG9jYXRlICVsZCBieXRlcyBmb3IgdmFyaWFibGUgeFxuIiwgKGxvbmcgaW50KSAo cGlwZS0+bl9wbGFuZXMgKiBzaXplb2YoKngpKSk7CisJeSA9IG1hbGxvYyhwaXBlLT5uX3BsYW5l cyAqIHNpemVvZigqeSkpOworCWlndF9hc3NlcnRfZih5LCAiRmFpbGVkIHRvIGFsbG9jYXRlICVs ZCBieXRlcyBmb3IgdmFyaWFibGUgeVxuIiwgKGxvbmcgaW50KSAocGlwZS0+bl9wbGFuZXMgKiBz aXplb2YoKnkpKSk7CisJc2l6ZSA9IG1hbGxvYyhwaXBlLT5uX3BsYW5lcyAqIHNpemVvZigqc2l6 ZSkpOworCWlndF9hc3NlcnRfZihzaXplLCAiRmFpbGVkIHRvIGFsbG9jYXRlICVsZCBieXRlcyBm b3IgdmFyaWFibGUgc2l6ZVxuIiwgKGxvbmcgaW50KSAocGlwZS0+bl9wbGFuZXMgKiBzaXplb2Yo KnNpemUpKSk7CiAKIAltb2RlID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRwdXQpOwogCiAJLyog cGxhbmVzIHdpdGggcmFuZG9tIHBvc2l0aW9ucyAqLwotCXhbSUdUX1BMQU5FX1BSSU1BUlldID0g MDsKLQl5W0lHVF9QTEFORV9QUklNQVJZXSA9IDA7Ci0JZm9yIChpID0gSUdUX1BMQU5FXzI7IGkg PD0gbWF4X3BsYW5lczsgaSsrKSB7Ci0JCWlmIChpID09IElHVF9QTEFORV9DVVJTT1IpCisJeFtw cmltYXJ5LT5pbmRleF0gPSAwOworCXlbcHJpbWFyeS0+aW5kZXhdID0gMDsKKwlmb3IgKGkgPSAx OyBpIDw9IG1heF9wbGFuZXM7IGkrKykgeworCQlpZ3RfcGxhbmVfdCAqcGxhbmUgPSBpZ3Rfb3V0 cHV0X2dldF9wbGFuZShvdXRwdXQsIGkpOworCisJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExB TkVfVFlQRV9QUklNQVJZKQorCQkJY29udGludWU7CisJCWVsc2UgaWYgKHBsYW5lLT50eXBlID09 IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCXNpemVbaV0gPSBTSVpFX0NVUlNPUjsKIAkJZWxz ZQogCQkJc2l6ZVtpXSA9IFNJWkVfUExBTkU7CkBAIC0xODMsMTIgKzIyNCwxMiBAQCBwcmVwYXJl X3BsYW5lcyhkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLCBjb2xvcl90ICpjb2xvciwKIAkJ eFtpXSA9IHJhbmQoKSAlIChtb2RlLT5oZGlzcGxheSAtIHNpemVbaV0pOwogCQl5W2ldID0gcmFu ZCgpICUgKG1vZGUtPnZkaXNwbGF5IC0gc2l6ZVtpXSk7CiAKLQkJZGF0YS0+cGxhbmVbaV0gPSBp Z3Rfb3V0cHV0X2dldF9wbGFuZShvdXRwdXQsIGkpOworCQlkYXRhLT5wbGFuZVtpXSA9IHBsYW5l OwogCiAJCWlndF9jcmVhdGVfY29sb3JfZmIoZGF0YS0+ZHJtX2ZkLAogCQkJCSAgICBzaXplW2ld LCBzaXplW2ldLAotCQkJCSAgICBkYXRhLT5wbGFuZVtpXS0+aXNfY3Vyc29yID8gRFJNX0ZPUk1B VF9BUkdCODg4OCA6IERSTV9GT1JNQVRfWFJHQjg4ODgsCi0JCQkJICAgIGRhdGEtPnBsYW5lW2ld LT5pc19jdXJzb3IgPyBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FIDogdGlsaW5nLAorCQkJCSAg ICBkYXRhLT5wbGFuZVtpXS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBEUk1fRk9S TUFUX0FSR0I4ODg4IDogRFJNX0ZPUk1BVF9YUkdCODg4OCwKKwkJCQkgICAgZGF0YS0+cGxhbmVb aV0tPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gTE9DQUxfRFJNX0ZPUk1BVF9NT0Rf Tk9ORSA6IHRpbGluZywKIAkJCQkgICAgY29sb3ItPnJlZCwgY29sb3ItPmdyZWVuLCBjb2xvci0+ Ymx1ZSwKIAkJCQkgICAgJmRhdGEtPmZiW2ldKTsKIApAQCAtMTk3LDE2ICsyMzgsMTYgQEAgcHJl cGFyZV9wbGFuZXMoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgY29sb3JfdCAqY29sb3Is CiAJfQogCiAJLyogcHJpbWFyeSBwbGFuZSAqLwotCWRhdGEtPnBsYW5lW0lHVF9QTEFORV9QUklN QVJZXSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgSUdUX1BMQU5FX1BSSU1BUlkpOwot CWNyZWF0ZV9mYl9mb3JfbW9kZV9wb3NpdGlvbihkYXRhLCBtb2RlLCBjb2xvciwgeCwgeSwKKwlk YXRhLT5wbGFuZVtwcmltYXJ5LT5pbmRleF0gPSBwcmltYXJ5OworCWNyZWF0ZV9mYl9mb3JfbW9k ZV9wb3NpdGlvbihkYXRhLCBvdXRwdXQsIG1vZGUsIGNvbG9yLCB4LCB5LAogCQkJCSAgICBzaXpl LCBzaXplLCB0aWxpbmcsIG1heF9wbGFuZXMpOwotCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxh bmVbSUdUX1BMQU5FX1BSSU1BUlldLCAmZGF0YS0+ZmJbSUdUX1BMQU5FX1BSSU1BUlldKTsKKwlp Z3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBsYW5lW3ByaW1hcnktPmluZGV4XSwgJmRhdGEtPmZiW3By aW1hcnktPmluZGV4XSk7CiB9CiAKIHN0YXRpYyB2b2lkCiB0ZXN0X2F0b21pY19wbGFuZV9wb3Np dGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLAotCQkJCSAgICAg ICBpZ3Rfb3V0cHV0X3QgKm91dHB1dCwgaW50IG1heF9wbGFuZXMsCi0JCQkJICAgICAgIHVpbnQ2 NF90IHRpbGluZykKKwkJCQkgICAgICAgaWd0X291dHB1dF90ICpvdXRwdXQsIGludCBuX3BsYW5l cywKKwkJCQkJICAgaW50IG1heF9wbGFuZXMsIHVpbnQ2NF90IHRpbGluZykKIHsKIAljaGFyIGJ1 ZlsyNTZdOwogCXN0cnVjdCBkcm1fZXZlbnQgKmUgPSAodm9pZCAqKWJ1ZjsKQEAgLTIzMiw3ICsy NzMsNyBAQCB0ZXN0X2F0b21pY19wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRh dGEsIGVudW0gcGlwZSBwaXBlLAogCQkgaWd0X291dHB1dF9uYW1lKG91dHB1dCksIGttc3Rlc3Rf cGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzLAogCQkgaW5mbywgb3B0LnNlZWQpOwogCi0JdGVz dF9pbml0KGRhdGEsIHBpcGUpOworCXRlc3RfaW5pdChkYXRhLCBwaXBlLCBuX3BsYW5lcyk7CiAK IAl0ZXN0X2dyYWJfY3JjKGRhdGEsIG91dHB1dCwgcGlwZSwgdHJ1ZSwgJmJsdWUsIHRpbGluZywK IAkJICAgICAgJnRlc3QucmVmZXJlbmNlX2NyYyk7CkBAIC0yNjksMTMgKzMxMCwxMyBAQCB0ZXN0 X2F0b21pY19wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0gcGlw ZSBwaXBlLAogCiAJaWd0X3BpcGVfY3JjX3N0b3AoZGF0YS0+cGlwZV9jcmMpOwogCi0JdGVzdF9m aW5pKGRhdGEsIG91dHB1dCwgbWF4X3BsYW5lcyk7CisJdGVzdF9maW5pKGRhdGEsIG91dHB1dCwg bl9wbGFuZXMpOwogfQogCiBzdGF0aWMgdm9pZAogdGVzdF9sZWdhY3lfcGxhbmVfcG9zaXRpb25f d2l0aF9vdXRwdXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwKLQkJCQkgICAgICAgaWd0 X291dHB1dF90ICpvdXRwdXQsIGludCBtYXhfcGxhbmVzLAotCQkJCSAgICAgICB1aW50NjRfdCB0 aWxpbmcpCisJCQkJICAgICAgIGlndF9vdXRwdXRfdCAqb3V0cHV0LCBpbnQgbl9wbGFuZXMsCisJ CQkJCSAgIGludCBtYXhfcGxhbmVzLCB1aW50NjRfdCB0aWxpbmcpCiB7CiAJdGVzdF9wb3NpdGlv bl90IHRlc3QgPSB7IC5kYXRhID0gZGF0YSB9OwogCWNvbG9yX3QgYmx1ZSAgPSB7IDAuMGYsIDAu MGYsIDEuMGYgfTsKQEAgLTI5OCw3ICszMzksNyBAQCB0ZXN0X2xlZ2FjeV9wbGFuZV9wb3NpdGlv bl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLAogCQkgaWd0X291dHB1 dF9uYW1lKG91dHB1dCksIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzLAogCQkg aW5mbywgb3B0LnNlZWQpOwogCi0JdGVzdF9pbml0KGRhdGEsIHBpcGUpOworCXRlc3RfaW5pdChk YXRhLCBwaXBlLCBuX3BsYW5lcyk7CiAKIAl0ZXN0X2dyYWJfY3JjKGRhdGEsIG91dHB1dCwgcGlw ZSwgZmFsc2UsICZibHVlLCB0aWxpbmcsCiAJCSAgICAgICZ0ZXN0LnJlZmVyZW5jZV9jcmMpOwpA QCAtMzIwLDEyICszNjEsMTIgQEAgdGVzdF9sZWdhY3lfcGxhbmVfcG9zaXRpb25fd2l0aF9vdXRw dXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwKIAogCWlndF9waXBlX2NyY19zdG9wKGRh dGEtPnBpcGVfY3JjKTsKIAotCXRlc3RfZmluaShkYXRhLCBvdXRwdXQsIG1heF9wbGFuZXMpOwor CXRlc3RfZmluaShkYXRhLCBvdXRwdXQsIG5fcGxhbmVzKTsKIH0KIAogc3RhdGljIHZvaWQKLXRl c3RfcGxhbmVfcG9zaXRpb24oZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgYm9vbCBhdG9t aWMsIGludCBtYXhfcGxhbmVzLAotCQkgICAgdWludDY0X3QgdGlsaW5nKQordGVzdF9wbGFuZV9w b3NpdGlvbihkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLCBib29sIGF0b21pYywgaW50IG5f cGxhbmVzLAorCQkgICAgaW50IG1heF9wbGFuZXMsIHVpbnQ2NF90IHRpbGluZykKIHsKIAlpZ3Rf b3V0cHV0X3QgKm91dHB1dDsKIAlpbnQgY29ubmVjdGVkX291dHM7CkBAIC0zNTEsMTEgKzM5Miwx MyBAQCB0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIGJv b2wgYXRvbWljLCBpbnQgbWF4X3BsYW5lcywKIAkJaWYgKGF0b21pYykKIAkJCXRlc3RfYXRvbWlj X3BsYW5lX3Bvc2l0aW9uX3dpdGhfb3V0cHV0KGRhdGEsIHBpcGUsCiAJCQkJCQkJICAgICAgIG91 dHB1dCwKKwkJCQkJCQkJICAgbl9wbGFuZXMsCiAJCQkJCQkJICAgICAgIG1heF9wbGFuZXMsCiAJ CQkJCQkJICAgICAgIHRpbGluZyk7CiAJCWVsc2UKIAkJCXRlc3RfbGVnYWN5X3BsYW5lX3Bvc2l0 aW9uX3dpdGhfb3V0cHV0KGRhdGEsIHBpcGUsCiAJCQkJCQkJICAgICAgIG91dHB1dCwKKwkJCQkJ CQkJICAgbl9wbGFuZXMsCiAJCQkJCQkJICAgICAgIG1heF9wbGFuZXMsCiAJCQkJCQkJICAgICAg IHRpbGluZyk7CiAKQEAgLTM2Nyw1NCArNDEwLDcxIEBAIHRlc3RfcGxhbmVfcG9zaXRpb24oZGF0 YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgYm9vbCBhdG9taWMsIGludCBtYXhfcGxhbmVzLAog fQogCiBzdGF0aWMgdm9pZAotcnVuX3Rlc3RzX2Zvcl9waXBlX3BsYW5lKGRhdGFfdCAqZGF0YSwg ZW51bSBwaXBlIHBpcGUsIGludCBtYXhfcGxhbmVzKQorcnVuX3Rlc3RzX2Zvcl9waXBlX3BsYW5l KGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUpCiB7Ci0JaWd0X3N1YnRlc3RfZigibGVnYWN5 LXBpcGUtJXMtdGlsaW5nLW5vbmUtcGxhbmVzLSVkIiwKLQkJICAgICAga21zdGVzdF9waXBlX25h bWUocGlwZSksIG1heF9wbGFuZXMpCi0JCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwg ZmFsc2UsIG1heF9wbGFuZXMsCi0JCQkJICAgIExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUpOwot Ci0JaWd0X3N1YnRlc3RfZigiYXRvbWljLXBpcGUtJXMtdGlsaW5nLW5vbmUtcGxhbmVzLSVkIiwK LQkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSksIG1heF9wbGFuZXMpCi0JCXRlc3RfcGxh bmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgdHJ1ZSwgbWF4X3BsYW5lcywKLQkJCQkgICAgTE9DQUxf STkxNV9GT1JNQVRfTU9EX1hfVElMRUQpOwotCi0JaWd0X3N1YnRlc3RfZigibGVnYWN5LXBpcGUt JXMtdGlsaW5nLXgtcGxhbmVzLSVkIiwKLQkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSks IG1heF9wbGFuZXMpCi0JCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgZmFsc2UsIG1h eF9wbGFuZXMsCi0JCQkJICAgIExPQ0FMX0k5MTVfRk9STUFUX01PRF9YX1RJTEVEKTsKLQotCWln dF9zdWJ0ZXN0X2YoImF0b21pYy1waXBlLSVzLXRpbGluZy14LXBsYW5lcy0lZCIsCi0JCSAgICAg IGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxhbmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0 aW9uKGRhdGEsIHBpcGUsIHRydWUsIG1heF9wbGFuZXMsCi0JCQkJICAgIExPQ0FMX0k5MTVfRk9S TUFUX01PRF9YX1RJTEVEKTsKLQotCWlndF9zdWJ0ZXN0X2YoImxlZ2FjeS1waXBlLSVzLXRpbGlu Zy15LXBsYW5lcy0lZCIsCi0JCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtYXhfcGxh bmVzKQotCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIGZhbHNlLCBtYXhfcGxhbmVz LAotCQkJCSAgICBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCk7Ci0KLQlpZ3Rfc3VidGVz dF9mKCJhdG9taWMtcGlwZS0lcy10aWxpbmcteS1wbGFuZXMtJWQiLAotCQkgICAgICBrbXN0ZXN0 X3BpcGVfbmFtZShwaXBlKSwgbWF4X3BsYW5lcykKLQkJdGVzdF9wbGFuZV9wb3NpdGlvbihkYXRh LCBwaXBlLCB0cnVlLCBtYXhfcGxhbmVzLAotCQkJCSAgICBMT0NBTF9JOTE1X0ZPUk1BVF9NT0Rf WV9USUxFRCk7Ci0KLQlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlwZS0lcy10aWxpbmcteWYtcGxh bmVzLSVkIiwKLQkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSksIG1heF9wbGFuZXMpCi0J CXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgZmFsc2UsIG1heF9wbGFuZXMsCi0JCQkJ ICAgIExPQ0FMX0k5MTVfRk9STUFUX01PRF9ZZl9USUxFRCk7Ci0KLQlpZ3Rfc3VidGVzdF9mKCJh dG9taWMtcGlwZS0lcy10aWxpbmcteWYtcGxhbmVzLSVkIiwKLQkJICAgICAga21zdGVzdF9waXBl X25hbWUocGlwZSksIG1heF9wbGFuZXMpCi0JCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlw ZSwgdHJ1ZSwgbWF4X3BsYW5lcywKLQkJCQkgICAgTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lmX1RJ TEVEKTsKLX0KKwlpZ3Rfc3VidGVzdF9mKCJsZWdhY3ktcGlwZS0lcy10aWxpbmctbm9uZS1wbGFu ZXMiLAorCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSkgeworCQlpbnQgbl9wbGFuZXMg PSBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzOworCQlmb3IgKGludCBwbGFuZXMg PSAwOyBwbGFuZXMgPCBuX3BsYW5lczsgcGxhbmVzKyspCisJCQl0ZXN0X3BsYW5lX3Bvc2l0aW9u KGRhdGEsIHBpcGUsIGZhbHNlLCAgbl9wbGFuZXMsCisJCQkJcGxhbmVzLCBMT0NBTF9EUk1fRk9S TUFUX01PRF9OT05FKTsKKwl9CiAKLXN0YXRpYyB2b2lkCi1ydW5fdGVzdHNfZm9yX3BpcGUoZGF0 YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSkKLXsKLQlmb3IgKGludCBwbGFuZXMgPSBJR1RfUExB TkVfUFJJTUFSWTsgcGxhbmVzIDwgSUdUX01BWF9QTEFORVM7IHBsYW5lcysrKQotCQlydW5fdGVz dHNfZm9yX3BpcGVfcGxhbmUoZGF0YSwgcGlwZSwgcGxhbmVzKTsKKwlpZ3Rfc3VidGVzdF9mKCJh dG9taWMtcGlwZS0lcy10aWxpbmctbm9uZS1wbGFuZXMiLAorCQkgICAgICBrbXN0ZXN0X3BpcGVf bmFtZShwaXBlKSkgeworCQlpbnQgbl9wbGFuZXMgPSBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVd Lm5fcGxhbmVzOworCQlmb3IgKGludCBwbGFuZXMgPSAwOyBwbGFuZXMgPCBuX3BsYW5lczsgcGxh bmVzKyspCisJCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIHRydWUsIG5fcGxhbmVz LAorCQkJCXBsYW5lcywJTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQpOworCX0KKworCWln dF9zdWJ0ZXN0X2YoImxlZ2FjeS1waXBlLSVzLXRpbGluZy14LXBsYW5lcyIsCisJCSAgICAgIGtt c3Rlc3RfcGlwZV9uYW1lKHBpcGUpKSB7CisJCWludCBuX3BsYW5lcyA9IGRhdGEtPmRpc3BsYXku cGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJCWZvciAoaW50IHBsYW5lcyA9IDA7IHBsYW5lcyA8IG5f cGxhbmVzOyBwbGFuZXMrKykKKwkJCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgZmFs c2UsIG5fcGxhbmVzLAorCQkJCXBsYW5lcywgTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1hfVElMRUQp OworCX0KKworCWlndF9zdWJ0ZXN0X2YoImF0b21pYy1waXBlLSVzLXRpbGluZy14LXBsYW5lcyIs CisJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKSB7CisJCWludCBuX3BsYW5lcyA9IGRh dGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJCWZvciAoaW50IHBsYW5lcyA9IDA7 IHBsYW5lcyA8IG5fcGxhbmVzOyBwbGFuZXMrKykKKwkJCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0 YSwgcGlwZSwgdHJ1ZSwgbl9wbGFuZXMsCisJCQkJcGxhbmVzLCBMT0NBTF9JOTE1X0ZPUk1BVF9N T0RfWF9USUxFRCk7CisJfQorCisJaWd0X3N1YnRlc3RfZigibGVnYWN5LXBpcGUtJXMtdGlsaW5n LXktcGxhbmVzIiwKKwkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSkpIHsKKwkJaW50IG5f cGxhbmVzID0gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lczsKKwkJZm9yIChpbnQg cGxhbmVzID0gMDsgcGxhbmVzIDwgbl9wbGFuZXM7IHBsYW5lcysrKQorCQkJdGVzdF9wbGFuZV9w b3NpdGlvbihkYXRhLCBwaXBlLCBmYWxzZSwgbl9wbGFuZXMsCisJCQkJcGxhbmVzLCBMT0NBTF9J OTE1X0ZPUk1BVF9NT0RfWV9USUxFRCk7CisJfQorCisJaWd0X3N1YnRlc3RfZigiYXRvbWljLXBp cGUtJXMtdGlsaW5nLXktcGxhbmVzIiwKKwkJICAgICAga21zdGVzdF9waXBlX25hbWUocGlwZSkp IHsKKwkJaW50IG5fcGxhbmVzID0gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lczsK KwkJZm9yIChpbnQgcGxhbmVzID0gMDsgcGxhbmVzIDwgbl9wbGFuZXM7IHBsYW5lcysrKQorCQkJ dGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhLCBwaXBlLCB0cnVlLCBuX3BsYW5lcywKKwkJCQlwbGFu ZXMsIExPQ0FMX0k5MTVfRk9STUFUX01PRF9ZX1RJTEVEKTsKKwl9CisKKwlpZ3Rfc3VidGVzdF9m KCJsZWdhY3ktcGlwZS0lcy10aWxpbmcteWYtcGxhbmVzIiwKKwkJICAgICAga21zdGVzdF9waXBl X25hbWUocGlwZSkpIHsKKwkJaW50IG5fcGxhbmVzID0gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBl XS5uX3BsYW5lczsKKwkJZm9yIChpbnQgcGxhbmVzID0gMDsgcGxhbmVzIDwgbl9wbGFuZXM7IHBs YW5lcysrKQorCQkJdGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhLCBwaXBlLCBmYWxzZSwgbl9wbGFu ZXMsCisJCQkJcGxhbmVzLCBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpOworCX0KKwor CWlndF9zdWJ0ZXN0X2YoImF0b21pYy1waXBlLSVzLXRpbGluZy15Zi1wbGFuZXMiLAorCQkgICAg ICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSkgeworCQlpbnQgbl9wbGFuZXMgPSBkYXRhLT5kaXNw bGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzOworCQlmb3IgKGludCBwbGFuZXMgPSAwOyBwbGFuZXMg PCBuX3BsYW5lczsgcGxhbmVzKyspCisJCQl0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUs IHRydWUsIG5fcGxhbmVzLAorCQkJCXBsYW5lcywgTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lmX1RJ TEVEKTsKKwl9CiB9CiAKIHN0YXRpYyBkYXRhX3QgZGF0YTsKQEAgLTQ2MSwxNSArNTIxLDEzIEBA IGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAKIAlpZ3RfZml4dHVyZSB7CiAJCWRh dGEuZHJtX2ZkID0gZHJtX29wZW5fZHJpdmVyX21hc3RlcihEUklWRVJfSU5URUwpOwotCiAJCWtt c3Rlc3Rfc2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsKLQogCQlpZ3RfcmVxdWlyZV9waXBlX2NyYygp OwogCQlpZ3RfZGlzcGxheV9pbml0KCZkYXRhLmRpc3BsYXksIGRhdGEuZHJtX2ZkKTsKIAl9CiAK IAlmb3IgKGludCBwaXBlID0gMDsgcGlwZSA8IEk5MTVfTUFYX1BJUEVTOyBwaXBlKyspCi0JCXJ1 bl90ZXN0c19mb3JfcGlwZSgmZGF0YSwgcGlwZSk7CisJCXJ1bl90ZXN0c19mb3JfcGlwZV9wbGFu ZSgmZGF0YSwgcGlwZSk7CiAKIAlpZ3RfZml4dHVyZSB7CiAJCWlndF9kaXNwbGF5X2ZpbmkoJmRh dGEuZGlzcGxheSk7Ci0tIAoyLjExLjAuNDUzLmc3ODdmNzVmMDUKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50 ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=