From: Maarten Lankhorst Subject: [PATCH i-g-t (resend)] tests/kms_plane_lowres: Rework tests to work without fbcon. Date: Mon, 16 Oct 2017 09:48:04 +0200 Message-ID: <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 [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id F32656E330 for ; Mon, 16 Oct 2017 07:48:09 +0000 (UTC) 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 ci4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBs aW51eC5pbnRlbC5jb20+Ci0tLQogbGliL2lndF9rbXMuYyAgICAgICAgICAgIHwgIDUgKystLQog bGliL2lndF9rbXMuaCAgICAgICAgICAgIHwgIDEgLQogdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5j IHwgNjQgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAz IGZpbGVzIGNoYW5nZWQsIDMwIGluc2VydGlvbnMoKyksIDQwIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2xpYi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmluZGV4IDM3OWJkMGMzODNmZC4u NzU2YWViYTEyNTVjIDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21z LmMKQEAgLTE0NDcsNyArMTQ0Nyw3IEBAIHN0YXRpYyB2b2lkIHBhcnNlX2NydGMoY2hhciAqaW5m bywgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0YykKIAlpZ3RfYXNzZXJ0X2VxKHJldCwgMik7CiB9 CiAKLXZvaWQga21zdGVzdF9nZXRfY3J0YyhpbnQgZGV2aWNlLCBlbnVtIHBpcGUgcGlwZSwgc3Ry dWN0IGttc3Rlc3RfY3J0YyAqY3J0YykKK3N0YXRpYyB2b2lkIGttc3Rlc3RfZ2V0X2NydGMoaW50 IGRldmljZSwgZW51bSBwaXBlIHBpcGUsIHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNydGMpCiB7CiAJ Y2hhciB0bXBbMjU2XTsKIAlGSUxFICpmaWxlOwpAQCAtMTQ5MSw3ICsxNDkxLDcgQEAgdm9pZCBr bXN0ZXN0X2dldF9jcnRjKGludCBkZXZpY2UsIGVudW0gcGlwZSBwaXBlLCBzdHJ1Y3Qga21zdGVz dF9jcnRjICpjcnRjKQogCWZjbG9zZShmaWxlKTsKIAljbG9zZShmZCk7CiAKLQlpZ3Rfc2tpcF9v bihuY3J0YyA9PSAwKTsKKwlpZ3RfYXNzZXJ0KG5jcnRjID09IDEpOwogfQogCiB2b2lkIGlndF9h c3NlcnRfcGxhbmVfdmlzaWJsZShpbnQgZmQsIGVudW0gcGlwZSBwaXBlLCBib29sIHZpc2liaWxp dHkpCkBAIC0xNTE2LDYgKzE1MTYsNyBAQCB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJsZShp bnQgZmQsIGVudW0gcGlwZSBwaXBlLCBib29sIHZpc2liaWxpdHkpCiAJCX0KIAl9CiAKKwlmcmVl KGNydGMucGxhbmVzKTsKIAlpZ3RfYXNzZXJ0X2VxKHZpc2libGUsIHZpc2liaWxpdHkpOwogfQog CmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5oIGIvbGliL2lndF9rbXMuaAppbmRleCA4ZGMxMThj OTYxYjcuLjI5NGVhNTQwMGU0OSAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuaAorKysgYi9saWIv aWd0X2ttcy5oCkBAIC0yMjMsNyArMjIzLDYgQEAgdWludDMyX3Qga21zdGVzdF9kdW1iX2NyZWF0 ZShpbnQgZmQsIGludCB3aWR0aCwgaW50IGhlaWdodCwgaW50IGJwcCwKIHZvaWQgKmttc3Rlc3Rf ZHVtYl9tYXBfYnVmZmVyKGludCBmZCwgdWludDMyX3QgaGFuZGxlLCB1aW50NjRfdCBzaXplLAog CQkJICAgICAgdW5zaWduZWQgcHJvdCk7CiB1bnNpZ25lZCBpbnQga21zdGVzdF9nZXRfdmJsYW5r KGludCBmZCwgaW50IHBpcGUsIHVuc2lnbmVkIGludCBmbGFncyk7Ci12b2lkIGttc3Rlc3RfZ2V0 X2NydGMoaW50IGZkLCBlbnVtIHBpcGUgcGlwZSwgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0Yyk7 CiB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJsZShpbnQgZmQsIGVudW0gcGlwZSBwaXBlLCBi b29sIHZpc2liaWxpdHkpOwogCiAvKgpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX3BsYW5lX2xvd3Jl cy5jIGIvdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jCmluZGV4IGIxNmM4Y2Q0MzNiMi4uNDRlMGFk YTkyZWFkIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMKKysrIGIvdGVzdHMv a21zX3BsYW5lX2xvd3Jlcy5jCkBAIC00MCw3ICs0MCw2IEBAIHR5cGVkZWYgc3RydWN0IHsKIAlp bnQgZHJtX2ZkOwogCWlndF9kaXNwbGF5X3QgZGlzcGxheTsKIAlpZ3RfcGlwZV9jcmNfdCAqcGlw ZV9jcmM7Ci0JaWd0X3BsYW5lX3QgKipwbGFuZTsKIAlzdHJ1Y3QgaWd0X2ZiICpmYjsKIH0gZGF0 YV90OwogCkBAIC0xMTMsMzAgKzExMiwyNyBAQCBzdGF0aWMgdm9pZAogdGVzdF9pbml0KGRhdGFf dCAqZGF0YSwgZW51bSBwaXBlIHBpcGUpCiB7CiAJZGF0YS0+cGlwZV9jcmMgPSBpZ3RfcGlwZV9j cmNfbmV3KGRhdGEtPmRybV9mZCwgcGlwZSwgSU5URUxfUElQRV9DUkNfU09VUkNFX0FVVE8pOwot CWRhdGEtPnBsYW5lID0gY2FsbG9jKGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMs IHNpemVvZihkYXRhLT5wbGFuZSkpO1wKLQlpZ3RfYXNzZXJ0X2YoZGF0YS0+cGxhbmUsICJGYWls ZWQgdG8gYWxsb2NhdGUgbWVtb3J5IGZvciAlZCBwbGFuZXNcbiIsCi0JICAgICAgICAgICAgIGRh dGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMpOwogCWRhdGEtPmZiID0gY2FsbG9jKGRh dGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMsIHNpemVvZihzdHJ1Y3QgaWd0X2ZiKSk7 CiAJaWd0X2Fzc2VydF9mKGRhdGEtPmZiLCAiRmFpbGVkIHRvIGFsbG9jYXRlIG1lbW9yeSBmb3Ig JWQgRkJzXG4iLAogCSAgICAgICAgICAgICBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxh bmVzKTsKIH0KIAogc3RhdGljIHZvaWQKLXRlc3RfZmluaShkYXRhX3QgKmRhdGEsIGlndF9vdXRw dXRfdCAqb3V0cHV0KQordGVzdF9maW5pKGRhdGFfdCAqZGF0YSwgaWd0X291dHB1dF90ICpvdXRw dXQsIGVudW0gcGlwZSBwaXBlKQogeworCWlndF9wbGFuZV90ICpwbGFuZTsKKwogCS8qIHJlc3Rv cmUgb3JpZ2luYWwgbW9kZSAqLwogCWlndF9vdXRwdXRfb3ZlcnJpZGVfbW9kZShvdXRwdXQsIE5V TEwpOwogCi0JZm9yIChpbnQgaSA9IDA7IGkgPCAyOyBpKyspCi0JCWlndF9wbGFuZV9zZXRfZmIo ZGF0YS0+cGxhbmVbaV0sIE5VTEwpOworCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoJmRhdGEtPmRp c3BsYXksIHBpcGUsIHBsYW5lKQorCQlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lLCBOVUxMKTsKIAog CS8qIHJlc2V0IHRoZSBjb25zdHJhaW50IG9uIHRoZSBwaXBlICovCiAJaWd0X291dHB1dF9zZXRf cGlwZShvdXRwdXQsIFBJUEVfQU5ZKTsKIAogCWlndF9waXBlX2NyY19mcmVlKGRhdGEtPnBpcGVf Y3JjKTsKIAotCWZyZWUoZGF0YS0+cGxhbmUpOwotCWRhdGEtPnBsYW5lID0gTlVMTDsKIAlmcmVl KGRhdGEtPmZiKTsKIAlkYXRhLT5mYiA9IE5VTEw7CiB9CkBAIC0xODQsMTkgKzE4MCwxMyBAQCBz dGF0aWMgZHJtTW9kZU1vZGVJbmZvICoKIHRlc3Rfc2V0dXAoZGF0YV90ICpkYXRhLCBlbnVtIHBp cGUgcGlwZSwgdWludDY0X3QgbW9kaWZpZXIsIGludCBmbGFncywKIAkgICBpZ3Rfb3V0cHV0X3Qg Km91dHB1dCkKIHsKLQlzdHJ1Y3Qga21zdGVzdF9jcnRjIGNydGM7CiAJZHJtTW9kZU1vZGVJbmZv ICptb2RlOwogCWludCBzaXplOwogCWludCBpLCB4LCB5OworCWlndF9wbGFuZV90ICpwbGFuZTsK IAogCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKIAotCWttc3Rlc3RfZ2V0X2Ny dGMoZGF0YS0+ZHJtX2ZkLCBwaXBlLCAmY3J0Yyk7Ci0JaWd0X3NraXBfb24oY3J0Yy5uX3BsYW5l cyA+IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMpOwotCWlndF9za2lwX29uKGNy dGMubl9wbGFuZXMgPT0gMCk7Ci0KLQlmb3IgKGkgPSAwOyBpIDwgY3J0Yy5uX3BsYW5lczsgaSsr KQotCQlkYXRhLT5wbGFuZVtpXSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgY3J0Yy5w bGFuZXNbaV0uaW5kZXgpOwogCiAJbW9kZSA9IGlndF9vdXRwdXRfZ2V0X21vZGUob3V0cHV0KTsK IApAQCAtMjA2LDEzICsxOTYsMTQgQEAgdGVzdF9zZXR1cChkYXRhX3QgKmRhdGEsIGVudW0gcGlw ZSBwaXBlLCB1aW50NjRfdCBtb2RpZmllciwgaW50IGZsYWdzLAogCQkJICAgIDAuMCwgMC4wLCAx LjAsCiAJCQkgICAgJmRhdGEtPmZiWzBdKTsKIAotCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxh bmVbMF0sICZkYXRhLT5mYlswXSk7Ci0KIAkvKiB5ZWxsb3cgc3ByaXRlIHBsYW5lIGluIGxvd2Vy IGxlZnQgY29ybmVyICovCi0JZm9yIChpID0gMDsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykgewot CQlpZiAoZGF0YS0+cGxhbmVbaV0tPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKKwlm b3JfZWFjaF9wbGFuZV9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlLCBwbGFuZSkgeworCQlp ZiAocGxhbmUtPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkgeworCQkJaWd0X3BsYW5l X3NldF9mYihwbGFuZSwgJmRhdGEtPmZiWzBdKTsKIAkJCWNvbnRpbnVlOwotCQlpZiAoZGF0YS0+ cGxhbmVbaV0tPnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQorCQl9CisKKwkJaWYgKHBs YW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCXNpemUgPSA2NDsKIAkJZWxz ZQogCQkJc2l6ZSA9IFNJWkU7CkBAIC0yMjIsMTMgKzIxMywxMyBAQCB0ZXN0X3NldHVwKGRhdGFf dCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90IG1vZGlmaWVyLCBpbnQgZmxhZ3MsCiAK IAkJaWd0X2NyZWF0ZV9jb2xvcl9mYihkYXRhLT5kcm1fZmQsCiAJCQkJICAgIHNpemUsIHNpemUs Ci0JCQkJICAgIGRhdGEtPnBsYW5lW2ldLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUiA/ IERSTV9GT1JNQVRfQVJHQjg4ODggOiBEUk1fRk9STUFUX1hSR0I4ODg4LAotCQkJCSAgICBkYXRh LT5wbGFuZVtpXS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBMT0NBTF9EUk1fRk9S TUFUX01PRF9OT05FIDogbW9kaWZpZXIsCisJCQkJICAgIHBsYW5lLT50eXBlID09IERSTV9QTEFO RV9UWVBFX0NVUlNPUiA/IERSTV9GT1JNQVRfQVJHQjg4ODggOiBEUk1fRk9STUFUX1hSR0I4ODg4 LAorCQkJCSAgICBwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBMT0NBTF9E Uk1fRk9STUFUX01PRF9OT05FIDogbW9kaWZpZXIsCiAJCQkJICAgIDEuMCwgMS4wLCAwLjAsCiAJ CQkJICAgICZkYXRhLT5mYltpXSk7CiAKLQkJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihkYXRhLT5w bGFuZVtpXSwgeCwgeSk7Ci0JCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cGxhbmVbaV0sICZkYXRh LT5mYltpXSk7CisJCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGxhbmUsIHgsIHkpOworCQlpZ3Rf cGxhbmVfc2V0X2ZiKHBsYW5lLCAmZGF0YS0+ZmJbaV0pOwogCX0KIAogCXJldHVybiBtb2RlOwpA QCAtMjg5LDM1ICsyODAsMzIgQEAgdGVzdF9wbGFuZV9wb3NpdGlvbl93aXRoX291dHB1dChkYXRh X3QgKmRhdGEsIGVudW0gcGlwZSBwaXBlLAogCiAJaWd0X3BpcGVfY3JjX3N0b3AoZGF0YS0+cGlw ZV9jcmMpOwogCi0JdGVzdF9maW5pKGRhdGEsIG91dHB1dCk7CisJdGVzdF9maW5pKGRhdGEsIG91 dHB1dCwgcGlwZSk7CiB9CiAKIHN0YXRpYyB2b2lkCiB0ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGFf dCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90IG1vZGlmaWVyKQogewogCWlndF9vdXRw dXRfdCAqb3V0cHV0OwotCWludCBjb25uZWN0ZWRfb3V0czsKIAljb25zdCBpbnQgZ2VuID0gaW50 ZWxfZ2VuKGludGVsX2dldF9kcm1fZGV2aWQoZGF0YS0+ZHJtX2ZkKSk7CiAKLQlpZ3RfcmVxdWly ZShkYXRhLT5kaXNwbGF5LmlzX2F0b21pYyk7Ci0JaWd0X3NraXBfb24ocGlwZSA+PSBkYXRhLT5k aXNwbGF5Lm5fcGlwZXMpOwotCiAJaWYgKG1vZGlmaWVyID09IExPQ0FMX0k5MTVfRk9STUFUX01P RF9ZX1RJTEVEIHx8CiAJICAgIG1vZGlmaWVyID09IExPQ0FMX0k5MTVfRk9STUFUX01PRF9ZZl9U SUxFRCkKIAkJaWd0X3NraXBfb24oZ2VuIDwgOSk7CiAKLQljb25uZWN0ZWRfb3V0cyA9IDA7Ci0J Zm9yX2VhY2hfdmFsaWRfb3V0cHV0X29uX3BpcGUoJmRhdGEtPmRpc3BsYXksIHBpcGUsIG91dHB1 dCkgeworCWZvcl9lYWNoX3ZhbGlkX291dHB1dF9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBl LCBvdXRwdXQpCiAJCXRlc3RfcGxhbmVfcG9zaXRpb25fd2l0aF9vdXRwdXQoZGF0YSwgcGlwZSwg b3V0cHV0LCBtb2RpZmllcik7Ci0JCWNvbm5lY3RlZF9vdXRzKys7Ci0JfQotCi0JaWd0X3NraXBf b24oY29ubmVjdGVkX291dHMgPT0gMCk7CiB9CiAKIHN0YXRpYyB2b2lkCiBydW5fdGVzdHNfZm9y X3BpcGUoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSkKIHsKKwlpZ3RfZml4dHVyZSB7CisJ CWlndF9za2lwX29uKHBpcGUgPj0gZGF0YS0+ZGlzcGxheS5uX3BpcGVzKTsKKworCQlpZ3RfZGlz cGxheV9yZXF1aXJlX291dHB1dF9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlKTsKKwl9CisK IAlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLXRpbGluZy1ub25lIiwKIAkJICAgICAga21zdGVzdF9w aXBlX25hbWUocGlwZSkpCiAJCXRlc3RfcGxhbmVfcG9zaXRpb24oZGF0YSwgcGlwZSwgTE9DQUxf RFJNX0ZPUk1BVF9NT0RfTk9ORSk7CkBAIC0zNTAsMTAgKzMzOCwxMiBAQCBpZ3RfbWFpbgogCiAJ CWlndF9yZXF1aXJlX3BpcGVfY3JjKGRhdGEuZHJtX2ZkKTsKIAkJaWd0X2Rpc3BsYXlfaW5pdCgm ZGF0YS5kaXNwbGF5LCBkYXRhLmRybV9mZCk7CisJCWlndF9yZXF1aXJlKGRhdGEuZGlzcGxheS5p c19hdG9taWMpOwogCX0KIAogCWZvcl9lYWNoX3BpcGVfc3RhdGljKHBpcGUpCi0JCXJ1bl90ZXN0 c19mb3JfcGlwZSgmZGF0YSwgcGlwZSk7CisJCWlndF9zdWJ0ZXN0X2dyb3VwCisJCQlydW5fdGVz dHNfZm9yX3BpcGUoJmRhdGEsIHBpcGUpOwogCiAJaWd0X2ZpeHR1cmUgewogCQlpZ3RfZGlzcGxh eV9maW5pKCZkYXRhLmRpc3BsYXkpOwotLSAKMi4xNC4xCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdm eEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9pbnRlbC1nZngK