From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FE38891DA for ; Tue, 9 Apr 2019 18:03:34 +0000 (UTC) From: Stanislav Lisovskiy Date: Tue, 9 Apr 2019 21:03:19 +0300 Message-Id: <20190409180319.23410-4-stanislav.lisovskiy@intel.com> In-Reply-To: <20190409180319.23410-1-stanislav.lisovskiy@intel.com> References: <20190409180319.23410-1-stanislav.lisovskiy@intel.com> Subject: [igt-dev] [PATCH i-g-t v8 3/3] igt/tests/kms_atomic_transition: Tolerate if can't have all planes 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 Cc: stanislav.lisovskiy@intel.com, ville.syrjala@intel.com, martin.peres@intel.com, juha-pekka.heikkila@intel.com List-ID: V2l0aCBzb21lIHVwY29taW5nIGNoYW5nZXMgaTkxNSBtaWdodCBub3QgYWxsb3cKYWxsIHNwcml0 ZSBwbGFuZXMgZW5hYmxlZCwgZGVwZW5kaW5nIG9uIGF2YWlsYWJsZQpiYW5kd2lkdGggbGltaXRh dGlvbi4gVGh1cyB0aGUgdGVzdCBuZWVkIHRvIGRlY3JlbWVudAphbW91bnQgb2YgcGxhbmVzIGFu ZCB0cnkgYWdhaW4sIGluc3RlYWQgb2YgcGFuaWNraW5nLgoKdjI6IFJlbW92ZWQgZXhjZXNzaXZl IG5lc3RlZCBjb25kaXRpb25zLCBtYWtpbmcgY29kZSBhIGJpdAogICAgbW9yZSByZWFkYWJsZSho b3BlZnVsbHkpLgoKdjM6IFN0b3BwZWQgdXNpbmcgZ2xvYmFsIG5fcGxhbmVzIHZhcmlhYmxlIGFz IGl0IG1pZ2h0IGNhdXNlCiAgICByZXNvdXJjZXMgYmVpbmcgdW5yZWxlYXNlZC4KICAgIFVzaW5n IG5vdyBwYXJtc1tpXS5tYXNrIGFzIGEgd2F5IHRvIGRldGVybWluZSBpZiBwbGFuZQogICAgaGFz IHRvIGJlIGluY2x1ZGVkIGludG8gY29tbWl0LgoKdjQ6IFJlbW92ZWQgdW5uZWVkZWQgbl9vdmVy bGF5cyBpbml0aWFsaXphdGlvbi4KCnY1OiBSYW5kb21pemUgd2hpY2ggb2Ygc3ByaXRlIHBsYW5l cyB0byByZW1vdmUgaWYgaGl0dGluZwogICAgcmVzb3VyY2UgbGltaXRzLgoKdjY6IFJlcGxhY2Ug aWd0X3dhcm4gd2l0aCBpZ3RfaW5mbywgdG8gbWFrZSBJR1QgdGVzdHMgaGFwcGllci4KCnY3OiBS ZW1vdmVkIHVubmVlZGVkIHJldHJ5IGxvZ2ljLCBtYWRlIHBsYW5lIHJhbmRvbSByZW1vdmFsIHNp bXBsaWVyLgogICAgR3JlYXQgdGhhbmtzIHRvIE1hYXJ0ZW4gTGFua2hvcnN0IGZvciBzdWdnZXN0 aW9ucy4KCnY4OiBGYWlsIGlmIHdlIGhhdmUgbGVzcyB0aGFuIDMgcGxhbmVzCgpTaWduZWQtb2Zm LWJ5OiBTdGFuaXNsYXYgTGlzb3Zza2l5IDxzdGFuaXNsYXYubGlzb3Zza2l5QGludGVsLmNvbT4K LS0tCiB0ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYyB8IDEwMiArKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTUgaW5zZXJ0aW9ucygrKSwgNDcg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMg Yi90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYwppbmRleCA4ODNmNWE5Yi4uNTc1M2JlZDkg MTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jCisrKyBiL3Rlc3RzL2tt c19hdG9taWNfdHJhbnNpdGlvbi5jCkBAIC0xODQsNiArMTg0LDkgQEAgc3RhdGljIHZvaWQgc2V0 X3Nwcml0ZV93aChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAkJICAg IHBsYW5lLT50eXBlID09IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCWNvbnRpbnVlOwogCisJ CWlmICghcGFybXNbaV0ubWFzaykKKwkJCWNvbnRpbnVlOworCiAJCXBhcm1zW2ldLndpZHRoID0g dzsKIAkJcGFybXNbaV0uaGVpZ2h0ID0gaDsKIAl9CkBAIC0yMTIsOSArMjE1LDEwIEBAIHN0YXRp YyB2b2lkIHNldHVwX3Bhcm1zKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBl LAogCXVuc2lnbmVkIHNwcml0ZV93aWR0aCwgc3ByaXRlX2hlaWdodCwgcHJldl93LCBwcmV2X2g7 CiAJYm9vbCBtYXhfc3ByaXRlX3dpZHRoLCBtYXhfc3ByaXRlX2hlaWdodCwgYWxwaGEgPSB0cnVl OwogCXVpbnQzMl90IG5fcGxhbmVzID0gZGlzcGxheS0+cGlwZXNbcGlwZV0ubl9wbGFuZXM7Ci0J dWludDMyX3Qgbl9vdmVybGF5cyA9IDAsIG92ZXJsYXlzW25fcGxhbmVzXTsKKwl1aW50MzJfdCBu X292ZXJsYXlzLCBvdmVybGF5c1tuX3BsYW5lc107CiAJaWd0X3BsYW5lX3QgKnBsYW5lOwotCXVp bnQzMl90IGl0ZXJfbWFzayA9IDM7CisJdWludDMyX3QgaXRlcl9tYXNrOworCWludCByZXQgPSAw OwogCiAJZG9fb3JfZGllKGRybUdldENhcChkaXNwbGF5LT5kcm1fZmQsIERSTV9DQVBfQ1VSU09S X1dJRFRILCAmY3Vyc29yX3dpZHRoKSk7CiAJaWYgKGN1cnNvcl93aWR0aCA+PSBtb2RlLT5oZGlz cGxheSkKQEAgLTIyNCw2ICsyMjgsOSBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlz cGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAlpZiAoY3Vyc29yX2hlaWdodCA+PSBt b2RlLT52ZGlzcGxheSkKIAkJY3Vyc29yX2hlaWdodCA9IG1vZGUtPnZkaXNwbGF5OwogCisJbl9v dmVybGF5cyA9IDA7CisJaXRlcl9tYXNrID0gMzsKKwogCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUo ZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKIAkJaW50IGkgPSBwbGFuZS0+aW5kZXg7CiAKQEAgLTI0 Myw5ICsyNTAsNyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlzcGxheV90ICpkaXNw bGF5LCBlbnVtIHBpcGUgcGlwZSwKIAkJCQkJRFJNX0ZPUk1BVF9BUkdCODg4OCwgTE9DQUxfRFJN X0ZPUk1BVF9NT0RfTk9ORSk7CiAJCQlwYXJtc1tpXS5mYiA9IHNwcml0ZV9mYjsKIAkJCXBhcm1z W2ldLm1hc2sgPSAxIDw8IDI7Ci0KIAkJCWl0ZXJfbWFzayB8PSAxIDw8IDI7Ci0KIAkJCW92ZXJs YXlzW25fb3ZlcmxheXMrK10gPSBpOwogCQl9CiAJfQpAQCAtMjg3LDkgKzI5Miw3IEBAIHN0YXRp YyB2b2lkIHNldHVwX3Bhcm1zKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBl LAogCW1heF9zcHJpdGVfd2lkdGggPSAoc3ByaXRlX3dpZHRoID09IG1vZGUtPmhkaXNwbGF5KTsK IAltYXhfc3ByaXRlX2hlaWdodCA9IChzcHJpdGVfaGVpZ2h0ID09IG1vZGUtPnZkaXNwbGF5KTsK IAotCXdoaWxlICgxKSB7Ci0JCWludCByZXQ7Ci0KKwl3aGlsZSAoIW1heF9zcHJpdGVfd2lkdGgg JiYgIW1heF9zcHJpdGVfaGVpZ2h0KSB7CiAJCXNldF9zcHJpdGVfd2goZGlzcGxheSwgcGlwZSwg cGFybXMsIHNwcml0ZV9mYiwKIAkJCSAgICAgIGFscGhhLCBzcHJpdGVfd2lkdGgsIHNwcml0ZV9o ZWlnaHQpOwogCkBAIC0yOTcsNTIgKzMwMCw1OSBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhp Z3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAkJcmV0ID0gaWd0X2Rpc3Bs YXlfdHJ5X2NvbW1pdF9hdG9taWMoZGlzcGxheSwgRFJNX01PREVfQVRPTUlDX1RFU1RfT05MWSB8 IERSTV9NT0RFX0FUT01JQ19BTExPV19NT0RFU0VULCBOVUxMKTsKIAkJaWd0X2Fzc2VydCghaXNf YXRvbWljX2NoZWNrX2ZhaWx1cmVfZXJybm8ocmV0KSk7CiAKLQkJaWYgKGlzX2F0b21pY19jaGVj a19wbGFuZV9zaXplX2Vycm5vKHJldCkpIHsKLQkJCWlmIChjdXJzb3Jfd2lkdGggPT0gc3ByaXRl X3dpZHRoICYmCi0JCQkgICAgY3Vyc29yX2hlaWdodCA9PSBzcHJpdGVfaGVpZ2h0KSB7Ci0JCQkJ aWd0X2Fzc2VydF9mKGFscGhhLAotCQkJCQkgICAgICAiQ2Fubm90IGNvbmZpZ3VyZSB0aGUgdGVz dCB3aXRoIGFsbCBzcHJpdGUgcGxhbmVzIGVuYWJsZWRcbiIpOwotCQkJfQotCi0JCQlzcHJpdGVf d2lkdGggPSBwcmV2X3c7Ci0JCQlzcHJpdGVfaGVpZ2h0ID0gcHJldl9oOwotCi0JCQlpZiAobWF4 X3Nwcml0ZV93aWR0aCAmJiBtYXhfc3ByaXRlX2hlaWdodCkgewotCQkJCXNldF9zcHJpdGVfd2go ZGlzcGxheSwgcGlwZSwgcGFybXMsIHNwcml0ZV9mYiwKLQkJCQkJICAgICAgYWxwaGEsIHNwcml0 ZV93aWR0aCwgc3ByaXRlX2hlaWdodCk7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0KLQkJCWlmICghbWF4 X3Nwcml0ZV93aWR0aCkKLQkJCQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1ZTsKLQkJCWVsc2UKLQkJ CQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7Ci0JCX0gZWxzZSB7CisJCWlmICghaXNfYXRvbWlj X2NoZWNrX3BsYW5lX3NpemVfZXJybm8ocmV0KSkgewogCQkJcHJldl93ID0gc3ByaXRlX3dpZHRo OwogCQkJcHJldl9oID0gc3ByaXRlX2hlaWdodDsKLQkJfQotCi0JCWlmICghbWF4X3Nwcml0ZV93 aWR0aCkgewotCQkJc3ByaXRlX3dpZHRoICo9IDI7Ci0KKyAgICAKKwkJCXNwcml0ZV93aWR0aCAq PSBtYXhfc3ByaXRlX3dpZHRoID8gMSA6IDI7CiAJCQlpZiAoc3ByaXRlX3dpZHRoID49IG1vZGUt PmhkaXNwbGF5KSB7CiAJCQkJbWF4X3Nwcml0ZV93aWR0aCA9IHRydWU7Ci0KIAkJCQlzcHJpdGVf d2lkdGggPSBtb2RlLT5oZGlzcGxheTsKIAkJCX0KLQkJfSBlbHNlIGlmICghbWF4X3Nwcml0ZV9o ZWlnaHQpIHsKLQkJCXNwcml0ZV9oZWlnaHQgKj0gMjsKIAorCQkJc3ByaXRlX2hlaWdodCAqPSBt YXhfc3ByaXRlX2hlaWdodCA/IDEgOiAyOwogCQkJaWYgKHNwcml0ZV9oZWlnaHQgPj0gbW9kZS0+ dmRpc3BsYXkpIHsKIAkJCQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7Ci0KIAkJCQlzcHJpdGVf aGVpZ2h0ID0gbW9kZS0+dmRpc3BsYXk7CiAJCQl9Ci0JCX0gZWxzZQotCQkJLyogTWF4IHNpemVk IHNwcml0ZXMgZm9yIGFsbCEgKi8KLQkJCWJyZWFrOworCQkJY29udGludWU7CisJCX0KKworCQlp ZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0aCAmJgorCQkgICAgY3Vyc29yX2hlaWdodCA9 PSBzcHJpdGVfaGVpZ2h0KSB7CisJCQlpZ3RfcGxhbmVfdCAqcmVtb3ZlZF9wbGFuZSA9IE5VTEw7 CisJCQlpZ3RfYXNzZXJ0X2Yobl9wbGFuZXMgPj0gMywgIk5vIHBsYW5lcyBsZWZ0IHRvIHByb2Nl ZWQgd2l0aCEiKTsKKwkJCWlmIChuX292ZXJsYXlzID4gMCkgeworCQkJCXVpbnQzMl90IHBsYW5l X3RvX3JlbW92ZSA9IGhhcnNfcGV0cnVza2FfZjU0XzFfcmFuZG9tX3Vuc2FmZV9tYXgobl9vdmVy bGF5cyk7CisJCQkJcmVtb3ZlZF9wbGFuZSA9ICZkaXNwbGF5LT5waXBlc1twaXBlXS5wbGFuZXNb b3ZlcmxheXNbcGxhbmVfdG9fcmVtb3ZlXV07CisJCQkJaWd0X3BsYW5lX3NldF9mYihyZW1vdmVk X3BsYW5lLCBOVUxMKTsKKwkJCQl3aGlsZSAocGxhbmVfdG9fcmVtb3ZlIDwgKG5fb3ZlcmxheXMg LSAxKSkgeworCQkJCQlvdmVybGF5c1twbGFuZV90b19yZW1vdmVdID0gb3ZlcmxheXNbcGxhbmVf dG9fcmVtb3ZlICsgMV07CisJCQkJCXBsYW5lX3RvX3JlbW92ZSsrOworCQkJCX0KKwkJCQluX292 ZXJsYXlzLS07CisJCQl9CisJCQlpZiAocmVtb3ZlZF9wbGFuZSkgeworCQkJCXBhcm1zW3JlbW92 ZWRfcGxhbmUtPmluZGV4XS5tYXNrID0gMDsKKwkJCQlpZ3RfaW5mbygiUmVtb3ZlZCBwbGFuZSAl ZFxuIiwgcmVtb3ZlZF9wbGFuZS0+aW5kZXgpOworCQkJfQorCQkJbl9wbGFuZXMtLTsKKwkJCWln dF9pbmZvKCJSZWR1Y2VkIGF2YWlsYWJsZSBwbGFuZXMgdG8gJWRcbiIsIG5fcGxhbmVzKTsKKwkJ CWNvbnRpbnVlOworCQl9CisKKwkJc3ByaXRlX3dpZHRoID0gcHJldl93OworCQlzcHJpdGVfaGVp Z2h0ID0gcHJldl9oOworCisJCWlmICghbWF4X3Nwcml0ZV93aWR0aCkKKwkJCW1heF9zcHJpdGVf d2lkdGggPSB0cnVlOworCQllbHNlCisJCQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7CiAJfQog CisJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBwaXBlLCBwYXJtcywgc3ByaXRlX2ZiLAorCQkJYWxw aGEsIHNwcml0ZV93aWR0aCwgc3ByaXRlX2hlaWdodCk7CisKIAlpZ3RfaW5mbygiUnVubmluZyB0 ZXN0IG9uIHBpcGUgJXMgd2l0aCByZXNvbHV0aW9uICVkeCVkIGFuZCBzcHJpdGUgc2l6ZSAlZHgl ZCBhbHBoYSAlaVxuIiwKIAkJIGttc3Rlc3RfcGlwZV9uYW1lKHBpcGUpLCBtb2RlLT5oZGlzcGxh eSwgbW9kZS0+dmRpc3BsYXksCiAJCSBzcHJpdGVfd2lkdGgsIHNwcml0ZV9oZWlnaHQsIGFscGhh KTsKQEAgLTQzNCw3ICs0NDQsNyBAQCBydW5fdHJhbnNpdGlvbl90ZXN0KGlndF9kaXNwbGF5X3Qg KmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dAogCXVpbnQzMl90 IGl0ZXJfbWF4LCBpOwogCXN0cnVjdCBwbGFuZV9wYXJtcyBwYXJtc1twaXBlX29iai0+bl9wbGFu ZXNdOwogCXVuc2lnbmVkIGZsYWdzID0gMDsKLQlpbnQgcmV0OworCWludCByZXQgPSAwOwogCiAJ aWYgKGZlbmNpbmcpCiAJCXByZXBhcmVfZmVuY2luZyhkaXNwbGF5LCBwaXBlKTsKQEAgLTQ2MSw3 ICs0NzEsNiBAQCBydW5fdHJhbnNpdGlvbl90ZXN0KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVu dW0gcGlwZSBwaXBlLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dAogCiAJaWYgKGZsYWdzICYgRFJNX01P REVfQVRPTUlDX0FMTE9XX01PREVTRVQpIHsKIAkJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQs IFBJUEVfTk9ORSk7Ci0KIAkJaWd0X2Rpc3BsYXlfY29tbWl0MihkaXNwbGF5LCBDT01NSVRfQVRP TUlDKTsKIAogCQlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dCwgcGlwZSk7CkBAIC00OTYsOSAr NTA1LDYgQEAgcnVuX3RyYW5zaXRpb25fdGVzdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVt IHBpcGUgcGlwZSwgaWd0X291dHB1dF90ICpvdXRwdXQKIAkJCSAgICBwbGFuZS0+dHlwZSA9PSBE Uk1fUExBTkVfVFlQRV9DVVJTT1IpCiAJCQkJY29udGludWU7CiAKLQkJCWlmIChwYXJtc1tpXS53 aWR0aCA8PSA1MTIpCi0JCQkJY29udGludWU7Ci0KIAkJCXBhcm1zW2ldLndpZHRoIC89IDI7CiAJ CQlyZXQgPSAxOwogCQkJaWd0X2luZm8oIlJlZHVjaW5nIHNwcml0ZSAlaSB0byAldXgldVxuIiwg aSAtIDEsIHBhcm1zW2ldLndpZHRoLCBwYXJtc1tpXS5oZWlnaHQpOwpAQCAtNTIzLDggKzUyOSwx MCBAQCBydW5fdHJhbnNpdGlvbl90ZXN0KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlw ZSBwaXBlLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dAogCQl9CiAKIAkJLyogZm9yY2UgcGxhbmVzIHRv IGJlIHBhcnQgb2YgY29tbWl0ICovCi0JCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwg cGlwZSwgcGxhbmUpCi0JCQlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHBsYW5lLCAwLCAwKTsKKwkJ Zm9yX2VhY2hfcGxhbmVfb25fcGlwZShkaXNwbGF5LCBwaXBlLCBwbGFuZSkgeworCQkJaWYgKHBh cm1zW3BsYW5lLT5pbmRleF0ubWFzaykKKwkJCQlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKHBsYW5l LCAwLCAwKTsKKwkJfQogCiAJCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX0FU T01JQyk7CiAKLS0gCjIuMTcuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KaWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3Rv cC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3Qt ZGV2