From: Maarten Lankhorst Subject: [PATCH i-g-t] tests/kms_plane_lowres: Rework tests to work without fbcon, v3. Date: Thu, 19 Oct 2017 08:48:37 +0200 Message-ID: <20171019064837.19535-1-maarten.lankhorst@linux.intel.com> References: <20171017091031.25993-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id A69B46EA1E for ; Thu, 19 Oct 2017 06:48:44 +0000 (UTC) In-Reply-To: <20171017091031.25993-1-maarten.lankhorst@linux.intel.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 List-Id: intel-gfx@lists.freedesktop.org a21zdGVzdF9nZXRfY3J0YyB3YXMgc2tpcHBpbmcgYmVjYXVzZSBhdCB0aGF0IHBvaW50IHRoZSBj cnRjIHdhcyBub3QKYWN0aXZlIHlldCwgaW5zdGVhZCB3ZSBzaG91bGQgb25seSB1c2UgaWd0X2Fz c2VydF9wbGFuZV92aXNpYmxlCmRpcmVjdGx5LiBVbmV4cG9ydCBrbXN0ZXN0X2dldF9jcnRjLCBz aW5jZSBub3RoaW5nIGhlcmUgc2hvdWxkIG5lZWQgaXQuCldoaWxlIGF0IGl0IGZpeCBhIHNtYWxs IGxlYWsgaW4gaWd0X2Fzc2VydF9wbGFuZV92aXNpYmxlLCB0aGUgb25seQpyZW1haW5pbmcgdXNl ci4KCkFkZGl0aW9uYWxseSwgaXQnIHMgbm90IGFsbG93ZWQgdG8gb2J0YWluIGNyYyBvbiBhIGRp c2FibGVkIHBpcGUsIHNvCndhaXQgdW50aWwgdGhlIHBpcGUgaXMgZW5hYmxlZCBiZWZvcmUgYWxs b2NhdGluZyB0aGUgY3JjLgoKQ2hhbmdlcyBzaW5jZSB2MToKLSBNb3ZlIGlndF9waXBlX2NyY19u ZXcgdW50aWwgYWZ0ZXIgcGlwZSBpcyBlbmFibGVkLgotIE1vdmUgdGVzdF9pbml0KCkgaW50byB0 ZXN0X3NldHVwKCksIGl0J3MgcmVkdW5kYW50Li4KLSBSZW1vdmUgcGlwZV9jcmMgZnJvbSBkYXRh LCBubyBuZWVkIHRvIGhhdmUgaXQgdGhlcmUuCkNoYW5nZXMgc2luY2UgdjI6Ci0gSW5jcmVtZW50 IGZiIHBvaW50ZXIgZm9yIGlndF9wbGFuZV9zZXRfZmIsIGluIG9yZGVyIHRvIHNldCBhIGRpZmZl cmVudAogIGZiIG9uIGVhY2ggcGxhbmUgY29ycmVjdGx5LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRl biBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4LmludGVsLmNvbT4KLS0tCiBsaWIv aWd0X2ttcy5jICAgICAgICAgICAgfCAgIDUgKystCiBsaWIvaWd0X2ttcy5oICAgICAgICAgICAg fCAgIDEgLQogdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jIHwgMTEzICsrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDUwIGluc2Vy dGlvbnMoKyksIDY5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmMgYi9s aWIvaWd0X2ttcy5jCmluZGV4IDM3OWJkMGMzODNmZC4uNzU2YWViYTEyNTVjIDEwMDY0NAotLS0g YS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21zLmMKQEAgLTE0NDcsNyArMTQ0Nyw3IEBA IHN0YXRpYyB2b2lkIHBhcnNlX2NydGMoY2hhciAqaW5mbywgc3RydWN0IGttc3Rlc3RfY3J0YyAq Y3J0YykKIAlpZ3RfYXNzZXJ0X2VxKHJldCwgMik7CiB9CiAKLXZvaWQga21zdGVzdF9nZXRfY3J0 YyhpbnQgZGV2aWNlLCBlbnVtIHBpcGUgcGlwZSwgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0YykK K3N0YXRpYyB2b2lkIGttc3Rlc3RfZ2V0X2NydGMoaW50IGRldmljZSwgZW51bSBwaXBlIHBpcGUs IHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNydGMpCiB7CiAJY2hhciB0bXBbMjU2XTsKIAlGSUxFICpm aWxlOwpAQCAtMTQ5MSw3ICsxNDkxLDcgQEAgdm9pZCBrbXN0ZXN0X2dldF9jcnRjKGludCBkZXZp Y2UsIGVudW0gcGlwZSBwaXBlLCBzdHJ1Y3Qga21zdGVzdF9jcnRjICpjcnRjKQogCWZjbG9zZShm aWxlKTsKIAljbG9zZShmZCk7CiAKLQlpZ3Rfc2tpcF9vbihuY3J0YyA9PSAwKTsKKwlpZ3RfYXNz ZXJ0KG5jcnRjID09IDEpOwogfQogCiB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJsZShpbnQg ZmQsIGVudW0gcGlwZSBwaXBlLCBib29sIHZpc2liaWxpdHkpCkBAIC0xNTE2LDYgKzE1MTYsNyBA QCB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJsZShpbnQgZmQsIGVudW0gcGlwZSBwaXBlLCBi b29sIHZpc2liaWxpdHkpCiAJCX0KIAl9CiAKKwlmcmVlKGNydGMucGxhbmVzKTsKIAlpZ3RfYXNz ZXJ0X2VxKHZpc2libGUsIHZpc2liaWxpdHkpOwogfQogCmRpZmYgLS1naXQgYS9saWIvaWd0X2tt cy5oIGIvbGliL2lndF9rbXMuaAppbmRleCA4ZGMxMThjOTYxYjcuLjI5NGVhNTQwMGU0OSAxMDA2 NDQKLS0tIGEvbGliL2lndF9rbXMuaAorKysgYi9saWIvaWd0X2ttcy5oCkBAIC0yMjMsNyArMjIz LDYgQEAgdWludDMyX3Qga21zdGVzdF9kdW1iX2NyZWF0ZShpbnQgZmQsIGludCB3aWR0aCwgaW50 IGhlaWdodCwgaW50IGJwcCwKIHZvaWQgKmttc3Rlc3RfZHVtYl9tYXBfYnVmZmVyKGludCBmZCwg dWludDMyX3QgaGFuZGxlLCB1aW50NjRfdCBzaXplLAogCQkJICAgICAgdW5zaWduZWQgcHJvdCk7 CiB1bnNpZ25lZCBpbnQga21zdGVzdF9nZXRfdmJsYW5rKGludCBmZCwgaW50IHBpcGUsIHVuc2ln bmVkIGludCBmbGFncyk7Ci12b2lkIGttc3Rlc3RfZ2V0X2NydGMoaW50IGZkLCBlbnVtIHBpcGUg cGlwZSwgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0Yyk7CiB2b2lkIGlndF9hc3NlcnRfcGxhbmVf dmlzaWJsZShpbnQgZmQsIGVudW0gcGlwZSBwaXBlLCBib29sIHZpc2liaWxpdHkpOwogCiAvKgpk aWZmIC0tZ2l0IGEvdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jIGIvdGVzdHMva21zX3BsYW5lX2xv d3Jlcy5jCmluZGV4IGIxNmM4Y2Q0MzNiMi4uODVkMzE0NWRlNGI2IDEwMDY0NAotLS0gYS90ZXN0 cy9rbXNfcGxhbmVfbG93cmVzLmMKKysrIGIvdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jCkBAIC0z OSw4ICszOSw2IEBAIElHVF9URVNUX0RFU0NSSVBUSU9OKCJUZXN0IGF0b21pYyBtb2RlIHNldHRp bmcgd2l0aCBhIHBsYW5lIGJ5IHN3aXRjaGluZyBiZXR3ZWVuCiB0eXBlZGVmIHN0cnVjdCB7CiAJ aW50IGRybV9mZDsKIAlpZ3RfZGlzcGxheV90IGRpc3BsYXk7Ci0JaWd0X3BpcGVfY3JjX3QgKnBp cGVfY3JjOwotCWlndF9wbGFuZV90ICoqcGxhbmU7CiAJc3RydWN0IGlndF9mYiAqZmI7CiB9IGRh dGFfdDsKIApAQCAtMTEwLDYzICsxMDgsNDcgQEAgZ2V0X2xvd3Jlc19tb2RlKGludCBkcm1mZCwg ZHJtTW9kZU1vZGVJbmZvICptb2RlX2RlZmF1bHQpCiB9CiAKIHN0YXRpYyB2b2lkCi10ZXN0X2lu aXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSkKK3Rlc3RfZmluaShkYXRhX3QgKmRhdGEs IGlndF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVtIHBpcGUgcGlwZSkKIHsKLQlkYXRhLT5waXBlX2Ny YyA9IGlndF9waXBlX2NyY19uZXcoZGF0YS0+ZHJtX2ZkLCBwaXBlLCBJTlRFTF9QSVBFX0NSQ19T T1VSQ0VfQVVUTyk7Ci0JZGF0YS0+cGxhbmUgPSBjYWxsb2MoZGF0YS0+ZGlzcGxheS5waXBlc1tw aXBlXS5uX3BsYW5lcywgc2l6ZW9mKGRhdGEtPnBsYW5lKSk7XAotCWlndF9hc3NlcnRfZihkYXRh LT5wbGFuZSwgIkZhaWxlZCB0byBhbGxvY2F0ZSBtZW1vcnkgZm9yICVkIHBsYW5lc1xuIiwKLQkg ICAgICAgICAgICAgZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lcyk7Ci0JZGF0YS0+ ZmIgPSBjYWxsb2MoZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lcywgc2l6ZW9mKHN0 cnVjdCBpZ3RfZmIpKTsKLQlpZ3RfYXNzZXJ0X2YoZGF0YS0+ZmIsICJGYWlsZWQgdG8gYWxsb2Nh dGUgbWVtb3J5IGZvciAlZCBGQnNcbiIsCi0JICAgICAgICAgICAgIGRhdGEtPmRpc3BsYXkucGlw ZXNbcGlwZV0ubl9wbGFuZXMpOwotfQorCWlndF9wbGFuZV90ICpwbGFuZTsKIAotc3RhdGljIHZv aWQKLXRlc3RfZmluaShkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRfdCAqb3V0cHV0KQotewogCS8q IHJlc3RvcmUgb3JpZ2luYWwgbW9kZSAqLwogCWlndF9vdXRwdXRfb3ZlcnJpZGVfbW9kZShvdXRw dXQsIE5VTEwpOwogCi0JZm9yIChpbnQgaSA9IDA7IGkgPCAyOyBpKyspCi0JCWlndF9wbGFuZV9z ZXRfZmIoZGF0YS0+cGxhbmVbaV0sIE5VTEwpOworCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoJmRh dGEtPmRpc3BsYXksIHBpcGUsIHBsYW5lKQorCQlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lLCBOVUxM KTsKIAogCS8qIHJlc2V0IHRoZSBjb25zdHJhaW50IG9uIHRoZSBwaXBlICovCiAJaWd0X291dHB1 dF9zZXRfcGlwZShvdXRwdXQsIFBJUEVfQU5ZKTsKIAotCWlndF9waXBlX2NyY19mcmVlKGRhdGEt PnBpcGVfY3JjKTsKLQotCWZyZWUoZGF0YS0+cGxhbmUpOwotCWRhdGEtPnBsYW5lID0gTlVMTDsK IAlmcmVlKGRhdGEtPmZiKTsKIAlkYXRhLT5mYiA9IE5VTEw7CiB9CiAKIHN0YXRpYyBpbnQKLWRp c3BsYXlfY29tbWl0X21vZGUoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgaW50IGZsYWdz LCBpZ3RfY3JjX3QgKmNyYykKK2Rpc3BsYXlfY29tbWl0X21vZGUoaWd0X2Rpc3BsYXlfdCAqZGlz cGxheSwgaWd0X3BpcGVfY3JjX3QgKnBpcGVfY3JjLAorCQkgICAgZW51bSBwaXBlIHBpcGUsIGlu dCBmbGFncywgaWd0X2NyY190ICpjcmMpCiB7CiAJY2hhciBidWZbMjU2XTsKIAlzdHJ1Y3QgZHJt X2V2ZW50ICplID0gKHZvaWQgKilidWY7CiAJdW5zaWduZWQgaW50IHZibGFua19zdGFydCwgdmJs YW5rX3N0b3A7CiAJaW50IG4sIHJldDsKIAotCXZibGFua19zdGFydCA9IGttc3Rlc3RfZ2V0X3Zi bGFuayhkYXRhLT5kaXNwbGF5LmRybV9mZCwgcGlwZSwKKwl2Ymxhbmtfc3RhcnQgPSBrbXN0ZXN0 X2dldF92YmxhbmsoZGlzcGxheS0+ZHJtX2ZkLCBwaXBlLAogCQkJCQkgIERSTV9WQkxBTktfTkVY VE9OTUlTUyk7CiAKLQlyZXQgPSBpZ3RfZGlzcGxheV90cnlfY29tbWl0X2F0b21pYygmZGF0YS0+ ZGlzcGxheSwKLQkJCQkJICAgIGZsYWdzLAotCQkJCQkgICAgTlVMTCk7CisJcmV0ID0gaWd0X2Rp c3BsYXlfdHJ5X2NvbW1pdF9hdG9taWMoZGlzcGxheSwgZmxhZ3MsIE5VTEwpOwogCWlndF9za2lw X29uKHJldCAhPSAwKTsKIAogCWlndF9zZXRfdGltZW91dCgxLCAiU3R1Y2sgb24gcGFnZSBmbGlw Iik7Ci0JcmV0ID0gcmVhZChkYXRhLT5kaXNwbGF5LmRybV9mZCwgYnVmLCBzaXplb2YoYnVmKSk7 CisJcmV0ID0gcmVhZChkaXNwbGF5LT5kcm1fZmQsIGJ1Ziwgc2l6ZW9mKGJ1ZikpOwogCWlndF9h c3NlcnQocmV0ID49IDApOwogCi0JdmJsYW5rX3N0b3AgPSBrbXN0ZXN0X2dldF92YmxhbmsoZGF0 YS0+ZGlzcGxheS5kcm1fZmQsIHBpcGUsIDApOworCXZibGFua19zdG9wID0ga21zdGVzdF9nZXRf dmJsYW5rKGRpc3BsYXktPmRybV9mZCwgcGlwZSwgMCk7CiAJaWd0X2Fzc2VydF9lcShlLT50eXBl LCBEUk1fRVZFTlRfRkxJUF9DT01QTEVURSk7CiAJaWd0X3Jlc2V0X3RpbWVvdXQoKTsKIAotCW4g PSBpZ3RfcGlwZV9jcmNfZ2V0X2NyY3MoZGF0YS0+cGlwZV9jcmMsIHZibGFua19zdG9wIC0gdmJs YW5rX3N0YXJ0LAotCQkJCSAgJmNyYyk7CisJbiA9IGlndF9waXBlX2NyY19nZXRfY3JjcyhwaXBl X2NyYywgdmJsYW5rX3N0b3AgLSB2Ymxhbmtfc3RhcnQsICZjcmMpOwogCWlndF9hc3NlcnRfZXEo biwgdmJsYW5rX3N0b3AgLSB2Ymxhbmtfc3RhcnQpOwogCiAJcmV0dXJuIG47CkBAIC0xODQsMzUg KzE2NiwzMyBAQCBzdGF0aWMgZHJtTW9kZU1vZGVJbmZvICoKIHRlc3Rfc2V0dXAoZGF0YV90ICpk YXRhLCBlbnVtIHBpcGUgcGlwZSwgdWludDY0X3QgbW9kaWZpZXIsIGludCBmbGFncywKIAkgICBp Z3Rfb3V0cHV0X3QgKm91dHB1dCkKIHsKLQlzdHJ1Y3Qga21zdGVzdF9jcnRjIGNydGM7CiAJZHJt TW9kZU1vZGVJbmZvICptb2RlOwogCWludCBzaXplOwotCWludCBpLCB4LCB5OworCWludCBpID0g MSwgeCwgeTsKKwlpZ3RfcGxhbmVfdCAqcGxhbmU7CiAKIAlpZ3Rfb3V0cHV0X3NldF9waXBlKG91 dHB1dCwgcGlwZSk7CiAKLQlrbXN0ZXN0X2dldF9jcnRjKGRhdGEtPmRybV9mZCwgcGlwZSwgJmNy dGMpOwotCWlndF9za2lwX29uKGNydGMubl9wbGFuZXMgPiBkYXRhLT5kaXNwbGF5LnBpcGVzW3Bp cGVdLm5fcGxhbmVzKTsKLQlpZ3Rfc2tpcF9vbihjcnRjLm5fcGxhbmVzID09IDApOwotCi0JZm9y IChpID0gMDsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykKLQkJZGF0YS0+cGxhbmVbaV0gPSBpZ3Rf b3V0cHV0X2dldF9wbGFuZShvdXRwdXQsIGNydGMucGxhbmVzW2ldLmluZGV4KTsKLQogCW1vZGUg PSBpZ3Rfb3V0cHV0X2dldF9tb2RlKG91dHB1dCk7CiAKKwlkYXRhLT5mYiA9IGNhbGxvYyhkYXRh LT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzLCBzaXplb2Yoc3RydWN0IGlndF9mYikpOwor CWlndF9hc3NlcnRfZihkYXRhLT5mYiwgIkZhaWxlZCB0byBhbGxvY2F0ZSBtZW1vcnkgZm9yICVk IEZCc1xuIiwKKwkgICAgICAgICAgICAgZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5l cyk7CisKIAlpZ3RfY3JlYXRlX2NvbG9yX2ZiKGRhdGEtPmRybV9mZCwgbW9kZS0+aGRpc3BsYXks IG1vZGUtPnZkaXNwbGF5LAogCQkJICAgIERSTV9GT1JNQVRfWFJHQjg4ODgsCiAJCQkgICAgbW9k aWZpZXIsCiAJCQkgICAgMC4wLCAwLjAsIDEuMCwKIAkJCSAgICAmZGF0YS0+ZmJbMF0pOwogCi0J aWd0X3BsYW5lX3NldF9mYihkYXRhLT5wbGFuZVswXSwgJmRhdGEtPmZiWzBdKTsKLQogCS8qIHll bGxvdyBzcHJpdGUgcGxhbmUgaW4gbG93ZXIgbGVmdCBjb3JuZXIgKi8KLQlmb3IgKGkgPSAwOyBp IDwgY3J0Yy5uX3BsYW5lczsgaSsrKSB7Ci0JCWlmIChkYXRhLT5wbGFuZVtpXS0+dHlwZSA9PSBE Uk1fUExBTkVfVFlQRV9QUklNQVJZKQorCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoJmRhdGEtPmRp c3BsYXksIHBpcGUsIHBsYW5lKSB7CisJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQ RV9QUklNQVJZKSB7CisJCQlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lLCAmZGF0YS0+ZmJbMF0pOwog CQkJY29udGludWU7Ci0JCWlmIChkYXRhLT5wbGFuZVtpXS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQ RV9DVVJTT1IpCisJCX0KKworCQlpZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VS U09SKQogCQkJc2l6ZSA9IDY0OwogCQllbHNlCiAJCQlzaXplID0gU0laRTsKQEAgLTIyMiwxMyAr MjAyLDEzIEBAIHRlc3Rfc2V0dXAoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgdWludDY0 X3QgbW9kaWZpZXIsIGludCBmbGFncywKIAogCQlpZ3RfY3JlYXRlX2NvbG9yX2ZiKGRhdGEtPmRy bV9mZCwKIAkJCQkgICAgc2l6ZSwgc2l6ZSwKLQkJCQkgICAgZGF0YS0+cGxhbmVbaV0tPnR5cGUg PT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gRFJNX0ZPUk1BVF9BUkdCODg4OCA6IERSTV9GT1JN QVRfWFJHQjg4ODgsCi0JCQkJICAgIGRhdGEtPnBsYW5lW2ldLT50eXBlID09IERSTV9QTEFORV9U WVBFX0NVUlNPUiA/IExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUgOiBtb2RpZmllciwKKwkJCQkg ICAgcGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gRFJNX0ZPUk1BVF9BUkdC ODg4OCA6IERSTV9GT1JNQVRfWFJHQjg4ODgsCisJCQkJICAgIHBsYW5lLT50eXBlID09IERSTV9Q TEFORV9UWVBFX0NVUlNPUiA/IExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUgOiBtb2RpZmllciwK IAkJCQkgICAgMS4wLCAxLjAsIDAuMCwKIAkJCQkgICAgJmRhdGEtPmZiW2ldKTsKIAotCQlpZ3Rf cGxhbmVfc2V0X3Bvc2l0aW9uKGRhdGEtPnBsYW5lW2ldLCB4LCB5KTsKLQkJaWd0X3BsYW5lX3Nl dF9mYihkYXRhLT5wbGFuZVtpXSwgJmRhdGEtPmZiW2ldKTsKKwkJaWd0X3BsYW5lX3NldF9wb3Np dGlvbihwbGFuZSwgeCwgeSk7CisJCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsICZkYXRhLT5mYltp KytdKTsKIAl9CiAKIAlyZXR1cm4gbW9kZTsKQEAgLTI0NCwyMSArMjI0LDIyIEBAIHRlc3RfcGxh bmVfcG9zaXRpb25fd2l0aF9vdXRwdXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwKIAlk cm1Nb2RlTW9kZUluZm8gKm1vZGUxLCAqbW9kZTIsICptb2RlMzsKIAlpbnQgcmV0LCBuOwogCWlu dCBmbGFncyA9IERSTV9NT0RFX1BBR0VfRkxJUF9FVkVOVCB8IERSTV9NT0RFX0FUT01JQ19BTExP V19NT0RFU0VUOworCWlndF9waXBlX2NyY190ICpwaXBlX2NyYzsKIAogCWlndF9pbmZvKCJUZXN0 aW5nIGNvbm5lY3RvciAlcyB1c2luZyBwaXBlICVzXG4iLAogCQkgaWd0X291dHB1dF9uYW1lKG91 dHB1dCksIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKTsKIAotCXRlc3RfaW5pdChkYXRhLCBwaXBl KTsKLQogCW1vZGUxID0gdGVzdF9zZXR1cChkYXRhLCBwaXBlLCBtb2RpZmllciwgZmxhZ3MsIG91 dHB1dCk7CiAKIAltb2RlX2xvd3JlcyA9IGdldF9sb3dyZXNfbW9kZShkYXRhLT5kcm1fZmQsIG1v ZGUxKTsKIAotCWlndF9waXBlX2NyY19zdGFydChkYXRhLT5waXBlX2NyYyk7CiAJcmV0ID0gaWd0 X2Rpc3BsYXlfdHJ5X2NvbW1pdDIoJmRhdGEtPmRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCWln dF9za2lwX29uKHJldCAhPSAwKTsKIAotCW4gPSBpZ3RfcGlwZV9jcmNfZ2V0X2NyY3MoZGF0YS0+ cGlwZV9jcmMsIDEsICZjcmNfaGlyZXMxKTsKKwlwaXBlX2NyYyA9IGlndF9waXBlX2NyY19uZXco ZGF0YS0+ZHJtX2ZkLCBwaXBlLCBJTlRFTF9QSVBFX0NSQ19TT1VSQ0VfQVVUTyk7CisJaWd0X3Bp cGVfY3JjX3N0YXJ0KHBpcGVfY3JjKTsKKworCW4gPSBpZ3RfcGlwZV9jcmNfZ2V0X2NyY3MocGlw ZV9jcmMsIDEsICZjcmNfaGlyZXMxKTsKIAlpZ3RfYXNzZXJ0X2VxKDEsIG4pOwogCiAJaWd0X2Fz c2VydF9wbGFuZV92aXNpYmxlKGRhdGEtPmRybV9mZCwgcGlwZSwgdHJ1ZSk7CkBAIC0yNzEsNyAr MjUyLDcgQEAgdGVzdF9wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVu dW0gcGlwZSBwaXBlLAogCiAJY2hlY2tfbW9kZSgmbW9kZV9sb3dyZXMsIG1vZGUyKTsKIAotCWRp c3BsYXlfY29tbWl0X21vZGUoZGF0YSwgcGlwZSwgZmxhZ3MsIGNyY19sb3dyZXMpOworCWRpc3Bs YXlfY29tbWl0X21vZGUoJmRhdGEtPmRpc3BsYXksIHBpcGVfY3JjLCBwaXBlLCBmbGFncywgY3Jj X2xvd3Jlcyk7CiAKIAlpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUoZGF0YS0+ZHJtX2ZkLCBwaXBl LCBmYWxzZSk7CiAKQEAgLTI4Myw0MSArMjY0LDM5IEBAIHRlc3RfcGxhbmVfcG9zaXRpb25fd2l0 aF9vdXRwdXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwKIAogCWNoZWNrX21vZGUobW9k ZTEsIG1vZGUzKTsKIAotCWRpc3BsYXlfY29tbWl0X21vZGUoZGF0YSwgcGlwZSwgZmxhZ3MsIGNy Y19oaXJlczIpOworCWRpc3BsYXlfY29tbWl0X21vZGUoJmRhdGEtPmRpc3BsYXksIHBpcGVfY3Jj LCBwaXBlLCBmbGFncywgY3JjX2hpcmVzMik7CiAKIAlpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUo ZGF0YS0+ZHJtX2ZkLCBwaXBlLCB0cnVlKTsKIAotCWlndF9waXBlX2NyY19zdG9wKGRhdGEtPnBp cGVfY3JjKTsKKwlpZ3RfcGlwZV9jcmNfc3RvcChwaXBlX2NyYyk7CisJaWd0X3BpcGVfY3JjX2Zy ZWUocGlwZV9jcmMpOwogCi0JdGVzdF9maW5pKGRhdGEsIG91dHB1dCk7CisJdGVzdF9maW5pKGRh dGEsIG91dHB1dCwgcGlwZSk7CiB9CiAKIHN0YXRpYyB2b2lkCiB0ZXN0X3BsYW5lX3Bvc2l0aW9u KGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90IG1vZGlmaWVyKQogewogCWln dF9vdXRwdXRfdCAqb3V0cHV0OwotCWludCBjb25uZWN0ZWRfb3V0czsKIAljb25zdCBpbnQgZ2Vu ID0gaW50ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQoZGF0YS0+ZHJtX2ZkKSk7CiAKLQlpZ3Rf cmVxdWlyZShkYXRhLT5kaXNwbGF5LmlzX2F0b21pYyk7Ci0JaWd0X3NraXBfb24ocGlwZSA+PSBk YXRhLT5kaXNwbGF5Lm5fcGlwZXMpOwotCiAJaWYgKG1vZGlmaWVyID09IExPQ0FMX0k5MTVfRk9S TUFUX01PRF9ZX1RJTEVEIHx8CiAJICAgIG1vZGlmaWVyID09IExPQ0FMX0k5MTVfRk9STUFUX01P RF9ZZl9USUxFRCkKIAkJaWd0X3NraXBfb24oZ2VuIDwgOSk7CiAKLQljb25uZWN0ZWRfb3V0cyA9 IDA7Ci0JZm9yX2VhY2hfdmFsaWRfb3V0cHV0X29uX3BpcGUoJmRhdGEtPmRpc3BsYXksIHBpcGUs IG91dHB1dCkgeworCWZvcl9lYWNoX3ZhbGlkX291dHB1dF9vbl9waXBlKCZkYXRhLT5kaXNwbGF5 LCBwaXBlLCBvdXRwdXQpCiAJCXRlc3RfcGxhbmVfcG9zaXRpb25fd2l0aF9vdXRwdXQoZGF0YSwg cGlwZSwgb3V0cHV0LCBtb2RpZmllcik7Ci0JCWNvbm5lY3RlZF9vdXRzKys7Ci0JfQotCi0JaWd0 X3NraXBfb24oY29ubmVjdGVkX291dHMgPT0gMCk7CiB9CiAKIHN0YXRpYyB2b2lkCiBydW5fdGVz dHNfZm9yX3BpcGUoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSkKIHsKKwlpZ3RfZml4dHVy ZSB7CisJCWlndF9za2lwX29uKHBpcGUgPj0gZGF0YS0+ZGlzcGxheS5uX3BpcGVzKTsKKworCQlp Z3RfZGlzcGxheV9yZXF1aXJlX291dHB1dF9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlKTsK Kwl9CisKIAlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLXRpbGluZy1ub25lIiwKIAkJICAgICAga21z dGVzdF9waXBlX25hbWUocGlwZSkpCiAJCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwg TE9DQUxfRFJNX0ZPUk1BVF9NT0RfTk9ORSk7CkBAIC0zNTAsMTAgKzMyOSwxMiBAQCBpZ3RfbWFp bgogCiAJCWlndF9yZXF1aXJlX3BpcGVfY3JjKGRhdGEuZHJtX2ZkKTsKIAkJaWd0X2Rpc3BsYXlf aW5pdCgmZGF0YS5kaXNwbGF5LCBkYXRhLmRybV9mZCk7CisJCWlndF9yZXF1aXJlKGRhdGEuZGlz cGxheS5pc19hdG9taWMpOwogCX0KIAogCWZvcl9lYWNoX3BpcGVfc3RhdGljKHBpcGUpCi0JCXJ1 bl90ZXN0c19mb3JfcGlwZSgmZGF0YSwgcGlwZSk7CisJCWlndF9zdWJ0ZXN0X2dyb3VwCisJCQly dW5fdGVzdHNfZm9yX3BpcGUoJmRhdGEsIHBpcGUpOwogCiAJaWd0X2ZpeHR1cmUgewogCQlpZ3Rf ZGlzcGxheV9maW5pKCZkYXRhLmRpc3BsYXkpOwotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK