From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9C9A389316 for ; Mon, 8 Apr 2019 10:15:58 +0000 (UTC) From: Stanislav Lisovskiy Date: Mon, 8 Apr 2019 13:15:44 +0300 Message-Id: <20190408101544.24715-3-stanislav.lisovskiy@intel.com> In-Reply-To: <20190408101544.24715-1-stanislav.lisovskiy@intel.com> References: <20190408101544.24715-1-stanislav.lisovskiy@intel.com> Subject: [igt-dev] [PATCH i-g-t v6 2/2] 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: ville.syrjala@intel.com, martin.peres@intel.com, stanislav.lisovskiy@intel.com List-ID: V2l0aCBzb21lIHVwY29taW5nIGNoYW5nZXMgaTkxNSBtaWdodCBub3QgYWxsb3cKYWxsIHNwcml0 ZSBwbGFuZXMgZW5hYmxlZCwgZGVwZW5kaW5nIG9uIGF2YWlsYWJsZQpiYW5kd2lkdGggbGltaXRh dGlvbi4gVGh1cyB0aGUgdGVzdCBuZWVkIHRvIGRlY3JlbWVudAphbW91bnQgb2YgcGxhbmVzIGFu ZCB0cnkgYWdhaW4sIGluc3RlYWQgb2YgcGFuaWNraW5nLgoKdjI6IFJlbW92ZWQgZXhjZXNzaXZl IG5lc3RlZCBjb25kaXRpb25zLCBtYWtpbmcgY29kZSBhIGJpdAogICAgbW9yZSByZWFkYWJsZSho b3BlZnVsbHkpLgoKdjM6IFN0b3BwZWQgdXNpbmcgZ2xvYmFsIG5fcGxhbmVzIHZhcmlhYmxlIGFz IGl0IG1pZ2h0IGNhdXNlCiAgICByZXNvdXJjZXMgYmVpbmcgdW5yZWxlYXNlZC4KICAgIFVzaW5n IG5vdyBwYXJtc1tpXS5tYXNrIGFzIGEgd2F5IHRvIGRldGVybWluZSBpZiBwbGFuZQogICAgaGFz IHRvIGJlIGluY2x1ZGVkIGludG8gY29tbWl0LgoKdjQ6IFJlbW92ZWQgdW5uZWVkZWQgbl9vdmVy bGF5cyBpbml0aWFsaXphdGlvbi4KCnY1OiBSYW5kb21pemUgd2hpY2ggb2Ygc3ByaXRlIHBsYW5l cyB0byByZW1vdmUgaWYgaGl0dGluZwogICAgcmVzb3VyY2UgbGltaXRzLgoKdjY6IFJlcGxhY2Ug aWd0X3dhcm4gd2l0aCBpZ3RfaW5mbywgdG8gbWFrZSBJR1QgdGVzdHMgaGFwcGllci4KClNpZ25l ZC1vZmYtYnk6IFN0YW5pc2xhdiBMaXNvdnNraXkgPHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwu Y29tPgotLS0KIHRlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jIHwgMTIzICsrKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA3MSBpbnNlcnRpb25zKCsp LCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRp b24uYyBiL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jCmluZGV4IDYzOGZlMTdlLi5lNmQ1 NWNhMCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMKKysrIGIvdGVz dHMva21zX2F0b21pY190cmFuc2l0aW9uLmMKQEAgLTIxMiw5ICsyMTIsMTIgQEAgc3RhdGljIHZv aWQgc2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJ dW5zaWduZWQgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0LCBwcmV2X3csIHByZXZfaDsKIAli b29sIG1heF9zcHJpdGVfd2lkdGgsIG1heF9zcHJpdGVfaGVpZ2h0LCBhbHBoYSA9IHRydWU7CiAJ dWludDMyX3Qgbl9wbGFuZXMgPSBkaXNwbGF5LT5waXBlc1twaXBlXS5uX3BsYW5lczsKLQl1aW50 MzJfdCBuX292ZXJsYXlzID0gMCwgb3ZlcmxheXNbbl9wbGFuZXNdOworCXVpbnQzMl90IG5fb3Zl cmxheXMsIG92ZXJsYXlzW25fcGxhbmVzXTsKIAlpZ3RfcGxhbmVfdCAqcGxhbmU7Ci0JdWludDMy X3QgaXRlcl9tYXNrID0gMzsKKwl1aW50MzJfdCBpdGVyX21hc2s7CisJaW50IHJldHJpZXMgPSBu X3BsYW5lcyAtIDE7CisJaW50IHJldCA9IDA7CisJdWludDMyX3QgcGxhbmVzX3RvX3JlbW92ZTsK IAogCWRvX29yX2RpZShkcm1HZXRDYXAoZGlzcGxheS0+ZHJtX2ZkLCBEUk1fQ0FQX0NVUlNPUl9X SURUSCwgJmN1cnNvcl93aWR0aCkpOwogCWlmIChjdXJzb3Jfd2lkdGggPj0gbW9kZS0+aGRpc3Bs YXkpCkBAIC0yMjQsNiArMjI3LDExIEBAIHN0YXRpYyB2b2lkIHNldHVwX3Bhcm1zKGlndF9kaXNw bGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLAogCWlmIChjdXJzb3JfaGVpZ2h0ID49IG1v ZGUtPnZkaXNwbGF5KQogCQljdXJzb3JfaGVpZ2h0ID0gbW9kZS0+dmRpc3BsYXk7CiAKK3JldHJ5 OgorCW5fb3ZlcmxheXMgPSAwOworCWl0ZXJfbWFzayA9IDM7CisJcGxhbmVzX3RvX3JlbW92ZSA9 IGRpc3BsYXktPnBpcGVzW3BpcGVdLm5fcGxhbmVzIC0gbl9wbGFuZXM7CisKIAlmb3JfZWFjaF9w bGFuZV9vbl9waXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKSB7CiAJCWludCBpID0gcGxhbmUtPmlu ZGV4OwogCkBAIC0yMzgsMTIgKzI0NiwzMCBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3Rf ZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAkJCXBhcm1zW2ldLmhlaWdodCA9 IGN1cnNvcl9oZWlnaHQ7CiAJCQlwYXJtc1tpXS5tYXNrID0gMSA8PCAxOwogCQl9IGVsc2Ugewot CQkJcGFybXNbaV0uZmIgPSBzcHJpdGVfZmI7Ci0JCQlwYXJtc1tpXS5tYXNrID0gMSA8PCAyOwot Ci0JCQlpdGVyX21hc2sgfD0gMSA8PCAyOwotCi0JCQlvdmVybGF5c1tuX292ZXJsYXlzKytdID0g aTsKKwkJCS8qIFJhbmRvbWl6ZSBpZiB3ZSByZW1vdmUgdGhhdCBzcHJpdGUgcGxhbmUgb3Igbm90 ICovCisJCQl1aW50MzJfdCByZW1vdmUgPSBoYXJzX3BldHJ1c2thX2Y1NF8xX3JhbmRvbV91bnNh ZmVfbWF4KDIpOworCQkJLyoKKwkJCSAqIEZpZ3VyZSBvdXQgaG93IG11Y2ggc3ByaXRlIHBsYW5l cyBsZWZ0OgorCQkJICogcGxhbmVzIGxlZnQgPSBvdmVyYWxsIGFtb3VudCAtIDEgcHJpbWFyeSAt IDEgY3Vyc29yIC0gc3ByaXRlIHBsYW5lcyB1c2VkCisJCQkgKi8KKwkJCWludCBwbGFuZXNfbGVm dCA9IGRpc3BsYXktPnBpcGVzW3BpcGVdLm5fcGxhbmVzIC0gMiAtIG5fb3ZlcmxheXM7CisJCQkv KgorCQkJICogUmVtb3ZlIHRoZSBwbGFuZSBpZiByZW1vdmUgaXMgc2V0IGFuZCB3ZSBoYXZlIHNw cml0ZSBwbGFuZXMgdG8gcmVtb3ZlLgorCQkJICogSWYgd2UgaGF2ZSBsZWZ0IHNhbWUgb3IgbGVz cyBhbW91bnQgb2YgcGxhbmVzIHRoYW4gd2UgbmVlZAorCQkJICogdG8gcmVtb3ZlIHRoZW4gbm8g cmFuZG9taXphdGlvbiwganVzdCByZW1vdmUuCisJCQkgKi8KKwkJCWlmICgocmVtb3ZlICYmIHBs YW5lc190b19yZW1vdmUgPiAwKSB8fCAocGxhbmVzX3RvX3JlbW92ZSA+PSBwbGFuZXNfbGVmdCkp IHsKKwkJCQlwYXJtc1tpXS5mYiA9IE5VTEw7CisJCQkJcGFybXNbaV0ubWFzayA9IDA7CisJCQkJ cGxhbmVzX3RvX3JlbW92ZS0tOworCQkJCWlndF93YXJuKCJSZW1vdmVkIHBsYW5lICVkXG4iLCBp KTsKKwkJCX0KKwkJCWVsc2UgeworCQkJCXBhcm1zW2ldLmZiID0gc3ByaXRlX2ZiOworCQkJCXBh cm1zW2ldLm1hc2sgPSAxIDw8IDI7CisJCQkJaXRlcl9tYXNrIHw9IDEgPDwgMjsKKwkJCQlvdmVy bGF5c1tuX292ZXJsYXlzKytdID0gaTsKKwkJCX0KIAkJfQogCX0KIApAQCAtMjc4LDE2ICszMDQs MTMgQEAgc3RhdGljIHZvaWQgc2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51 bSBwaXBlIHBpcGUsCiAJICogUHJlIGdlbjkgbm90IGFsbCBzaXplcyBhcmUgc3VwcG9ydGVkLCBm aW5kIHRoZSBiaWdnZXN0IHBvc3NpYmxlCiAJICogc2l6ZSB0aGF0IGNhbiBiZSBlbmFibGVkIG9u IGFsbCBzcHJpdGUgcGxhbmVzLgogCSAqLwotcmV0cnk6CiAJcHJldl93ID0gc3ByaXRlX3dpZHRo ID0gY3Vyc29yX3dpZHRoOwogCXByZXZfaCA9IHNwcml0ZV9oZWlnaHQgPSBjdXJzb3JfaGVpZ2h0 OwogCiAJbWF4X3Nwcml0ZV93aWR0aCA9IChzcHJpdGVfd2lkdGggPT0gbW9kZS0+aGRpc3BsYXkp OwogCW1heF9zcHJpdGVfaGVpZ2h0ID0gKHNwcml0ZV9oZWlnaHQgPT0gbW9kZS0+dmRpc3BsYXkp OwogCi0Jd2hpbGUgKDEpIHsKLQkJaW50IHJldDsKLQorCXdoaWxlICghbWF4X3Nwcml0ZV93aWR0 aCAmJiAhbWF4X3Nwcml0ZV9oZWlnaHQpIHsKIAkJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBwaXBl LCBwYXJtcywgc3ByaXRlX2ZiLAogCQkJICAgICAgYWxwaGEsIHNwcml0ZV93aWR0aCwgc3ByaXRl X2hlaWdodCk7CiAKQEAgLTI5NSw1NCArMzE4LDQ5IEBAIHJldHJ5OgogCQlyZXQgPSBpZ3RfZGlz cGxheV90cnlfY29tbWl0X2F0b21pYyhkaXNwbGF5LCBEUk1fTU9ERV9BVE9NSUNfVEVTVF9PTkxZ IHwgRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVTRVQsIE5VTEwpOwogCQlpZ3RfYXNzZXJ0KCFp c19hdG9taWNfY2hlY2tfZmFpbHVyZV9lcnJubyhyZXQpKTsKIAotCQlpZiAoaXNfYXRvbWljX2No ZWNrX3BsYW5lX3NpemVfZXJybm8ocmV0KSkgewotCQkJaWYgKGN1cnNvcl93aWR0aCA9PSBzcHJp dGVfd2lkdGggJiYKLQkJCSAgICBjdXJzb3JfaGVpZ2h0ID09IHNwcml0ZV9oZWlnaHQpIHsKLQkJ CQlpZ3RfYXNzZXJ0X2YoYWxwaGEsCi0JCQkJCSAgICAgICJDYW5ub3QgY29uZmlndXJlIHRoZSB0 ZXN0IHdpdGggYWxsIHNwcml0ZSBwbGFuZXMgZW5hYmxlZFxuIik7Ci0KLQkJCQkvKiByZXRyeSBv bmNlIHdpdGggWFJHQiBmb3JtYXQuICovCi0JCQkJYWxwaGEgPSBmYWxzZTsKLQkJCQlnb3RvIHJl dHJ5OwotCQkJfQotCi0JCQlzcHJpdGVfd2lkdGggPSBwcmV2X3c7Ci0JCQlzcHJpdGVfaGVpZ2h0 ID0gcHJldl9oOwotCi0JCQlpZiAobWF4X3Nwcml0ZV93aWR0aCAmJiBtYXhfc3ByaXRlX2hlaWdo dCkgewotCQkJCXNldF9zcHJpdGVfd2goZGlzcGxheSwgcGlwZSwgcGFybXMsIHNwcml0ZV9mYiwK LQkJCQkJICAgICAgYWxwaGEsIHNwcml0ZV93aWR0aCwgc3ByaXRlX2hlaWdodCk7Ci0JCQkJYnJl YWs7Ci0JCQl9Ci0KLQkJCWlmICghbWF4X3Nwcml0ZV93aWR0aCkKLQkJCQltYXhfc3ByaXRlX3dp ZHRoID0gdHJ1ZTsKLQkJCWVsc2UKLQkJCQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7Ci0JCX0g ZWxzZSB7CisJCWlmICghaXNfYXRvbWljX2NoZWNrX3BsYW5lX3NpemVfZXJybm8ocmV0KSkgewog CQkJcHJldl93ID0gc3ByaXRlX3dpZHRoOwogCQkJcHJldl9oID0gc3ByaXRlX2hlaWdodDsKLQkJ fQotCi0JCWlmICghbWF4X3Nwcml0ZV93aWR0aCkgewotCQkJc3ByaXRlX3dpZHRoICo9IDI7Ci0K KyAgICAKKwkJCXNwcml0ZV93aWR0aCAqPSBtYXhfc3ByaXRlX3dpZHRoID8gMSA6IDI7CiAJCQlp ZiAoc3ByaXRlX3dpZHRoID49IG1vZGUtPmhkaXNwbGF5KSB7CiAJCQkJbWF4X3Nwcml0ZV93aWR0 aCA9IHRydWU7Ci0KIAkJCQlzcHJpdGVfd2lkdGggPSBtb2RlLT5oZGlzcGxheTsKIAkJCX0KLQkJ fSBlbHNlIGlmICghbWF4X3Nwcml0ZV9oZWlnaHQpIHsKLQkJCXNwcml0ZV9oZWlnaHQgKj0gMjsK IAorCQkJc3ByaXRlX2hlaWdodCAqPSBtYXhfc3ByaXRlX2hlaWdodCA/IDEgOiAyOwogCQkJaWYg KHNwcml0ZV9oZWlnaHQgPj0gbW9kZS0+dmRpc3BsYXkpIHsKIAkJCQltYXhfc3ByaXRlX2hlaWdo dCA9IHRydWU7Ci0KIAkJCQlzcHJpdGVfaGVpZ2h0ID0gbW9kZS0+dmRpc3BsYXk7CiAJCQl9Ci0J CX0gZWxzZQotCQkJLyogTWF4IHNpemVkIHNwcml0ZXMgZm9yIGFsbCEgKi8KLQkJCWJyZWFrOwor CQkJY29udGludWU7CisJCX0KKworCQlpZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0aCAm JgorCQkgICAgY3Vyc29yX2hlaWdodCA9PSBzcHJpdGVfaGVpZ2h0KSB7CisJCQlpZ3RfYXNzZXJ0 X2YocmV0cmllcyA+IDAsCisJCQkJICAgICAgIkNhbm5vdCBjb25maWd1cmUgdGhlIHRlc3Qgd2l0 aCBhbGwgc3ByaXRlIHBsYW5lcyBlbmFibGVkXG4iKTsKKwkJCS0tcmV0cmllczsKKwkJCS8qIHJl dHJ5IG9uY2Ugd2l0aCBYUkdCIGZvcm1hdC4gKi8KKwkJCWlmIChhbHBoYSkgeworCQkJCWFscGhh ID0gZmFsc2U7CisJCQkJaWd0X3dhcm4oIlJlbW92ZWQgYWxwaGFcbiIpOworCQkJfQorCQkJZWxz ZSB7CisJCQkJaWd0X2Fzc2VydF9mKG5fcGxhbmVzID4gMSwgIk5vIHBsYW5lcyBsZWZ0IHRvIHBy b2NlZWQgd2l0aCEiKTsKKwkJCQluX3BsYW5lcy0tOworCQkJCWlndF93YXJuKCJSZWR1Y2VkIGF2 YWlsYWJsZSBwbGFuZXMgdG8gJWRcbiIsIG5fcGxhbmVzKTsKKwkJCX0KKwkJCWdvdG8gcmV0cnk7 CisJCX0KKworCQlzcHJpdGVfd2lkdGggPSBwcmV2X3c7CisJCXNwcml0ZV9oZWlnaHQgPSBwcmV2 X2g7CisKKwkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKQorCQkJbWF4X3Nwcml0ZV93aWR0aCA9IHRy dWU7CisJCWVsc2UKKwkJCW1heF9zcHJpdGVfaGVpZ2h0ID0gdHJ1ZTsKIAl9CiAKIAlpZ3RfaW5m bygiUnVubmluZyB0ZXN0IG9uIHBpcGUgJXMgd2l0aCByZXNvbHV0aW9uICVkeCVkIGFuZCBzcHJp dGUgc2l6ZSAlZHglZCBhbHBoYSAlaVxuIiwKQEAgLTQ2Myw3ICs0ODEsNiBAQCBydW5fdHJhbnNp dGlvbl90ZXN0KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLCBpZ3Rfb3V0 cHV0X3QgKm91dHB1dAogCiAJaWYgKGZsYWdzICYgRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVT RVQpIHsKIAkJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIFBJUEVfTk9ORSk7Ci0KIAkJaWd0 X2Rpc3BsYXlfY29tbWl0MihkaXNwbGF5LCBDT01NSVRfQVRPTUlDKTsKIAogCQlpZ3Rfb3V0cHV0 X3NldF9waXBlKG91dHB1dCwgcGlwZSk7CkBAIC01MjUsOCArNTQyLDEwIEBAIHJ1bl90cmFuc2l0 aW9uX3Rlc3QoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsIGlndF9vdXRw dXRfdCAqb3V0cHV0CiAJCX0KIAogCQkvKiBmb3JjZSBwbGFuZXMgdG8gYmUgcGFydCBvZiBjb21t aXQgKi8KLQkJZm9yX2VhY2hfcGxhbmVfb25fcGlwZShkaXNwbGF5LCBwaXBlLCBwbGFuZSkKLQkJ CWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGxhbmUsIDAsIDApOworCQlmb3JfZWFjaF9wbGFuZV9v bl9waXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKSB7CisJCQlpZiAocGFybXNbcGxhbmUtPmluZGV4 XS5tYXNrKQorCQkJCWlndF9wbGFuZV9zZXRfcG9zaXRpb24ocGxhbmUsIDAsIDApOworCQl9CiAK IAkJaWd0X2Rpc3BsYXlfY29tbWl0MihkaXNwbGF5LCBDT01NSVRfQVRPTUlDKTsKIAotLSAKMi4x Ny4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3Qt ZGV2IG1haWxpbmcgbGlzdAppZ3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=