From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH i-g-t] tests/kms_plane_lowres: Rework tests to work without fbcon. Date: Fri, 13 Oct 2017 16:58:09 +0200 Message-ID: <20171013145809.6364-1-maarten.lankhorst@linux.intel.com> References: <20171013141049.5242-3-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 A96A66EB79 for ; Fri, 13 Oct 2017 14:58:13 +0000 (UTC) In-Reply-To: <20171013141049.5242-3-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 ci4KClNpZ25lZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBs aW51eC5pbnRlbC5jb20+Ci0tLQpSZXNlbmQsIG1lc3NlZCB1cCBteSBnaXQtc2VuZC1lbWFpbAoK IGxpYi9pZ3Rfa21zLmMgICAgICAgICAgICB8ICA1ICsrLS0KIGxpYi9pZ3Rfa21zLmggICAgICAg ICAgICB8ICAxIC0KIHRlc3RzL2ttc19wbGFuZV9sb3dyZXMuYyB8IDY0ICsrKysrKysrKysrKysr KysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzMCBp bnNlcnRpb25zKCspLCA0MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5j IGIvbGliL2lndF9rbXMuYwppbmRleCBjYjJiYzJiOGRmOTguLjFjNTA0ODRhNjEzYyAxMDA2NDQK LS0tIGEvbGliL2lndF9rbXMuYworKysgYi9saWIvaWd0X2ttcy5jCkBAIC0xNDE2LDcgKzE0MTYs NyBAQCBzdGF0aWMgdm9pZCBwYXJzZV9jcnRjKGNoYXIgKmluZm8sIHN0cnVjdCBrbXN0ZXN0X2Ny dGMgKmNydGMpCiAJaWd0X2Fzc2VydF9lcShyZXQsIDIpOwogfQogCi12b2lkIGttc3Rlc3RfZ2V0 X2NydGMoaW50IGRldmljZSwgZW51bSBwaXBlIHBpcGUsIHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNy dGMpCitzdGF0aWMgdm9pZCBrbXN0ZXN0X2dldF9jcnRjKGludCBkZXZpY2UsIGVudW0gcGlwZSBw aXBlLCBzdHJ1Y3Qga21zdGVzdF9jcnRjICpjcnRjKQogewogCWNoYXIgdG1wWzI1Nl07CiAJRklM RSAqZmlsZTsKQEAgLTE0NjAsNyArMTQ2MCw3IEBAIHZvaWQga21zdGVzdF9nZXRfY3J0YyhpbnQg ZGV2aWNlLCBlbnVtIHBpcGUgcGlwZSwgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0YykKIAlmY2xv c2UoZmlsZSk7CiAJY2xvc2UoZmQpOwogCi0JaWd0X3NraXBfb24obmNydGMgPT0gMCk7CisJaWd0 X2Fzc2VydChuY3J0YyA9PSAxKTsKIH0KIAogdm9pZCBpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUo aW50IGZkLCBlbnVtIHBpcGUgcGlwZSwgYm9vbCB2aXNpYmlsaXR5KQpAQCAtMTQ4NSw2ICsxNDg1 LDcgQEAgdm9pZCBpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUoaW50IGZkLCBlbnVtIHBpcGUgcGlw ZSwgYm9vbCB2aXNpYmlsaXR5KQogCQl9CiAJfQogCisJZnJlZShjcnRjLnBsYW5lcyk7CiAJaWd0 X2Fzc2VydF9lcSh2aXNpYmxlLCB2aXNpYmlsaXR5KTsKIH0KIApkaWZmIC0tZ2l0IGEvbGliL2ln dF9rbXMuaCBiL2xpYi9pZ3Rfa21zLmgKaW5kZXggMjAwZjM1ZTYzMzA4Li5hY2M4MjkxM2UwYjcg MTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21zLmgKKysrIGIvbGliL2lndF9rbXMuaApAQCAtMjIxLDcg KzIyMSw2IEBAIHVpbnQzMl90IGttc3Rlc3RfZHVtYl9jcmVhdGUoaW50IGZkLCBpbnQgd2lkdGgs IGludCBoZWlnaHQsIGludCBicHAsCiB2b2lkICprbXN0ZXN0X2R1bWJfbWFwX2J1ZmZlcihpbnQg ZmQsIHVpbnQzMl90IGhhbmRsZSwgdWludDY0X3Qgc2l6ZSwKIAkJCSAgICAgIHVuc2lnbmVkIHBy b3QpOwogdW5zaWduZWQgaW50IGttc3Rlc3RfZ2V0X3ZibGFuayhpbnQgZmQsIGludCBwaXBlLCB1 bnNpZ25lZCBpbnQgZmxhZ3MpOwotdm9pZCBrbXN0ZXN0X2dldF9jcnRjKGludCBmZCwgZW51bSBw aXBlIHBpcGUsIHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNydGMpOwogdm9pZCBpZ3RfYXNzZXJ0X3Bs YW5lX3Zpc2libGUoaW50IGZkLCBlbnVtIHBpcGUgcGlwZSwgYm9vbCB2aXNpYmlsaXR5KTsKIAog LyoKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19wbGFuZV9sb3dyZXMuYyBiL3Rlc3RzL2ttc19wbGFu ZV9sb3dyZXMuYwppbmRleCBiMTZjOGNkNDMzYjIuLjQ0ZTBhZGE5MmVhZCAxMDA2NDQKLS0tIGEv dGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jCisrKyBiL3Rlc3RzL2ttc19wbGFuZV9sb3dyZXMuYwpA QCAtNDAsNyArNDAsNiBAQCB0eXBlZGVmIHN0cnVjdCB7CiAJaW50IGRybV9mZDsKIAlpZ3RfZGlz cGxheV90IGRpc3BsYXk7CiAJaWd0X3BpcGVfY3JjX3QgKnBpcGVfY3JjOwotCWlndF9wbGFuZV90 ICoqcGxhbmU7CiAJc3RydWN0IGlndF9mYiAqZmI7CiB9IGRhdGFfdDsKIApAQCAtMTEzLDMwICsx MTIsMjcgQEAgc3RhdGljIHZvaWQKIHRlc3RfaW5pdChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBw aXBlKQogewogCWRhdGEtPnBpcGVfY3JjID0gaWd0X3BpcGVfY3JjX25ldyhkYXRhLT5kcm1fZmQs IHBpcGUsIElOVEVMX1BJUEVfQ1JDX1NPVVJDRV9BVVRPKTsKLQlkYXRhLT5wbGFuZSA9IGNhbGxv YyhkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzLCBzaXplb2YoZGF0YS0+cGxhbmUp KTtcCi0JaWd0X2Fzc2VydF9mKGRhdGEtPnBsYW5lLCAiRmFpbGVkIHRvIGFsbG9jYXRlIG1lbW9y eSBmb3IgJWQgcGxhbmVzXG4iLAotCSAgICAgICAgICAgICBkYXRhLT5kaXNwbGF5LnBpcGVzW3Bp cGVdLm5fcGxhbmVzKTsKIAlkYXRhLT5mYiA9IGNhbGxvYyhkYXRhLT5kaXNwbGF5LnBpcGVzW3Bp cGVdLm5fcGxhbmVzLCBzaXplb2Yoc3RydWN0IGlndF9mYikpOwogCWlndF9hc3NlcnRfZihkYXRh LT5mYiwgIkZhaWxlZCB0byBhbGxvY2F0ZSBtZW1vcnkgZm9yICVkIEZCc1xuIiwKIAkgICAgICAg ICAgICAgZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lcyk7CiB9CiAKIHN0YXRpYyB2 b2lkCi10ZXN0X2ZpbmkoZGF0YV90ICpkYXRhLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dCkKK3Rlc3Rf ZmluaShkYXRhX3QgKmRhdGEsIGlndF9vdXRwdXRfdCAqb3V0cHV0LCBlbnVtIHBpcGUgcGlwZSkK IHsKKwlpZ3RfcGxhbmVfdCAqcGxhbmU7CisKIAkvKiByZXN0b3JlIG9yaWdpbmFsIG1vZGUgKi8K IAlpZ3Rfb3V0cHV0X292ZXJyaWRlX21vZGUob3V0cHV0LCBOVUxMKTsKIAotCWZvciAoaW50IGkg PSAwOyBpIDwgMjsgaSsrKQotCQlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBsYW5lW2ldLCBOVUxM KTsKKwlmb3JfZWFjaF9wbGFuZV9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlLCBwbGFuZSkK KwkJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwgTlVMTCk7CiAKIAkvKiByZXNldCB0aGUgY29uc3Ry YWludCBvbiB0aGUgcGlwZSAqLwogCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBQSVBFX0FO WSk7CiAKIAlpZ3RfcGlwZV9jcmNfZnJlZShkYXRhLT5waXBlX2NyYyk7CiAKLQlmcmVlKGRhdGEt PnBsYW5lKTsKLQlkYXRhLT5wbGFuZSA9IE5VTEw7CiAJZnJlZShkYXRhLT5mYik7CiAJZGF0YS0+ ZmIgPSBOVUxMOwogfQpAQCAtMTg0LDE5ICsxODAsMTMgQEAgc3RhdGljIGRybU1vZGVNb2RlSW5m byAqCiB0ZXN0X3NldHVwKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90IG1v ZGlmaWVyLCBpbnQgZmxhZ3MsCiAJICAgaWd0X291dHB1dF90ICpvdXRwdXQpCiB7Ci0Jc3RydWN0 IGttc3Rlc3RfY3J0YyBjcnRjOwogCWRybU1vZGVNb2RlSW5mbyAqbW9kZTsKIAlpbnQgc2l6ZTsK IAlpbnQgaSwgeCwgeTsKKwlpZ3RfcGxhbmVfdCAqcGxhbmU7CiAKIAlpZ3Rfb3V0cHV0X3NldF9w aXBlKG91dHB1dCwgcGlwZSk7CiAKLQlrbXN0ZXN0X2dldF9jcnRjKGRhdGEtPmRybV9mZCwgcGlw ZSwgJmNydGMpOwotCWlndF9za2lwX29uKGNydGMubl9wbGFuZXMgPiBkYXRhLT5kaXNwbGF5LnBp cGVzW3BpcGVdLm5fcGxhbmVzKTsKLQlpZ3Rfc2tpcF9vbihjcnRjLm5fcGxhbmVzID09IDApOwot Ci0JZm9yIChpID0gMDsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykKLQkJZGF0YS0+cGxhbmVbaV0g PSBpZ3Rfb3V0cHV0X2dldF9wbGFuZShvdXRwdXQsIGNydGMucGxhbmVzW2ldLmluZGV4KTsKIAog CW1vZGUgPSBpZ3Rfb3V0cHV0X2dldF9tb2RlKG91dHB1dCk7CiAKQEAgLTIwNiwxMyArMTk2LDE0 IEBAIHRlc3Rfc2V0dXAoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwgdWludDY0X3QgbW9k aWZpZXIsIGludCBmbGFncywKIAkJCSAgICAwLjAsIDAuMCwgMS4wLAogCQkJICAgICZkYXRhLT5m YlswXSk7CiAKLQlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBsYW5lWzBdLCAmZGF0YS0+ZmJbMF0p OwotCiAJLyogeWVsbG93IHNwcml0ZSBwbGFuZSBpbiBsb3dlciBsZWZ0IGNvcm5lciAqLwotCWZv ciAoaSA9IDA7IGkgPCBjcnRjLm5fcGxhbmVzOyBpKyspIHsKLQkJaWYgKGRhdGEtPnBsYW5lW2ld LT50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCisJZm9yX2VhY2hfcGxhbmVfb25fcGlw ZSgmZGF0YS0+ZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKKwkJaWYgKHBsYW5lLT50eXBlID09IERS TV9QTEFORV9UWVBFX1BSSU1BUlkpIHsKKwkJCWlndF9wbGFuZV9zZXRfZmIocGxhbmUsICZkYXRh LT5mYlswXSk7CiAJCQljb250aW51ZTsKLQkJaWYgKGRhdGEtPnBsYW5lW2ldLT50eXBlID09IERS TV9QTEFORV9UWVBFX0NVUlNPUikKKwkJfQorCisJCWlmIChwbGFuZS0+dHlwZSA9PSBEUk1fUExB TkVfVFlQRV9DVVJTT1IpCiAJCQlzaXplID0gNjQ7CiAJCWVsc2UKIAkJCXNpemUgPSBTSVpFOwpA QCAtMjIyLDEzICsyMTMsMTMgQEAgdGVzdF9zZXR1cChkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBw aXBlLCB1aW50NjRfdCBtb2RpZmllciwgaW50IGZsYWdzLAogCiAJCWlndF9jcmVhdGVfY29sb3Jf ZmIoZGF0YS0+ZHJtX2ZkLAogCQkJCSAgICBzaXplLCBzaXplLAotCQkJCSAgICBkYXRhLT5wbGFu ZVtpXS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBEUk1fRk9STUFUX0FSR0I4ODg4 IDogRFJNX0ZPUk1BVF9YUkdCODg4OCwKLQkJCQkgICAgZGF0YS0+cGxhbmVbaV0tPnR5cGUgPT0g RFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gTE9DQUxfRFJNX0ZPUk1BVF9NT0RfTk9ORSA6IG1vZGlm aWVyLAorCQkJCSAgICBwbGFuZS0+dHlwZSA9PSBEUk1fUExBTkVfVFlQRV9DVVJTT1IgPyBEUk1f Rk9STUFUX0FSR0I4ODg4IDogRFJNX0ZPUk1BVF9YUkdCODg4OCwKKwkJCQkgICAgcGxhbmUtPnR5 cGUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SID8gTE9DQUxfRFJNX0ZPUk1BVF9NT0RfTk9ORSA6 IG1vZGlmaWVyLAogCQkJCSAgICAxLjAsIDEuMCwgMC4wLAogCQkJCSAgICAmZGF0YS0+ZmJbaV0p OwogCi0JCWlndF9wbGFuZV9zZXRfcG9zaXRpb24oZGF0YS0+cGxhbmVbaV0sIHgsIHkpOwotCQlp Z3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBsYW5lW2ldLCAmZGF0YS0+ZmJbaV0pOworCQlpZ3RfcGxh bmVfc2V0X3Bvc2l0aW9uKHBsYW5lLCB4LCB5KTsKKwkJaWd0X3BsYW5lX3NldF9mYihwbGFuZSwg JmRhdGEtPmZiW2ldKTsKIAl9CiAKIAlyZXR1cm4gbW9kZTsKQEAgLTI4OSwzNSArMjgwLDMyIEBA IHRlc3RfcGxhbmVfcG9zaXRpb25fd2l0aF9vdXRwdXQoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUg cGlwZSwKIAogCWlndF9waXBlX2NyY19zdG9wKGRhdGEtPnBpcGVfY3JjKTsKIAotCXRlc3RfZmlu aShkYXRhLCBvdXRwdXQpOworCXRlc3RfZmluaShkYXRhLCBvdXRwdXQsIHBpcGUpOwogfQogCiBz dGF0aWMgdm9pZAogdGVzdF9wbGFuZV9wb3NpdGlvbihkYXRhX3QgKmRhdGEsIGVudW0gcGlwZSBw aXBlLCB1aW50NjRfdCBtb2RpZmllcikKIHsKIAlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKLQlpbnQg Y29ubmVjdGVkX291dHM7CiAJY29uc3QgaW50IGdlbiA9IGludGVsX2dlbihpbnRlbF9nZXRfZHJt X2RldmlkKGRhdGEtPmRybV9mZCkpOwogCi0JaWd0X3JlcXVpcmUoZGF0YS0+ZGlzcGxheS5pc19h dG9taWMpOwotCWlndF9za2lwX29uKHBpcGUgPj0gZGF0YS0+ZGlzcGxheS5uX3BpcGVzKTsKLQog CWlmIChtb2RpZmllciA9PSBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWV9USUxFRCB8fAogCSAgICBt b2RpZmllciA9PSBMT0NBTF9JOTE1X0ZPUk1BVF9NT0RfWWZfVElMRUQpCiAJCWlndF9za2lwX29u KGdlbiA8IDkpOwogCi0JY29ubmVjdGVkX291dHMgPSAwOwotCWZvcl9lYWNoX3ZhbGlkX291dHB1 dF9vbl9waXBlKCZkYXRhLT5kaXNwbGF5LCBwaXBlLCBvdXRwdXQpIHsKKwlmb3JfZWFjaF92YWxp ZF9vdXRwdXRfb25fcGlwZSgmZGF0YS0+ZGlzcGxheSwgcGlwZSwgb3V0cHV0KQogCQl0ZXN0X3Bs YW5lX3Bvc2l0aW9uX3dpdGhfb3V0cHV0KGRhdGEsIHBpcGUsIG91dHB1dCwgbW9kaWZpZXIpOwot CQljb25uZWN0ZWRfb3V0cysrOwotCX0KLQotCWlndF9za2lwX29uKGNvbm5lY3RlZF9vdXRzID09 IDApOwogfQogCiBzdGF0aWMgdm9pZAogcnVuX3Rlc3RzX2Zvcl9waXBlKGRhdGFfdCAqZGF0YSwg ZW51bSBwaXBlIHBpcGUpCiB7CisJaWd0X2ZpeHR1cmUgeworCQlpZ3Rfc2tpcF9vbihwaXBlID49 IGRhdGEtPmRpc3BsYXkubl9waXBlcyk7CisKKwkJaWd0X2Rpc3BsYXlfcmVxdWlyZV9vdXRwdXRf b25fcGlwZSgmZGF0YS0+ZGlzcGxheSwgcGlwZSk7CisJfQorCiAJaWd0X3N1YnRlc3RfZigicGlw ZS0lcy10aWxpbmctbm9uZSIsCiAJCSAgICAgIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpKQogCQl0 ZXN0X3BsYW5lX3Bvc2l0aW9uKGRhdGEsIHBpcGUsIExPQ0FMX0RSTV9GT1JNQVRfTU9EX05PTkUp OwpAQCAtMzUwLDEwICszMzgsMTIgQEAgaWd0X21haW4KIAogCQlpZ3RfcmVxdWlyZV9waXBlX2Ny YyhkYXRhLmRybV9mZCk7CiAJCWlndF9kaXNwbGF5X2luaXQoJmRhdGEuZGlzcGxheSwgZGF0YS5k cm1fZmQpOworCQlpZ3RfcmVxdWlyZShkYXRhLmRpc3BsYXkuaXNfYXRvbWljKTsKIAl9CiAKIAlm b3JfZWFjaF9waXBlX3N0YXRpYyhwaXBlKQotCQlydW5fdGVzdHNfZm9yX3BpcGUoJmRhdGEsIHBp cGUpOworCQlpZ3Rfc3VidGVzdF9ncm91cAorCQkJcnVuX3Rlc3RzX2Zvcl9waXBlKCZkYXRhLCBw aXBlKTsKIAogCWlndF9maXh0dXJlIHsKIAkJaWd0X2Rpc3BsYXlfZmluaSgmZGF0YS5kaXNwbGF5 KTsKLS0gCjIuMTQuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==