Return-Path: Received: from mblankhorst.nl (mblankhorst.nl [141.105.120.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7FB666E5D9 for ; Wed, 21 Feb 2018 10:38:47 +0000 (UTC) From: Maarten Lankhorst Date: Wed, 21 Feb 2018 11:38:44 +0100 Message-Id: <20180221103844.46709-4-maarten.lankhorst@linux.intel.com> In-Reply-To: <20180221103844.46709-1-maarten.lankhorst@linux.intel.com> References: <20180221103844.46709-1-maarten.lankhorst@linux.intel.com> Subject: [igt-dev] [PATCH i-g-t 4/4] tests/kms_chv_cursor_fail: Reorder tests, and use igt_display_require_output_on_pipe. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: VGhpcyB0ZXN0IGlzIHB1cmVseSBhYm91dCB0aGUgcGlwZSBmaWZvIHVuZGVycnVuLCBzbyBub3Qg YWxsIG91dHB1dHMKbmVlZCB0byBiZSB0ZXN0ZWQuIFJlb3JkZXIgdGhlIHRlc3RzIHRvIHJ1biBw ZXIgcGlwZSBmaXJzdCwgdGhpcyB3aWxsCnNhdmUgYSBtb2Rlc2V0IGZvciBhbGwgZGlmZmVyZW50 IHNpemVzIHdoZW4gdGhlIHRlc3RzIGFyZSBydW4gcGVyLWJpbmFyeSwKYW5kIGFub3RoZXIgbW9k ZXNldCBvbiBlYWNoIHN1YnRlc3Qgd2hlbiBtb3JlIHRoYW4gMSBvdXRwdXQgaXMgY29ubmVjdGVk LgoKU2lnbmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxp bnV4LmludGVsLmNvbT4KLS0tCiB0ZXN0cy9rbXNfY2h2X2N1cnNvcl9mYWlsLmMgfCA4NSArKysr KysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzNCBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9r bXNfY2h2X2N1cnNvcl9mYWlsLmMgYi90ZXN0cy9rbXNfY2h2X2N1cnNvcl9mYWlsLmMKaW5kZXgg ZmZiZTM5ZDBjNDFiLi4wZGQzNjZjM2I0YjEgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19jaHZfY3Vy c29yX2ZhaWwuYworKysgYi90ZXN0cy9rbXNfY2h2X2N1cnNvcl9mYWlsLmMKQEAgLTI0Niw3ICsy NDYsNyBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlX2NydGMoZGF0YV90ICpkYXRhKQogCXByaW1hcnkg PSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKGRhdGEtPm91dHB1dCwgRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSk7CiAJaWd0X3BsYW5lX3NldF9mYihwcmltYXJ5LCAmZGF0YS0+cHJpbWFyeV9mYik7 CiAKLQlpZ3RfZGlzcGxheV9jb21taXQoZGlzcGxheSk7CisJaWd0X2Rpc3BsYXlfY29tbWl0Mihk aXNwbGF5LCBkaXNwbGF5LT5pc19hdG9taWMgPyBDT01NSVRfQVRPTUlDIDogQ09NTUlUX0xFR0FD WSk7CiAKIAlkYXRhLT5qdW1wX3ggPSAobW9kZS0+aGRpc3BsYXkgLSBkYXRhLT5jdXJ3KSAvIDI7 CiAJZGF0YS0+anVtcF95ID0gKG1vZGUtPnZkaXNwbGF5IC0gZGF0YS0+Y3VyaCkgLyAyOwpAQCAt MjYyLDM0ICsyNjIsMTUgQEAgc3RhdGljIHZvaWQgcHJlcGFyZV9jcnRjKGRhdGFfdCAqZGF0YSkK IAogc3RhdGljIHZvaWQgdGVzdF9jcnRjKGRhdGFfdCAqZGF0YSwgdW5zaWduZWQgaW50IGVkZ2Vz KQogewotCWlndF9kaXNwbGF5X3QgKmRpc3BsYXkgPSAmZGF0YS0+ZGlzcGxheTsKLQlpbnQgdmFs aWRfdGVzdHMgPSAwOwotCiAJY2xlYW51cF9jcnRjKGRhdGEpOwogCiAJY3JlYXRlX2N1cnNvcl9m YihkYXRhLCBkYXRhLT5jdXJ3LCBkYXRhLT5jdXJoKTsKIAotCWZvcl9lYWNoX3ZhbGlkX291dHB1 dF9vbl9waXBlKGRpc3BsYXksIGRhdGEtPnBpcGUsIGRhdGEtPm91dHB1dCkgewotCQlwcmVwYXJl X2NydGMoZGF0YSk7Ci0KLQkJdmFsaWRfdGVzdHMrKzsKLQotCQlpZ3RfaW5mbygiQmVnaW5uaW5n ICVzIG9uIHBpcGUgJXMsIGNvbm5lY3RvciAlc1xuIiwKLQkJCSBpZ3Rfc3VidGVzdF9uYW1lKCks Ci0JCQkga21zdGVzdF9waXBlX25hbWUoZGF0YS0+cGlwZSksCi0JCQkgaWd0X291dHB1dF9uYW1l KGRhdGEtPm91dHB1dCkpOworCXByZXBhcmVfY3J0YyhkYXRhKTsKIAotCQl0ZXN0X2VkZ2VzKGRh dGEsIGVkZ2VzKTsKLQotCQlpZ3RfaW5mbygiXG4lcyBvbiBwaXBlICVzLCBjb25uZWN0b3IgJXM6 IFBBU1NFRFxuXG4iLAotCQkJIGlndF9zdWJ0ZXN0X25hbWUoKSwKLQkJCSBrbXN0ZXN0X3BpcGVf bmFtZShkYXRhLT5waXBlKSwKLQkJCSBpZ3Rfb3V0cHV0X25hbWUoZGF0YS0+b3V0cHV0KSk7Ci0J fQorCXRlc3RfZWRnZXMoZGF0YSwgZWRnZXMpOwogCiAJaWd0X3JlbW92ZV9mYihkYXRhLT5kcm1f ZmQsICZkYXRhLT5mYik7Ci0KLQlpZ3RfcmVxdWlyZV9mKHZhbGlkX3Rlc3RzLCAibm8gdmFsaWQg Y3J0Yy9jb25uZWN0b3IgY29tYmluYXRpb25zIGZvdW5kXG4iKTsKIH0KIAogc3RhdGljIGludCBv cHRfaGFuZGxlcihpbnQgb3B0LCBpbnQgb3B0X2luZGV4LCB2b2lkICpfZGF0YSkKQEAgLTM1NCwz NiArMzM1LDM4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJaWd0X2Rpc3Bs YXlfaW5pdCgmZGF0YS5kaXNwbGF5LCBkYXRhLmRybV9mZCk7CiAJfQogCi0JZm9yIChkYXRhLmN1 cncgPSA2NDsgZGF0YS5jdXJ3IDw9IDI1NjsgZGF0YS5jdXJ3ICo9IDIpIHsKLQkJZGF0YS5jdXJo ID0gZGF0YS5jdXJ3OwotCQlmb3IgKGRhdGEucGlwZSA9IFBJUEVfQTsgZGF0YS5waXBlIDw9IFBJ UEVfQzsgZGF0YS5waXBlKyspIHsKLQkJCWlndF9zdWJ0ZXN0X2YoInBpcGUtJXMtJWR4JWQtbGVm dC1lZGdlIiwKLQkJCQkgICAgICBrbXN0ZXN0X3BpcGVfbmFtZShkYXRhLnBpcGUpLAotCQkJCSAg ICAgIGRhdGEuY3VydywgZGF0YS5jdXJoKSB7Ci0JCQkJaWd0X3JlcXVpcmUoZGF0YS5waXBlIDwg ZGF0YS5kaXNwbGF5Lm5fcGlwZXMpOwotCQkJCWlndF9yZXF1aXJlKGRhdGEuY3VydyA8PSBtYXhf Y3VydyAmJiBkYXRhLmN1cmggPD0gbWF4X2N1cmgpOwotCQkJCXRlc3RfY3J0YygmZGF0YSwgRURH RV9MRUZUKTsKLQkJCX0KLQkJCWlndF9zdWJ0ZXN0X2YoInBpcGUtJXMtJWR4JWQtcmlnaHQtZWRn ZSIsCi0JCQkJICAgICAga21zdGVzdF9waXBlX25hbWUoZGF0YS5waXBlKSwKLQkJCQkgICAgICBk YXRhLmN1cncsIGRhdGEuY3VyaCkgewotCQkJCWlndF9yZXF1aXJlKGRhdGEucGlwZSA8IGRhdGEu ZGlzcGxheS5uX3BpcGVzKTsKLQkJCQlpZ3RfcmVxdWlyZShkYXRhLmN1cncgPD0gbWF4X2N1cncg JiYgZGF0YS5jdXJoIDw9IG1heF9jdXJoKTsKLQkJCQl0ZXN0X2NydGMoJmRhdGEsIEVER0VfUklH SFQpOworCWZvcl9lYWNoX3BpcGVfc3RhdGljKGRhdGEucGlwZSkgeworCQlpZ3Rfc3VidGVzdF9n cm91cCB7CisJCQlpZ3RfZml4dHVyZSB7CisJCQkJaWd0X2Rpc3BsYXlfcmVxdWlyZV9vdXRwdXRf b25fcGlwZSgmZGF0YS5kaXNwbGF5LCBkYXRhLnBpcGUpOworCQkJCWRhdGEub3V0cHV0ID0gaWd0 X2dldF9zaW5nbGVfb3V0cHV0X2Zvcl9waXBlKCZkYXRhLmRpc3BsYXksIGRhdGEucGlwZSk7CiAJ CQl9Ci0JCQlpZ3Rfc3VidGVzdF9mKCJwaXBlLSVzLSVkeCVkLXRvcC1lZGdlIiwKLQkJCQkgICAg ICBrbXN0ZXN0X3BpcGVfbmFtZShkYXRhLnBpcGUpLAotCQkJCSAgICAgIGRhdGEuY3VydywgZGF0 YS5jdXJoKSB7Ci0JCQkJaWd0X3JlcXVpcmUoZGF0YS5waXBlIDwgZGF0YS5kaXNwbGF5Lm5fcGlw ZXMpOwotCQkJCWlndF9yZXF1aXJlKGRhdGEuY3VydyA8PSBtYXhfY3VydyAmJiBkYXRhLmN1cmgg PD0gbWF4X2N1cmgpOwotCQkJCXRlc3RfY3J0YygmZGF0YSwgRURHRV9UT1ApOwotCQkJfQotCQkJ aWd0X3N1YnRlc3RfZigicGlwZS0lcy0lZHglZC1ib3R0b20tZWRnZSIsCi0JCQkJICAgICAga21z dGVzdF9waXBlX25hbWUoZGF0YS5waXBlKSwKLQkJCQkgICAgICBkYXRhLmN1cncsIGRhdGEuY3Vy aCkgewotCQkJCWlndF9yZXF1aXJlKGRhdGEucGlwZSA8IGRhdGEuZGlzcGxheS5uX3BpcGVzKTsK LQkJCQlpZ3RfcmVxdWlyZShkYXRhLmN1cncgPD0gbWF4X2N1cncgJiYgZGF0YS5jdXJoIDw9IG1h eF9jdXJoKTsKLQkJCQl0ZXN0X2NydGMoJmRhdGEsIEVER0VfQk9UVE9NKTsKKworCQkJZm9yIChk YXRhLmN1cncgPSA2NDsgZGF0YS5jdXJ3IDw9IDI1NjsgZGF0YS5jdXJ3ICo9IDIpIHsKKwkJCQlk YXRhLmN1cmggPSBkYXRhLmN1cnc7CisKKwkJCQlpZ3RfZml4dHVyZQorCQkJCQlpZ3RfcmVxdWly ZShkYXRhLmN1cncgPD0gbWF4X2N1cncgJiYgZGF0YS5jdXJoIDw9IG1heF9jdXJoKTsKKworCQkJ CWlndF9zdWJ0ZXN0X2YoInBpcGUtJXMtJWR4JWQtbGVmdC1lZGdlIiwKKwkJCQkJa21zdGVzdF9w aXBlX25hbWUoZGF0YS5waXBlKSwKKwkJCQkJZGF0YS5jdXJ3LCBkYXRhLmN1cmgpCisJCQkJCXRl c3RfY3J0YygmZGF0YSwgRURHRV9MRUZUKTsKKworCQkJCWlndF9zdWJ0ZXN0X2YoInBpcGUtJXMt JWR4JWQtcmlnaHQtZWRnZSIsCisJCQkJCWttc3Rlc3RfcGlwZV9uYW1lKGRhdGEucGlwZSksCisJ CQkJCWRhdGEuY3VydywgZGF0YS5jdXJoKQorCQkJCQl0ZXN0X2NydGMoJmRhdGEsIEVER0VfUklH SFQpOworCisJCQkJaWd0X3N1YnRlc3RfZigicGlwZS0lcy0lZHglZC10b3AtZWRnZSIsCisJCQkJ CWttc3Rlc3RfcGlwZV9uYW1lKGRhdGEucGlwZSksCisJCQkJCWRhdGEuY3VydywgZGF0YS5jdXJo KQorCQkJCQl0ZXN0X2NydGMoJmRhdGEsIEVER0VfVE9QKTsKKworCQkJCWlndF9zdWJ0ZXN0X2Yo InBpcGUtJXMtJWR4JWQtYm90dG9tLWVkZ2UiLAorCQkJCQlrbXN0ZXN0X3BpcGVfbmFtZShkYXRh LnBpcGUpLAorCQkJCQlkYXRhLmN1cncsIGRhdGEuY3VyaCkKKwkJCQkJdGVzdF9jcnRjKCZkYXRh LCBFREdFX0JPVFRPTSk7CiAJCQl9CiAJCX0KIAl9Ci0tIAoyLjE2LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0Cmln dC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vaWd0LWRldgo=