From: Maarten Lankhorst Subject: [PATCH i-g-t] tests/kms_plane_lowres: Rework tests to work without fbcon, v2. Date: Tue, 17 Oct 2017 11:10:31 +0200 Message-ID: <20171017091031.25993-1-maarten.lankhorst@linux.intel.com> References: <20171016074804.5501-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 [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 65AD76E5BF for ; Tue, 17 Oct 2017 09:10:38 +0000 (UTC) In-Reply-To: <20171016074804.5501-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 LCBubyBuZWVkIHRvIGhhdmUgaXQgdGhlcmUuCgpTaWduZWQtb2ZmLWJ5OiBNYWFydGVuIExhbmto b3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50ZWwuY29tPgotLS0KIGxpYi9pZ3Rfa21z LmMgICAgICAgICAgICB8ICAgNSArKy0KIGxpYi9pZ3Rfa21zLmggICAgICAgICAgICB8ICAgMSAt CiB0ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMgfCAxMTEgKysrKysrKysrKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDkgaW5zZXJ0aW9ucygr KSwgNjggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuYyBiL2xpYi9pZ3Rf a21zLmMKaW5kZXggMzc5YmQwYzM4M2ZkLi43NTZhZWJhMTI1NWMgMTAwNjQ0Ci0tLSBhL2xpYi9p Z3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTQ0Nyw3ICsxNDQ3LDcgQEAgc3RhdGlj IHZvaWQgcGFyc2VfY3J0YyhjaGFyICppbmZvLCBzdHJ1Y3Qga21zdGVzdF9jcnRjICpjcnRjKQog CWlndF9hc3NlcnRfZXEocmV0LCAyKTsKIH0KIAotdm9pZCBrbXN0ZXN0X2dldF9jcnRjKGludCBk ZXZpY2UsIGVudW0gcGlwZSBwaXBlLCBzdHJ1Y3Qga21zdGVzdF9jcnRjICpjcnRjKQorc3RhdGlj IHZvaWQga21zdGVzdF9nZXRfY3J0YyhpbnQgZGV2aWNlLCBlbnVtIHBpcGUgcGlwZSwgc3RydWN0 IGttc3Rlc3RfY3J0YyAqY3J0YykKIHsKIAljaGFyIHRtcFsyNTZdOwogCUZJTEUgKmZpbGU7CkBA IC0xNDkxLDcgKzE0OTEsNyBAQCB2b2lkIGttc3Rlc3RfZ2V0X2NydGMoaW50IGRldmljZSwgZW51 bSBwaXBlIHBpcGUsIHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNydGMpCiAJZmNsb3NlKGZpbGUpOwog CWNsb3NlKGZkKTsKIAotCWlndF9za2lwX29uKG5jcnRjID09IDApOworCWlndF9hc3NlcnQobmNy dGMgPT0gMSk7CiB9CiAKIHZvaWQgaWd0X2Fzc2VydF9wbGFuZV92aXNpYmxlKGludCBmZCwgZW51 bSBwaXBlIHBpcGUsIGJvb2wgdmlzaWJpbGl0eSkKQEAgLTE1MTYsNiArMTUxNiw3IEBAIHZvaWQg aWd0X2Fzc2VydF9wbGFuZV92aXNpYmxlKGludCBmZCwgZW51bSBwaXBlIHBpcGUsIGJvb2wgdmlz aWJpbGl0eSkKIAkJfQogCX0KIAorCWZyZWUoY3J0Yy5wbGFuZXMpOwogCWlndF9hc3NlcnRfZXEo dmlzaWJsZSwgdmlzaWJpbGl0eSk7CiB9CiAKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmggYi9s aWIvaWd0X2ttcy5oCmluZGV4IDhkYzExOGM5NjFiNy4uMjk0ZWE1NDAwZTQ5IDEwMDY0NAotLS0g YS9saWIvaWd0X2ttcy5oCisrKyBiL2xpYi9pZ3Rfa21zLmgKQEAgLTIyMyw3ICsyMjMsNiBAQCB1 aW50MzJfdCBrbXN0ZXN0X2R1bWJfY3JlYXRlKGludCBmZCwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0 LCBpbnQgYnBwLAogdm9pZCAqa21zdGVzdF9kdW1iX21hcF9idWZmZXIoaW50IGZkLCB1aW50MzJf dCBoYW5kbGUsIHVpbnQ2NF90IHNpemUsCiAJCQkgICAgICB1bnNpZ25lZCBwcm90KTsKIHVuc2ln bmVkIGludCBrbXN0ZXN0X2dldF92YmxhbmsoaW50IGZkLCBpbnQgcGlwZSwgdW5zaWduZWQgaW50 IGZsYWdzKTsKLXZvaWQga21zdGVzdF9nZXRfY3J0YyhpbnQgZmQsIGVudW0gcGlwZSBwaXBlLCBz dHJ1Y3Qga21zdGVzdF9jcnRjICpjcnRjKTsKIHZvaWQgaWd0X2Fzc2VydF9wbGFuZV92aXNpYmxl KGludCBmZCwgZW51bSBwaXBlIHBpcGUsIGJvb2wgdmlzaWJpbGl0eSk7CiAKIC8qCmRpZmYgLS1n aXQgYS90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMgYi90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMK aW5kZXggYjE2YzhjZDQzM2IyLi4xYTc1NjJjYTk1YzkgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19w bGFuZV9sb3dyZXMuYworKysgYi90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMKQEAgLTM5LDggKzM5 LDYgQEAgSUdUX1RFU1RfREVTQ1JJUFRJT04oIlRlc3QgYXRvbWljIG1vZGUgc2V0dGluZyB3aXRo IGEgcGxhbmUgYnkgc3dpdGNoaW5nIGJldHdlZW4KIHR5cGVkZWYgc3RydWN0IHsKIAlpbnQgZHJt X2ZkOwogCWlndF9kaXNwbGF5X3QgZGlzcGxheTsKLQlpZ3RfcGlwZV9jcmNfdCAqcGlwZV9jcmM7 Ci0JaWd0X3BsYW5lX3QgKipwbGFuZTsKIAlzdHJ1Y3QgaWd0X2ZiICpmYjsKIH0gZGF0YV90Owog CkBAIC0xMTAsNjMgKzEwOCw0NyBAQCBnZXRfbG93cmVzX21vZGUoaW50IGRybWZkLCBkcm1Nb2Rl TW9kZUluZm8gKm1vZGVfZGVmYXVsdCkKIH0KIAogc3RhdGljIHZvaWQKLXRlc3RfaW5pdChkYXRh X3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlKQordGVzdF9maW5pKGRhdGFfdCAqZGF0YSwgaWd0X291 dHB1dF90ICpvdXRwdXQsIGVudW0gcGlwZSBwaXBlKQogewotCWRhdGEtPnBpcGVfY3JjID0gaWd0 X3BpcGVfY3JjX25ldyhkYXRhLT5kcm1fZmQsIHBpcGUsIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9B VVRPKTsKLQlkYXRhLT5wbGFuZSA9IGNhbGxvYyhkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5f cGxhbmVzLCBzaXplb2YoZGF0YS0+cGxhbmUpKTtcCi0JaWd0X2Fzc2VydF9mKGRhdGEtPnBsYW5l LCAiRmFpbGVkIHRvIGFsbG9jYXRlIG1lbW9yeSBmb3IgJWQgcGxhbmVzXG4iLAotCSAgICAgICAg ICAgICBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzKTsKLQlkYXRhLT5mYiA9IGNh bGxvYyhkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzLCBzaXplb2Yoc3RydWN0IGln dF9mYikpOwotCWlndF9hc3NlcnRfZihkYXRhLT5mYiwgIkZhaWxlZCB0byBhbGxvY2F0ZSBtZW1v cnkgZm9yICVkIEZCc1xuIiwKLQkgICAgICAgICAgICAgZGF0YS0+ZGlzcGxheS5waXBlc1twaXBl XS5uX3BsYW5lcyk7Ci19CisJaWd0X3BsYW5lX3QgKnBsYW5lOwogCi1zdGF0aWMgdm9pZAotdGVz dF9maW5pKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRwdXQpCi17CiAJLyogcmVzdG9y ZSBvcmlnaW5hbCBtb2RlICovCiAJaWd0X291dHB1dF9vdmVycmlkZV9tb2RlKG91dHB1dCwgTlVM TCk7CiAKLQlmb3IgKGludCBpID0gMDsgaSA8IDI7IGkrKykKLQkJaWd0X3BsYW5lX3NldF9mYihk YXRhLT5wbGFuZVtpXSwgTlVMTCk7CisJZm9yX2VhY2hfcGxhbmVfb25fcGlwZSgmZGF0YS0+ZGlz cGxheSwgcGlwZSwgcGxhbmUpCisJCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsIE5VTEwpOwogCiAJ LyogcmVzZXQgdGhlIGNvbnN0cmFpbnQgb24gdGhlIHBpcGUgKi8KIAlpZ3Rfb3V0cHV0X3NldF9w aXBlKG91dHB1dCwgUElQRV9BTlkpOwogCi0JaWd0X3BpcGVfY3JjX2ZyZWUoZGF0YS0+cGlwZV9j cmMpOwotCi0JZnJlZShkYXRhLT5wbGFuZSk7Ci0JZGF0YS0+cGxhbmUgPSBOVUxMOwogCWZyZWUo ZGF0YS0+ZmIpOwogCWRhdGEtPmZiID0gTlVMTDsKIH0KIAogc3RhdGljIGludAotZGlzcGxheV9j b21taXRfbW9kZShkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLCBpbnQgZmxhZ3MsIGlndF9j cmNfdCAqY3JjKQorZGlzcGxheV9jb21taXRfbW9kZShpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBp Z3RfcGlwZV9jcmNfdCAqcGlwZV9jcmMsCisJCSAgICBlbnVtIHBpcGUgcGlwZSwgaW50IGZsYWdz LCBpZ3RfY3JjX3QgKmNyYykKIHsKIAljaGFyIGJ1ZlsyNTZdOwogCXN0cnVjdCBkcm1fZXZlbnQg KmUgPSAodm9pZCAqKWJ1ZjsKIAl1bnNpZ25lZCBpbnQgdmJsYW5rX3N0YXJ0LCB2Ymxhbmtfc3Rv cDsKIAlpbnQgbiwgcmV0OwogCi0JdmJsYW5rX3N0YXJ0ID0ga21zdGVzdF9nZXRfdmJsYW5rKGRh dGEtPmRpc3BsYXkuZHJtX2ZkLCBwaXBlLAorCXZibGFua19zdGFydCA9IGttc3Rlc3RfZ2V0X3Zi bGFuayhkaXNwbGF5LT5kcm1fZmQsIHBpcGUsCiAJCQkJCSAgRFJNX1ZCTEFOS19ORVhUT05NSVNT KTsKIAotCXJldCA9IGlndF9kaXNwbGF5X3RyeV9jb21taXRfYXRvbWljKCZkYXRhLT5kaXNwbGF5 LAotCQkJCQkgICAgZmxhZ3MsCi0JCQkJCSAgICBOVUxMKTsKKwlyZXQgPSBpZ3RfZGlzcGxheV90 cnlfY29tbWl0X2F0b21pYyhkaXNwbGF5LCBmbGFncywgTlVMTCk7CiAJaWd0X3NraXBfb24ocmV0 ICE9IDApOwogCiAJaWd0X3NldF90aW1lb3V0KDEsICJTdHVjayBvbiBwYWdlIGZsaXAiKTsKLQly ZXQgPSByZWFkKGRhdGEtPmRpc3BsYXkuZHJtX2ZkLCBidWYsIHNpemVvZihidWYpKTsKKwlyZXQg PSByZWFkKGRpc3BsYXktPmRybV9mZCwgYnVmLCBzaXplb2YoYnVmKSk7CiAJaWd0X2Fzc2VydChy ZXQgPj0gMCk7CiAKLQl2Ymxhbmtfc3RvcCA9IGttc3Rlc3RfZ2V0X3ZibGFuayhkYXRhLT5kaXNw bGF5LmRybV9mZCwgcGlwZSwgMCk7CisJdmJsYW5rX3N0b3AgPSBrbXN0ZXN0X2dldF92Ymxhbmso ZGlzcGxheS0+ZHJtX2ZkLCBwaXBlLCAwKTsKIAlpZ3RfYXNzZXJ0X2VxKGUtPnR5cGUsIERSTV9F VkVOVF9GTElQX0NPTVBMRVRFKTsKIAlpZ3RfcmVzZXRfdGltZW91dCgpOwogCi0JbiA9IGlndF9w aXBlX2NyY19nZXRfY3JjcyhkYXRhLT5waXBlX2NyYywgdmJsYW5rX3N0b3AgLSB2Ymxhbmtfc3Rh cnQsCi0JCQkJICAmY3JjKTsKKwluID0gaWd0X3BpcGVfY3JjX2dldF9jcmNzKHBpcGVfY3JjLCB2 Ymxhbmtfc3RvcCAtIHZibGFua19zdGFydCwgJmNyYyk7CiAJaWd0X2Fzc2VydF9lcShuLCB2Ymxh bmtfc3RvcCAtIHZibGFua19zdGFydCk7CiAKIAlyZXR1cm4gbjsKQEAgLTE4NCwzNSArMTY2LDMz IEBAIHN0YXRpYyBkcm1Nb2RlTW9kZUluZm8gKgogdGVzdF9zZXR1cChkYXRhX3QgKmRhdGEsIGVu dW0gcGlwZSBwaXBlLCB1aW50NjRfdCBtb2RpZmllciwgaW50IGZsYWdzLAogCSAgIGlndF9vdXRw dXRfdCAqb3V0cHV0KQogewotCXN0cnVjdCBrbXN0ZXN0X2NydGMgY3J0YzsKIAlkcm1Nb2RlTW9k ZUluZm8gKm1vZGU7CiAJaW50IHNpemU7CiAJaW50IGksIHgsIHk7CisJaWd0X3BsYW5lX3QgKnBs YW5lOwogCiAJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUpOwogCi0Ja21zdGVzdF9n ZXRfY3J0YyhkYXRhLT5kcm1fZmQsIHBpcGUsICZjcnRjKTsKLQlpZ3Rfc2tpcF9vbihjcnRjLm5f cGxhbmVzID4gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lcyk7Ci0JaWd0X3NraXBf b24oY3J0Yy5uX3BsYW5lcyA9PSAwKTsKLQotCWZvciAoaSA9IDA7IGkgPCBjcnRjLm5fcGxhbmVz OyBpKyspCi0JCWRhdGEtPnBsYW5lW2ldID0gaWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0LCBj cnRjLnBsYW5lc1tpXS5pbmRleCk7Ci0KIAltb2RlID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRw dXQpOwogCisJZGF0YS0+ZmIgPSBjYWxsb2MoZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3Bs YW5lcywgc2l6ZW9mKHN0cnVjdCBpZ3RfZmIpKTsKKwlpZ3RfYXNzZXJ0X2YoZGF0YS0+ZmIsICJG YWlsZWQgdG8gYWxsb2NhdGUgbWVtb3J5IGZvciAlZCBGQnNcbiIsCisJICAgICAgICAgICAgIGRh dGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMpOworCiAJaWd0X2NyZWF0ZV9jb2xvcl9m YihkYXRhLT5kcm1fZmQsIG1vZGUtPmhkaXNwbGF5LCBtb2RlLT52ZGlzcGxheSwKIAkJCSAgICBE Uk1fRk9STUFUX1hSR0I4ODg4LAogCQkJICAgIG1vZGlmaWVyLAogCQkJICAgIDAuMCwgMC4wLCAx LjAsCiAJCQkgICAgJmRhdGEtPmZiWzBdKTsKIAotCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxh bmVbMF0sICZkYXRhLT5mYlswXSk7Ci0KIAkvKiB5ZWxsb3cgc3ByaXRlIHBsYW5lIGluIGxvd2Vy IGxlZnQgY29ybmVyICovCi0JZm9yIChpID0gMDsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykgewot CQlpZiAoZGF0YS0+cGxhbmVbaV0tPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKKwlm b3JfZWFjaF9wbGFuZV9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlLCBwbGFuZSkgeworCQlp ZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkgeworCQkJaWd0X3BsYW5l X3NldF9mYihwbGFuZSwgJmRhdGEtPmZiWzBdKTsKIAkJCWNvbnRpbnVlOwotCQlpZiAoZGF0YS0+ cGxhbmVbaV0tPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQorCQl9CisKKwkJaWYgKHBs YW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCXNpemUgPSA2NDsKIAkJZWxz ZQogCQkJc2l6ZSA9IFNJWkU7CkBAIC0yMjIsMTMgKzIwMiwxMyBAQCB0ZXN0X3NldHVwKGRhdGFf dCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90IG1vZGlmaWVyLCBpbnQgZmxhZ3MsCiAK IAkJaWd0X2NyZWF0ZV9jb2xvcl9mYihkYXRhLT5kcm1fZmQsCiAJCQkJICAgIHNpemUsIHNpemUs Ci0JCQkJICAgIGRhdGEtPnBsYW5lW2ldLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUiA/ IERSTV9GT1JNQVRfQVJHQjg4ODggOiBEUk1fRk9STUFUX1hSR0I4ODg4LAotCQkJCSAgICBkYXRh LT5wbGFuZVtpXS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBMT0NBTF9EUk1fRk9S TUFUX01PRF9OT05FIDogbW9kaWZpZXIsCisJCQkJICAgIHBsYW5lLT50eXBlID09IERSTV9QTEFO RV9UWVBFX0NVUlNPUiA/IERSTV9GT1JNQVRfQVJHQjg4ODggOiBEUk1fRk9STUFUX1hSR0I4ODg4 LAorCQkJCSAgICBwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBMT0NBTF9E Uk1fRk9STUFUX01PRF9OT05FIDogbW9kaWZpZXIsCiAJCQkJICAgIDEuMCwgMS4wLCAwLjAsCiAJ CQkJICAgICZkYXRhLT5mYltpXSk7CiAKLQkJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihkYXRhLT5w bGFuZVtpXSwgeCwgeSk7Ci0JCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxhbmVbaV0sICZkYXRh LT5mYltpXSk7CisJCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGxhbmUsIHgsIHkpOworCQlpZ3Rf cGxhbmVfc2V0X2ZiKHBsYW5lLCAmZGF0YS0+ZmJbaV0pOwogCX0KIAogCXJldHVybiBtb2RlOwpA QCAtMjQ0LDIxICsyMjQsMjIgQEAgdGVzdF9wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRh X3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLAogCWRybU1vZGVNb2RlSW5mbyAqbW9kZTEsICptb2Rl MiwgKm1vZGUzOwogCWludCByZXQsIG47CiAJaW50IGZsYWdzID0gRFJNX01PREVfUEFHRV9GTElQ X0VWRU5UIHwgRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVTRVQ7CisJaWd0X3BpcGVfY3JjX3Qg KnBpcGVfY3JjOwogCiAJaWd0X2luZm8oIlRlc3RpbmcgY29ubmVjdG9yICVzIHVzaW5nIHBpcGUg JXNcbiIsCiAJCSBpZ3Rfb3V0cHV0X25hbWUob3V0cHV0KSwga21zdGVzdF9waXBlX25hbWUocGlw ZSkpOwogCi0JdGVzdF9pbml0KGRhdGEsIHBpcGUpOwotCiAJbW9kZTEgPSB0ZXN0X3NldHVwKGRh dGEsIHBpcGUsIG1vZGlmaWVyLCBmbGFncywgb3V0cHV0KTsKIAogCW1vZGVfbG93cmVzID0gZ2V0 X2xvd3Jlc19tb2RlKGRhdGEtPmRybV9mZCwgbW9kZTEpOwogCi0JaWd0X3BpcGVfY3JjX3N0YXJ0 KGRhdGEtPnBpcGVfY3JjKTsKIAlyZXQgPSBpZ3RfZGlzcGxheV90cnlfY29tbWl0MigmZGF0YS0+ ZGlzcGxheSwgQ09NTUlUX0FUT01JQyk7CiAJaWd0X3NraXBfb24ocmV0ICE9IDApOwogCi0JbiA9 IGlndF9waXBlX2NyY19nZXRfY3JjcyhkYXRhLT5waXBlX2NyYywgMSwgJmNyY19oaXJlczEpOwor CXBpcGVfY3JjID0gaWd0X3BpcGVfY3JjX25ldyhkYXRhLT5kcm1fZmQsIHBpcGUsIElOVEVMX1BJ UEVfQ1JDX1NPVVJDRV9BVVRPKTsKKwlpZ3RfcGlwZV9jcmNfc3RhcnQocGlwZV9jcmMpOworCisJ biA9IGlndF9waXBlX2NyY19nZXRfY3JjcyhwaXBlX2NyYywgMSwgJmNyY19oaXJlczEpOwogCWln dF9hc3NlcnRfZXEoMSwgbik7CiAKIAlpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUoZGF0YS0+ZHJt X2ZkLCBwaXBlLCB0cnVlKTsKQEAgLTI3MSw3ICsyNTIsNyBAQCB0ZXN0X3BsYW5lX3Bvc2l0aW9u X3dpdGhfb3V0cHV0KGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsCiAKIAljaGVja19tb2Rl KCZtb2RlX2xvd3JlcywgbW9kZTIpOwogCi0JZGlzcGxheV9jb21taXRfbW9kZShkYXRhLCBwaXBl LCBmbGFncywgY3JjX2xvd3Jlcyk7CisJZGlzcGxheV9jb21taXRfbW9kZSgmZGF0YS0+ZGlzcGxh eSwgcGlwZV9jcmMsIHBpcGUsIGZsYWdzLCBjcmNfbG93cmVzKTsKIAogCWlndF9hc3NlcnRfcGxh bmVfdmlzaWJsZShkYXRhLT5kcm1fZmQsIHBpcGUsIGZhbHNlKTsKIApAQCAtMjgzLDQxICsyNjQs MzkgQEAgdGVzdF9wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhX3QgKmRhdGEsIGVudW0g cGlwZSBwaXBlLAogCiAJY2hlY2tfbW9kZShtb2RlMSwgbW9kZTMpOwogCi0JZGlzcGxheV9jb21t aXRfbW9kZShkYXRhLCBwaXBlLCBmbGFncywgY3JjX2hpcmVzMik7CisJZGlzcGxheV9jb21taXRf bW9kZSgmZGF0YS0+ZGlzcGxheSwgcGlwZV9jcmMsIHBpcGUsIGZsYWdzLCBjcmNfaGlyZXMyKTsK IAogCWlndF9hc3NlcnRfcGxhbmVfdmlzaWJsZShkYXRhLT5kcm1fZmQsIHBpcGUsIHRydWUpOwog Ci0JaWd0X3BpcGVfY3JjX3N0b3AoZGF0YS0+cGlwZV9jcmMpOworCWlndF9waXBlX2NyY19zdG9w KHBpcGVfY3JjKTsKKwlpZ3RfcGlwZV9jcmNfZnJlZShwaXBlX2NyYyk7CiAKLQl0ZXN0X2Zpbmko ZGF0YSwgb3V0cHV0KTsKKwl0ZXN0X2ZpbmkoZGF0YSwgb3V0cHV0LCBwaXBlKTsKIH0KIAogc3Rh dGljIHZvaWQKIHRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlw ZSwgdWludDY0X3QgbW9kaWZpZXIpCiB7CiAJaWd0X291dHB1dF90ICpvdXRwdXQ7Ci0JaW50IGNv bm5lY3RlZF9vdXRzOwogCWNvbnN0IGludCBnZW4gPSBpbnRlbF9nZW4oaW50ZWxfZ2V0X2RybV9k ZXZpZChkYXRhLT5kcm1fZmQpKTsKIAotCWlndF9yZXF1aXJlKGRhdGEtPmRpc3BsYXkuaXNfYXRv bWljKTsKLQlpZ3Rfc2tpcF9vbihwaXBlID49IGRhdGEtPmRpc3BsYXkubl9waXBlcyk7Ci0KIAlp ZiAobW9kaWZpZXIgPT0gTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lfVElMRUQgfHwKIAkgICAgbW9k aWZpZXIgPT0gTE9DQUxfSTkxNV9GT1JNQVRfTU9EX1lmX1RJTEVEKQogCQlpZ3Rfc2tpcF9vbihn ZW4gPCA5KTsKIAotCWNvbm5lY3RlZF9vdXRzID0gMDsKLQlmb3JfZWFjaF92YWxpZF9vdXRwdXRf b25fcGlwZSgmZGF0YS0+ZGlzcGxheSwgcGlwZSwgb3V0cHV0KSB7CisJZm9yX2VhY2hfdmFsaWRf b3V0cHV0X29uX3BpcGUoJmRhdGEtPmRpc3BsYXksIHBpcGUsIG91dHB1dCkKIAkJdGVzdF9wbGFu ZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRhLCBwaXBlLCBvdXRwdXQsIG1vZGlmaWVyKTsKLQkJ Y29ubmVjdGVkX291dHMrKzsKLQl9Ci0KLQlpZ3Rfc2tpcF9vbihjb25uZWN0ZWRfb3V0cyA9PSAw KTsKIH0KIAogc3RhdGljIHZvaWQKIHJ1bl90ZXN0c19mb3JfcGlwZShkYXRhX3QgKmRhdGEsIGVu dW0gcGlwZSBwaXBlKQogeworCWlndF9maXh0dXJlIHsKKwkJaWd0X3NraXBfb24ocGlwZSA+PSBk YXRhLT5kaXNwbGF5Lm5fcGlwZXMpOworCisJCWlndF9kaXNwbGF5X3JlcXVpcmVfb3V0cHV0X29u X3BpcGUoJmRhdGEtPmRpc3BsYXksIHBpcGUpOworCX0KKwogCWlndF9zdWJ0ZXN0X2YoInBpcGUt JXMtdGlsaW5nLW5vbmUiLAogCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShwaXBlKSkKIAkJdGVz dF9wbGFuZV9wb3NpdGlvbihkYXRhLCBwaXBlLCBMT0NBTF9EUk1fRk9STUFUX01PRF9OT05FKTsK QEAgLTM1MCwxMCArMzI5LDEyIEBAIGlndF9tYWluCiAKIAkJaWd0X3JlcXVpcmVfcGlwZV9jcmMo ZGF0YS5kcm1fZmQpOwogCQlpZ3RfZGlzcGxheV9pbml0KCZkYXRhLmRpc3BsYXksIGRhdGEuZHJt X2ZkKTsKKwkJaWd0X3JlcXVpcmUoZGF0YS5kaXNwbGF5LmlzX2F0b21pYyk7CiAJfQogCiAJZm9y X2VhY2hfcGlwZV9zdGF0aWMocGlwZSkKLQkJcnVuX3Rlc3RzX2Zvcl9waXBlKCZkYXRhLCBwaXBl KTsKKwkJaWd0X3N1YnRlc3RfZ3JvdXAKKwkJCXJ1bl90ZXN0c19mb3JfcGlwZSgmZGF0YSwgcGlw ZSk7CiAKIAlpZ3RfZml4dHVyZSB7CiAJCWlndF9kaXNwbGF5X2ZpbmkoJmRhdGEuZGlzcGxheSk7 Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=