From: Robert Foss Subject: [PATCH i-g-t v3 04/33] lib/igt_kms: Implement dynamic plane count support Date: Mon, 30 Jan 2017 09:11:55 -0500 Message-ID: <20170130141224.25063-5-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 1F89E6E45B for ; Mon, 30 Jan 2017 14:12:40 +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 SW4gdXBjb21pbmcgZHJtLW1pc2MtbmV4dCBjaGFuZ2VzLCB0aGUgbnVtYmVyIG9mIHBsYW5lcyBw ZXIgcGlwZSBoYXMKYmVlbiBpbmNyZWFzZWQgYXMgbW9yZSB0aGFuIG9uZSBwcmltYXJ5IHBsYW5l IGNhbiBiZSBhc3NvY2lhdGVkIHdpdGgKYSBwaXBlLgoKVGhlIHNpbXBsZSBmaXggZm9yIHRoaXMg d291bGQgYmUgdG8gc2ltcGx5IGJ1bXAgaGFyZGNvZGVkIHZhbHVlIGZvcgpudW1iZXIgb2YgZnJh bWVzIHBlciBwaXBlLgpCdXQgYSBiZXR0ZXIgc29sdXRpb24gd291bGQgYmUgdG8gYWRkIHN1cHBv cnQgZm9yIGR5bmFtaWMgbnVtYmVyIG9mCnBsYW5lcyBwZXIgcGlwZSB0byBpLWctdC4KClNpZ25l ZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQuZm9zc0Bjb2xsYWJvcmEuY29tPgpSZXZpZXdl ZC1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xhQGludGVsLmNvbT4KLS0tCiBsaWIvaWd0X2tt cy5jIHwgMTYwICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0KIGxpYi9pZ3Rfa21zLmggfCAgMzcgKysrKysrKystLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMTQzIGluc2VydGlvbnMoKyksIDU0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2xpYi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmluZGV4IGEwNzNjOGMzLi45NjFhM2U0ZCAx MDA2NDQKLS0tIGEvbGliL2lndF9rbXMuYworKysgYi9saWIvaWd0X2ttcy5jCkBAIC0zNDksNyAr MzQ5LDcgQEAgaW50IGttc3Rlc3RfcGlwZV90b19pbmRleChjaGFyIHBpcGUpCiAgKiBrbXN0ZXN0 X3BsYW5lX25hbWU6CiAgKiBAcGxhbmU6IGRpc3BsYXkgcGxhbmUKICAqCi0gKiBSZXR1cm5zOiBT dHJpbmcgcmVwcmVzbnRpbmcgQHBpcGUsIGUuZy4gInBsYW5lMSIuCisgKiBSZXR1cm5zOiBTdHJp bmcgcmVwcmVzZW50aW5nIEBwbGFuZSwgZS5nLiAicGxhbmUxIi4KICAqLwogY29uc3QgY2hhciAq a21zdGVzdF9wbGFuZV9uYW1lKGVudW0gaWd0X3BsYW5lIHBsYW5lKQogewpAQCAtMzcxLDYgKzM3 MSwyNSBAQCBjb25zdCBjaGFyICprbXN0ZXN0X3BsYW5lX25hbWUoZW51bSBpZ3RfcGxhbmUgcGxh bmUpCiAJcmV0dXJuIG5hbWVzW3BsYW5lXTsKIH0KIAorLyoqCisgKiBrbXN0ZXN0X3BsYW5lX3R5 cGVfbmFtZToKKyAqIEBwbGFuZTogZGlzcGxheSBwbGFuZQorICoKKyAqIFJldHVybnM6IFN0cmlu ZyByZXByZXNlbnRpbmcgQHBsYW5lLCBlLmcuICJvdmVybGF5Ii4KKyAqLworY29uc3QgY2hhciAq a21zdGVzdF9wbGFuZV90eXBlX25hbWUoaW50IHBsYW5lX3R5cGUpCit7CisJc3RhdGljIGNvbnN0 IGNoYXIgKm5hbWVzW10gPSB7CisJCVtEUk1fUExBTkVfVFlQRV9PVkVSTEFZXSA9ICJvdmVybGF5 IiwKKwkJW0RSTV9QTEFORV9UWVBFX1BSSU1BUlldID0gInByaW1hcnkiLAorCQlbRFJNX1BMQU5F X1RZUEVfQ1VSU09SXSA9ICJjdXJzb3IiLAorCX07CisKKwlpZ3RfYXNzZXJ0KHBsYW5lX3R5cGUg PCBBUlJBWV9TSVpFKG5hbWVzKSAmJiBuYW1lc1twbGFuZV90eXBlXSk7CisKKwlyZXR1cm4gbmFt ZXNbcGxhbmVfdHlwZV07Cit9CisKIHN0YXRpYyBjb25zdCBjaGFyICptb2RlX3N0ZXJlb19uYW1l KGNvbnN0IGRybU1vZGVNb2RlSW5mbyAqbW9kZSkKIHsKIAlzd2l0Y2ggKG1vZGUtPmZsYWdzICYg RFJNX01PREVfRkxBR18zRF9NQVNLKSB7CkBAIC0xNTcwLDE0ICsxNTg5LDE3IEBAIHZvaWQgaWd0 X2Rpc3BsYXlfaW5pdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBpbnQgZHJtX2ZkKQogCWZvciAo aSA9IDA7IGkgPCBkaXNwbGF5LT5uX3BpcGVzOyBpKyspIHsKIAkJaWd0X3BpcGVfdCAqcGlwZSA9 ICZkaXNwbGF5LT5waXBlc1tpXTsKIAkJaWd0X3BsYW5lX3QgKnBsYW5lOwotCQlpbnQgcCA9IElH VF9QTEFORV8yOworCQlpbnQgcCA9IDE7CiAJCWludCBqLCB0eXBlOwotCQl1aW50OF90IG5fcGxh bmVzID0gMDsKKwkJdWludDhfdCBsYXN0X3BsYW5lID0gMCwgbl9wbGFuZXMgPSAwOwogCQl1aW50 NjRfdCBwcm9wX3ZhbHVlOwogCiAJCXBpcGUtPmNydGNfaWQgPSByZXNvdXJjZXMtPmNydGNzW2ld OwogCQlwaXBlLT5kaXNwbGF5ID0gZGlzcGxheTsKIAkJcGlwZS0+cGlwZSA9IGk7CisJCXBpcGUt PnBsYW5lX2N1cnNvciA9IC0xOworCQlwaXBlLT5wbGFuZV9wcmltYXJ5ID0gLTE7CisJCXBpcGUt PnBsYW5lcyA9IE5VTEw7CiAKIAkJZ2V0X2NydGNfcHJvcGVydHkoZGlzcGxheS0+ZHJtX2ZkLCBw aXBlLT5jcnRjX2lkLAogCQkJCSAgICAiYmFja2dyb3VuZF9jb2xvciIsCkBAIC0xNjAzLDYgKzE2 MjUsMjcgQEAgdm9pZCBpZ3RfZGlzcGxheV9pbml0KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGlu dCBkcm1fZmQpCiAKIAkJaWd0X2F0b21pY19maWxsX3BpcGVfcHJvcHMoZGlzcGxheSwgcGlwZSwg SUdUX05VTV9DUlRDX1BST1BTLCBpZ3RfY3J0Y19wcm9wX25hbWVzKTsKIAorCQkvKiBjb3VudCBu dW1iZXIgb2YgdmFsaWQgcGxhbmVzICovCisJCWZvciAoaiA9IDA7IGogPCBwbGFuZV9yZXNvdXJj ZXMtPmNvdW50X3BsYW5lczsgaisrKSB7CisJCQlkcm1Nb2RlUGxhbmUgKmRybV9wbGFuZTsKKwor CQkJZHJtX3BsYW5lID0gZHJtTW9kZUdldFBsYW5lKGRpc3BsYXktPmRybV9mZCwKKwkJCQkJCSAg ICBwbGFuZV9yZXNvdXJjZXMtPnBsYW5lc1tqXSk7CisJCQlpZ3RfYXNzZXJ0KGRybV9wbGFuZSk7 CisKKwkJCWlmICghKGRybV9wbGFuZS0+cG9zc2libGVfY3J0Y3MgJiAoMSA8PCBpKSkpIHsKKwkJ CQlkcm1Nb2RlRnJlZVBsYW5lKGRybV9wbGFuZSk7CisJCQkJY29udGludWU7CisJCQl9CisKKwkJ CW5fcGxhbmVzKys7CisJCX0KKworCQlpZ3RfYXNzZXJ0X2x0ZSgwLCBuX3BsYW5lcyk7CisJCXBp cGUtPnBsYW5lcyA9IGNhbGxvYyhzaXplb2YoaWd0X3BsYW5lX3QpLCBuX3BsYW5lcyk7CisJCWln dF9hc3NlcnRfZihwaXBlLT5wbGFuZXMsICJGYWlsZWQgdG8gYWxsb2NhdGUgbWVtb3J5IGZvciAl ZCBwbGFuZXNcbiIsIG5fcGxhbmVzKTsKKwkJbGFzdF9wbGFuZSA9IG5fcGxhbmVzIC0gMTsKKwog CQkvKiBhZGQgdGhlIHBsYW5lcyB0aGF0IGNhbiBiZSB1c2VkIHdpdGggdGhhdCBwaXBlICovCiAJ CWZvciAoaiA9IDA7IGogPCBwbGFuZV9yZXNvdXJjZXMtPmNvdW50X3BsYW5lczsgaisrKSB7CiAJ CQlkcm1Nb2RlUGxhbmUgKmRybV9wbGFuZTsKQEAgLTE2MjAsMjIgKzE2NjMsMjcgQEAgdm9pZCBp Z3RfZGlzcGxheV9pbml0KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGludCBkcm1fZmQpCiAJCQkJ CQkgIHBsYW5lX3Jlc291cmNlcy0+cGxhbmVzW2pdKTsKIAkJCXN3aXRjaCAodHlwZSkgewogCQkJ Y2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOgotCQkJCXBsYW5lID0gJnBpcGUtPnBsYW5lc1tJ R1RfUExBTkVfUFJJTUFSWV07CisJCQkJaWYgKHBpcGUtPnBsYW5lX3ByaW1hcnkgPT0gLTEpIHsK KwkJCQkJcGxhbmUgPSAmcGlwZS0+cGxhbmVzWzBdOworCQkJCQlwbGFuZS0+aW5kZXggPSAwOwor CQkJCQlwaXBlLT5wbGFuZV9wcmltYXJ5ID0gMDsKKwkJCQl9IGVsc2UgeworCQkJCQlwbGFuZSA9 ICZwaXBlLT5wbGFuZXNbcF07CisJCQkJCXBsYW5lLT5pbmRleCA9IHArKzsKKwkJCQl9CiAJCQkJ cGxhbmUtPmlzX3ByaW1hcnkgPSAxOwotCQkJCXBsYW5lLT5pbmRleCA9IElHVF9QTEFORV9QUklN QVJZOwogCQkJCWJyZWFrOwogCQkJY2FzZSBEUk1fUExBTkVfVFlQRV9DVVJTT1I6Ci0JCQkJLyoK LQkJCQkgKiBDdXJzb3Igc2hvdWxkIGJlIHRoZSBoaWdoZXN0IGluZGV4IGluIG91cgotCQkJCSAq IGludGVybmFsIGxpc3QsIGJ1dCB3ZSBkb24ndCBrbm93IHdoYXQgdGhhdAotCQkJCSAqIGlzIHll dC4gIEp1c3Qgc3RpY2sgaXQgaW4gdGhlIGxhc3Qgc2xvdAotCQkJCSAqIGZvciBub3cgYW5kIHdl J2xsIG1vdmUgaXQgbGF0ZXIsIGlmCi0JCQkJICogbmVjZXNzYXJ5LgotCQkJCSAqLwotCQkJCXBs YW5lID0gJnBpcGUtPnBsYW5lc1tJR1RfUExBTkVfQ1VSU09SXTsKLQkJCQlwbGFuZS0+aXNfY3Vy c29yID0gMTsKLQkJCQlwbGFuZS0+aW5kZXggPSBJR1RfUExBTkVfQ1VSU09SOworCQkJCWlmIChw aXBlLT5wbGFuZV9jdXJzb3IgPT0gLTEpIHsKKwkJCQkJcGxhbmUgPSAmcGlwZS0+cGxhbmVzW2xh c3RfcGxhbmVdOworCQkJCQlwbGFuZS0+aW5kZXggPSBsYXN0X3BsYW5lOworCQkJCQlwaXBlLT5w bGFuZV9jdXJzb3IgPSBsYXN0X3BsYW5lOworCQkJCX0gZWxzZSB7CisJCQkJCXBsYW5lID0gJnBp cGUtPnBsYW5lc1twXTsKKwkJCQkJcGxhbmUtPmluZGV4ID0gcCsrOworCQkJCX0KIAkJCQlkaXNw bGF5LT5oYXNfY3Vyc29yX3BsYW5lID0gdHJ1ZTsKKwkJCQlwbGFuZS0+aXNfY3Vyc29yID0gMTsK IAkJCQlicmVhazsKIAkJCWRlZmF1bHQ6CiAJCQkJcGxhbmUgPSAmcGlwZS0+cGxhbmVzW3BdOwpA QCAtMTY0Myw3ICsxNjkxLDggQEAgdm9pZCBpZ3RfZGlzcGxheV9pbml0KGlndF9kaXNwbGF5X3Qg KmRpc3BsYXksIGludCBkcm1fZmQpCiAJCQkJYnJlYWs7CiAJCQl9CiAKLQkJCW5fcGxhbmVzKys7 CisJCQlpZ3RfYXNzZXJ0X2YocGxhbmUtPmluZGV4IDwgbl9wbGFuZXMsICJuX3BsYW5lcyA8IHBs YW5lLT5pbmRleCBmYWlsZWRcbiIpOworCQkJcGxhbmUtPnR5cGUgPSB0eXBlOwogCQkJcGxhbmUt PnBpcGUgPSBwaXBlOwogCQkJcGxhbmUtPmRybV9wbGFuZSA9IGRybV9wbGFuZTsKIApAQCAtMTY2 NCw3ICsxNzEzLDcgQEAgdm9pZCBpZ3RfZGlzcGxheV9pbml0KGlndF9kaXNwbGF5X3QgKmRpc3Bs YXksIGludCBkcm1fZmQpCiAJCSAqIEF0IHRoZSBiYXJlIG1pbmltdW0sIHdlIHNob3VsZCBleHBl Y3QgdG8gaGF2ZSBhIHByaW1hcnkKIAkJICogcGxhbmUKIAkJICovCi0JCWlndF9hc3NlcnQocGlw ZS0+cGxhbmVzW0lHVF9QTEFORV9QUklNQVJZXS5kcm1fcGxhbmUpOworCQlpZ3RfYXNzZXJ0KHBp cGUtPnBsYW5lc1twaXBlLT5wbGFuZV9wcmltYXJ5XS5kcm1fcGxhbmUpOwogCiAJCWlmIChkaXNw bGF5LT5oYXNfY3Vyc29yX3BsYW5lKSB7CiAJCQkvKgpAQCAtMTY3MiwxMSArMTcyMSwxMSBAQCB2 b2lkIGlndF9kaXNwbGF5X2luaXQoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgaW50IGRybV9mZCkK IAkJCSAqIG9ubHkgMSBzcHJpdGUsIHRoYXQncyB0aGUgd3Jvbmcgc2xvdCBhbmQgd2UgbmVlZCB0 bwogCQkJICogbW92ZSBpdCBkb3duLgogCQkJICovCi0JCQlpZiAocCAhPSBJR1RfUExBTkVfQ1VS U09SKSB7CisJCQlpZiAocCAhPSBsYXN0X3BsYW5lKSB7CiAJCQkJcGlwZS0+cGxhbmVzW3BdID0K LQkJCQkJcGlwZS0+cGxhbmVzW0lHVF9QTEFORV9DVVJTT1JdOworCQkJCQlwaXBlLT5wbGFuZXNb bGFzdF9wbGFuZV07CiAJCQkJcGlwZS0+cGxhbmVzW3BdLmluZGV4ID0gcDsKLQkJCQltZW1zZXQo JnBpcGUtPnBsYW5lc1tJR1RfUExBTkVfQ1VSU09SXSwgMCwKKwkJCQltZW1zZXQoJnBpcGUtPnBs YW5lc1tsYXN0X3BsYW5lXSwgMCwKIAkJCQkgICAgICAgc2l6ZW9mICpwbGFuZSk7CiAJCQl9CiAJ CX0gZWxzZSB7CkBAIC0xNjg0LDcgKzE3MzMsNyBAQCB2b2lkIGlndF9kaXNwbGF5X2luaXQoaWd0 X2Rpc3BsYXlfdCAqZGlzcGxheSwgaW50IGRybV9mZCkKIAkJCXBsYW5lID0gJnBpcGUtPnBsYW5l c1twXTsKIAkJCXBsYW5lLT5waXBlID0gcGlwZTsKIAkJCXBsYW5lLT5pbmRleCA9IHA7Ci0JCQlw bGFuZS0+aXNfY3Vyc29yID0gdHJ1ZTsKKwkJCXBsYW5lLT50eXBlID0gRFJNX1BMQU5FX1RZUEVf Q1VSU09SOwogCQl9CiAKIAkJcGlwZS0+bl9wbGFuZXMgPSBuX3BsYW5lczsKQEAgLTE2OTIsOSAr MTc0MSw2IEBAIHZvaWQgaWd0X2Rpc3BsYXlfaW5pdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBp bnQgZHJtX2ZkKQogCQlmb3JfZWFjaF9wbGFuZV9vbl9waXBlKGRpc3BsYXksIGksIHBsYW5lKQog CQkJcGxhbmUtPmZiX2NoYW5nZWQgPSB0cnVlOwogCi0JCS8qIG1ha2Ugc3VyZSB3ZSBkb24ndCBv dmVyZmxvdyB0aGUgcGxhbmUgYXJyYXkgKi8KLQkJaWd0X2Fzc2VydF9sdGUocGlwZS0+bl9wbGFu ZXMsIElHVF9NQVhfUExBTkVTKTsKLQogCQlwaXBlLT5tb2RlX2NoYW5nZWQgPSB0cnVlOwogCX0K IApAQCAtMTc3Myw2ICsxODE5LDkgQEAgc3RhdGljIHZvaWQgaWd0X3BpcGVfZmluaShpZ3RfcGlw ZV90ICpwaXBlKQogCQkJcGxhbmUtPmRybV9wbGFuZSA9IE5VTEw7CiAJCX0KIAl9CisKKwlmcmVl KHBpcGUtPnBsYW5lcyk7CisJcGlwZS0+cGxhbmVzID0gTlVMTDsKIH0KIAogc3RhdGljIHZvaWQg aWd0X291dHB1dF9maW5pKGlndF9vdXRwdXRfdCAqb3V0cHV0KQpAQCAtMTg2MSwyMCArMTkxMCw0 MSBAQCBzdGF0aWMgaWd0X3BpcGVfdCAqaWd0X291dHB1dF9nZXRfZHJpdmluZ19waXBlKGlndF9v dXRwdXRfdCAqb3V0cHV0KQogCXJldHVybiAmZGlzcGxheS0+cGlwZXNbcGlwZV07CiB9CiAKLXN0 YXRpYyBpZ3RfcGxhbmVfdCAqaWd0X3BpcGVfZ2V0X3BsYW5lKGlndF9waXBlX3QgKnBpcGUsIGVu dW0gaWd0X3BsYW5lIHBsYW5lKQorc3RhdGljIGlndF9wbGFuZV90ICppZ3RfcGlwZV9nZXRfcGxh bmUoaWd0X3BpcGVfdCAqcGlwZSwgaW50IHBsYW5lX2lkeCkKIHsKLQlpbnQgaWR4OworCWlndF9h c3NlcnRfZihwbGFuZV9pZHggPj0gMCAmJiBwbGFuZV9pZHggPCBwaXBlLT5uX3BsYW5lcywKKwkJ IlZhbGlkIHBpcGUtPnBsYW5lcyBwbGFuZV9pZHggbm90IGZvdW5kLCBwbGFuZV9pZHg9JWQgbl9w bGFuZXM9JWQiLAorCQlwbGFuZV9pZHgsIHBpcGUtPm5fcGxhbmVzKTsKIAotCS8qIEN1cnNvciBw bGFuZSBpcyBhbHdheXMgdGhlIGhpZ2hlc3QgaW5kZXggKi8KLQlpZiAocGxhbmUgPT0gSUdUX1BM QU5FX0NVUlNPUikKLQkJaWR4ID0gcGlwZS0+bl9wbGFuZXMgLSAxOwotCWVsc2UgewotCQlpZ3Rf YXNzZXJ0X2YocGxhbmUgPj0gMCAmJiBwbGFuZSA8IChwaXBlLT5uX3BsYW5lcyksCi0JCQkgICAg ICJwbGFuZT0lZFxuIiwgcGxhbmUpOwotCQlpZHggPSBwbGFuZTsKKwlyZXR1cm4gJnBpcGUtPnBs YW5lc1twbGFuZV9pZHhdOworfQorCisKK2lndF9wbGFuZV90ICppZ3RfcGlwZV9nZXRfcGxhbmVf dHlwZShpZ3RfcGlwZV90ICpwaXBlLCBpbnQgcGxhbmVfdHlwZSkKK3sKKwlpbnQgaSwgcGxhbmVf aWR4ID0gLTE7CisKKwlzd2l0Y2gocGxhbmVfdHlwZSkgeworCWNhc2UgRFJNX1BMQU5FX1RZUEVf Q1VSU09SOgorCQlwbGFuZV9pZHggPSBwaXBlLT5wbGFuZV9jdXJzb3I7CisJCWJyZWFrOworCWNh c2UgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWToKKwkJcGxhbmVfaWR4ID0gcGlwZS0+cGxhbmVfcHJp bWFyeTsKKwkJYnJlYWs7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOgorCQlmb3IoaSA9 IDA7IGkgPCBwaXBlLT5uX3BsYW5lczsgaSsrKQorCQkJaWYgKHBpcGUtPnBsYW5lc1tpXS50eXBl ID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCisJCQkgICAgcGxhbmVfaWR4ID0gaTsKKwkJYnJl YWs7CisJZGVmYXVsdDoKKwkJYnJlYWs7CiAJfQogCi0JcmV0dXJuICZwaXBlLT5wbGFuZXNbaWR4 XTsKKwlpZ3RfYXNzZXJ0X2YocGxhbmVfaWR4ID49IDAgJiYgcGxhbmVfaWR4IDwgcGlwZS0+bl9w bGFuZXMsCisJCSJWYWxpZCBwaXBlLT5wbGFuZXMgaWR4IG5vdCBmb3VuZC4gcGxhbmVfaWR4PSVk IHBsYW5lX3R5cGU9JWQgbl9wbGFuZXM9JWRcbiIsCisJCXBsYW5lX2lkeCwgcGxhbmVfdHlwZSwg cGlwZS0+bl9wbGFuZXMpOworCisJcmV0dXJuICZwaXBlLT5wbGFuZXNbcGxhbmVfaWR4XTsKIH0K IAogc3RhdGljIGlndF9vdXRwdXRfdCAqaWd0X3BpcGVfZ2V0X291dHB1dChpZ3RfcGlwZV90ICpw aXBlKQpAQCAtMjIxOSw5ICsyMjg5LDkgQEAgc3RhdGljIGludCBpZ3RfcGxhbmVfY29tbWl0KGln dF9wbGFuZV90ICpwbGFuZSwKIAkJCSAgICBlbnVtIGlndF9jb21taXRfc3R5bGUgcywKIAkJCSAg ICBib29sIGZhaWxfb25fZXJyb3IpCiB7Ci0JaWYgKHBsYW5lLT5pc19jdXJzb3IgJiYgcyA9PSBD T01NSVRfTEVHQUNZKSB7CisJaWYgKHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNP UiAmJiBzID09IENPTU1JVF9MRUdBQ1kpIHsKIAkJcmV0dXJuIGlndF9jdXJzb3JfY29tbWl0X2xl Z2FjeShwbGFuZSwgcGlwZSwgZmFpbF9vbl9lcnJvcik7Ci0JfSBlbHNlIGlmIChwbGFuZS0+aXNf cHJpbWFyeSAmJiBzID09IENPTU1JVF9MRUdBQ1kpIHsKKwl9IGVsc2UgaWYgKHBsYW5lLT50eXBl ID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkgJiYgcyA9PSBDT01NSVRfTEVHQUNZKSB7CiAJCXJl dHVybiBpZ3RfcHJpbWFyeV9wbGFuZV9jb21taXRfbGVnYWN5KHBsYW5lLCBwaXBlLAogCQkJCQkJ ICAgICAgIGZhaWxfb25fZXJyb3IpOwogCX0gZWxzZSB7CkBAIC0yNDM4LDcgKzI1MDgsOSBAQCBk aXNwbGF5X2NvbW1pdF9jaGFuZ2VkKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gaWd0X2Nv bW1pdF9zdHlsZSBzKQogCQkJcGxhbmUtPnBvc2l0aW9uX2NoYW5nZWQgPSBmYWxzZTsKIAkJCXBs YW5lLT5zaXplX2NoYW5nZWQgPSBmYWxzZTsKIAotCQkJaWYgKHMgIT0gQ09NTUlUX0xFR0FDWSB8 fCAhKHBsYW5lLT5pc19wcmltYXJ5IHx8IHBsYW5lLT5pc19jdXJzb3IpKQorCQkJaWYgKHMgIT0g Q09NTUlUX0xFR0FDWSB8fAorCQkJICAgICEocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSB8fAorCQkJICAgICAgcGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09S KSkKIAkJCQlwbGFuZS0+cm90YXRpb25fY2hhbmdlZCA9IGZhbHNlOwogCQl9CiAJfQpAQCAtMjcx NywxNCArMjc4OSwyNCBAQCB2b2lkIGlndF9vdXRwdXRfc2V0X3NjYWxpbmdfbW9kZShpZ3Rfb3V0 cHV0X3QgKm91dHB1dCwgdWludDY0X3Qgc2NhbGluZ19tb2RlKQogCWlndF9yZXF1aXJlKG91dHB1 dC0+Y29uZmlnLmF0b21pY19wcm9wc19jb25uZWN0b3JbSUdUX0NPTk5FQ1RPUl9TQ0FMSU5HX01P REVdKTsKIH0KIAotaWd0X3BsYW5lX3QgKmlndF9vdXRwdXRfZ2V0X3BsYW5lKGlndF9vdXRwdXRf dCAqb3V0cHV0LCBlbnVtIGlndF9wbGFuZSBwbGFuZSkKK2lndF9wbGFuZV90ICppZ3Rfb3V0cHV0 X2dldF9wbGFuZShpZ3Rfb3V0cHV0X3QgKm91dHB1dCwgaW50IHBsYW5lX2lkeCkKK3sKKwlpZ3Rf cGlwZV90ICpwaXBlOworCisJcGlwZSA9IGlndF9vdXRwdXRfZ2V0X2RyaXZpbmdfcGlwZShvdXRw dXQpOworCWlndF9hc3NlcnQocGlwZSk7CisKKwlyZXR1cm4gaWd0X3BpcGVfZ2V0X3BsYW5lKHBp cGUsIHBsYW5lX2lkeCk7Cit9CisKK2lndF9wbGFuZV90ICppZ3Rfb3V0cHV0X2dldF9wbGFuZV90 eXBlKGlndF9vdXRwdXRfdCAqb3V0cHV0LCBpbnQgcGxhbmVfdHlwZSkKIHsKIAlpZ3RfcGlwZV90 ICpwaXBlOwogCiAJcGlwZSA9IGlndF9vdXRwdXRfZ2V0X2RyaXZpbmdfcGlwZShvdXRwdXQpOwog CWlndF9hc3NlcnQocGlwZSk7CiAKLQlyZXR1cm4gaWd0X3BpcGVfZ2V0X3BsYW5lKHBpcGUsIHBs YW5lKTsKKwlyZXR1cm4gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUocGlwZSwgcGxhbmVfdHlwZSk7 CiB9CiAKIHZvaWQgaWd0X3BsYW5lX3NldF9mYihpZ3RfcGxhbmVfdCAqcGxhbmUsIHN0cnVjdCBp Z3RfZmIgKmZiKQpkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuaCBiL2xpYi9pZ3Rfa21zLmgKaW5k ZXggNGUyOThmODkuLjUxMDY1N2EzIDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5oCisrKyBiL2xp Yi9pZ3Rfa21zLmgKQEAgLTYxLDIxICs2MSwyMiBAQCBpbnQga21zdGVzdF9waXBlX3RvX2luZGV4 KGNoYXIgcGlwZSk7CiAKIC8qIFdlIG5hbWVzcGFjZSB0aGlzIGVudW0gdG8gbm90IGNvbmZsaWN0 IHdpdGggdGhlIEFuZHJvaWQgaTkxNV9kcm0uaCAqLwogZW51bSBpZ3RfcGxhbmUgewotCUlHVF9Q TEFORV8xID0gMCwKLQlJR1RfUExBTkVfUFJJTUFSWSA9IElHVF9QTEFORV8xLAotCUlHVF9QTEFO RV8yLAotCUlHVF9QTEFORV8zLAotCUlHVF9QTEFORV80LAotCUlHVF9QTEFORV81LAotCUlHVF9Q TEFORV82LAotCUlHVF9QTEFORV83LAotCUlHVF9QTEFORV84LAotCUlHVF9QTEFORV85LAotCUlH VF9QTEFORV9DVVJTT1IsIC8qIElHVF9QTEFORV9DVVJTT1IgaXMgYWx3YXlzIHRoZSBsYXN0IHBs YW5lLiAqLwotCUlHVF9NQVhfUExBTkVTLAorICAgICAgICBJR1RfUExBTkVfMSA9IDAsCisgICAg ICAgIElHVF9QTEFORV9QUklNQVJZID0gSUdUX1BMQU5FXzEsCisgICAgICAgIElHVF9QTEFORV8y LAorICAgICAgICBJR1RfUExBTkVfMywKKyAgICAgICAgSUdUX1BMQU5FXzQsCisgICAgICAgIElH VF9QTEFORV81LAorICAgICAgICBJR1RfUExBTkVfNiwKKyAgICAgICAgSUdUX1BMQU5FXzcsCisg ICAgICAgIElHVF9QTEFORV84LAorICAgICAgICBJR1RfUExBTkVfOSwKKyAgICAgICAgSUdUX1BM QU5FX0NVUlNPUiwgLyogSUdUX1BMQU5FX0NVUlNPUiBpcyBhbHdheXMgdGhlIGxhc3QgcGxhbmUu ICovCisgICAgICAgIElHVF9NQVhfUExBTkVTLAogfTsKIAogY29uc3QgY2hhciAqa21zdGVzdF9w bGFuZV9uYW1lKGVudW0gaWd0X3BsYW5lIHBsYW5lKTsKK2NvbnN0IGNoYXIgKmttc3Rlc3RfcGxh bmVfdHlwZV9uYW1lKGludCBwbGFuZV90eXBlKTsKIAogZW51bSBwb3J0IHsKICAgICAgICAgUE9S VF9BID0gMCwKQEAgLTI3Miw2ICsyNzMsNyBAQCB0eXBlZGVmIHN0cnVjdCB7CiAJaWd0X3BpcGVf dCAqcGlwZTsKIAlpbnQgaW5kZXg7CiAJLyogY2FwYWJpbGl0aWVzICovCisJaW50IHR5cGU7CiAJ dW5zaWduZWQgaW50IGlzX3ByaW1hcnkgICAgICAgOiAxOwogCXVuc2lnbmVkIGludCBpc19jdXJz b3IgICAgICAgIDogMTsKIAkvKiBzdGF0ZSB0cmFja2luZyAqLwpAQCAtMzA4LDggKzMxMCwxMSBA QCBzdHJ1Y3QgaWd0X3BpcGUgewogCWlndF9kaXNwbGF5X3QgKmRpc3BsYXk7CiAJZW51bSBwaXBl IHBpcGU7CiAJYm9vbCBlbmFibGVkOworCiAJaW50IG5fcGxhbmVzOwotCWlndF9wbGFuZV90IHBs YW5lc1tJR1RfTUFYX1BMQU5FU107CisJaW50IHBsYW5lX2N1cnNvcjsKKwlpbnQgcGxhbmVfcHJp bWFyeTsKKwlpZ3RfcGxhbmVfdCAqcGxhbmVzOwogCiAJdWludDMyX3QgYXRvbWljX3Byb3BzX2Ny dGNbSUdUX05VTV9DUlRDX1BST1BTXTsKIApAQCAtMzY5LDkgKzM3NCwxMSBAQCBkcm1Nb2RlTW9k ZUluZm8gKmlndF9vdXRwdXRfZ2V0X21vZGUoaWd0X291dHB1dF90ICpvdXRwdXQpOwogdm9pZCBp Z3Rfb3V0cHV0X292ZXJyaWRlX21vZGUoaWd0X291dHB1dF90ICpvdXRwdXQsIGRybU1vZGVNb2Rl SW5mbyAqbW9kZSk7CiB2b2lkIGlndF9vdXRwdXRfc2V0X3BpcGUoaWd0X291dHB1dF90ICpvdXRw dXQsIGVudW0gcGlwZSBwaXBlKTsKIHZvaWQgaWd0X291dHB1dF9zZXRfc2NhbGluZ19tb2RlKGln dF9vdXRwdXRfdCAqb3V0cHV0LCB1aW50NjRfdCBzY2FsaW5nX21vZGUpOwotaWd0X3BsYW5lX3Qg KmlndF9vdXRwdXRfZ2V0X3BsYW5lKGlndF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVtIGlndF9wbGFu ZSBwbGFuZSk7CitpZ3RfcGxhbmVfdCAqaWd0X291dHB1dF9nZXRfcGxhbmUoaWd0X291dHB1dF90 ICpvdXRwdXQsIGludCBwbGFuZV9pZHgpOworaWd0X3BsYW5lX3QgKmlndF9vdXRwdXRfZ2V0X3Bs YW5lX3R5cGUoaWd0X291dHB1dF90ICpvdXRwdXQsIGludCBwbGFuZV90eXBlKTsKIGlndF9vdXRw dXRfdCAqaWd0X291dHB1dF9mcm9tX2Nvbm5lY3RvcihpZ3RfZGlzcGxheV90ICpkaXNwbGF5LAot CQkJCQlkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3IpOworICAgIGRybU1vZGVDb25uZWN0b3Ig KmNvbm5lY3Rvcik7CitpZ3RfcGxhbmVfdCAqaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUoaWd0X3Bp cGVfdCAqcGlwZSwgaW50IHBsYW5lX3R5cGUpOwogYm9vbCBpZ3RfcGlwZV9nZXRfcHJvcGVydHko aWd0X3BpcGVfdCAqcGlwZSwgY29uc3QgY2hhciAqbmFtZSwKIAkJCSAgIHVpbnQzMl90ICpwcm9w X2lkLCB1aW50NjRfdCAqdmFsdWUsCiAJCQkgICBkcm1Nb2RlUHJvcGVydHlQdHIgKnByb3ApOwot LSAKMi4xMS4wLjQ1My5nNzg3Zjc1ZjA1CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9pbnRlbC1nZngK