From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F4CE6E8DB for ; Wed, 3 Apr 2019 12:55:10 +0000 (UTC) From: Stanislav Lisovskiy Date: Wed, 3 Apr 2019 15:54:50 +0300 Message-Id: <20190403125450.17648-3-stanislav.lisovskiy@intel.com> In-Reply-To: <20190403125450.17648-1-stanislav.lisovskiy@intel.com> References: <20190403125450.17648-1-stanislav.lisovskiy@intel.com> Subject: [igt-dev] [PATCH i-g-t v4 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: martin.peres@intel.com, stanislav.lisovskiy@intel.com List-ID: V2l0aCBzb21lIHVwY29taW5nIGNoYW5nZXMgaTkxNSBtaWdodCBub3QgYWxsb3cKYWxsIHNwcml0 ZSBwbGFuZXMgZW5hYmxlZCwgZGVwZW5kaW5nIG9uIGF2YWlsYWJsZQpiYW5kd2lkdGggbGltaXRh dGlvbi4gVGh1cyB0aGUgdGVzdCBuZWVkIHRvIGRlY3JlbWVudAphbW91bnQgb2YgcGxhbmVzIGFu ZCB0cnkgYWdhaW4sIGluc3RlYWQgb2YgcGFuaWNraW5nLgoKdjI6IFJlbW92ZWQgZXhjZXNzaXZl IG5lc3RlZCBjb25kaXRpb25zLCBtYWtpbmcgY29kZSBhIGJpdAogICAgbW9yZSByZWFkYWJsZSho b3BlZnVsbHkpLgoKdjM6IFN0b3BwZWQgdXNpbmcgZ2xvYmFsIG5fcGxhbmVzIHZhcmlhYmxlIGFz IGl0IG1pZ2h0IGNhdXNlCiAgICByZXNvdXJjZXMgYmVpbmcgdW5yZWxlYXNlZC4KICAgIFVzaW5n IG5vdyBwYXJtc1tpXS5tYXNrIGFzIGEgd2F5IHRvIGRldGVybWluZSBpZiBwbGFuZQogICAgaGFz IHRvIGJlIGluY2x1ZGVkIGludG8gY29tbWl0LgoKdjQ6IFJlbW92ZWQgdW5uZWVkZWQgbl9vdmVy bGF5cyBpbml0aWFsaXphdGlvbi4KClNpZ25lZC1vZmYtYnk6IFN0YW5pc2xhdiBMaXNvdnNraXkg PHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29tPgotLS0KIHRlc3RzL2ttc19hdG9taWNfdHJh bnNpdGlvbi5jIHwgMTA3ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCA1MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYyBiL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNp dGlvbi5jCmluZGV4IDYzOGZlMTdlLi5hMDQyMjBmMyAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2F0 b21pY190cmFuc2l0aW9uLmMKKysrIGIvdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMKQEAg LTIxMiw5ICsyMTIsMTEgQEAgc3RhdGljIHZvaWQgc2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlfdCAq ZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJdW5zaWduZWQgc3ByaXRlX3dpZHRoLCBzcHJpdGVf aGVpZ2h0LCBwcmV2X3csIHByZXZfaDsKIAlib29sIG1heF9zcHJpdGVfd2lkdGgsIG1heF9zcHJp dGVfaGVpZ2h0LCBhbHBoYSA9IHRydWU7CiAJdWludDMyX3Qgbl9wbGFuZXMgPSBkaXNwbGF5LT5w aXBlc1twaXBlXS5uX3BsYW5lczsKLQl1aW50MzJfdCBuX292ZXJsYXlzID0gMCwgb3ZlcmxheXNb bl9wbGFuZXNdOworCXVpbnQzMl90IG5fb3ZlcmxheXMsIG92ZXJsYXlzW25fcGxhbmVzXTsKIAlp Z3RfcGxhbmVfdCAqcGxhbmU7Ci0JdWludDMyX3QgaXRlcl9tYXNrID0gMzsKKwl1aW50MzJfdCBp dGVyX21hc2s7CisJaW50IHJldHJpZXMgPSBuX3BsYW5lcyAtIDE7CisJaW50IHJldCA9IDA7CiAK IAlkb19vcl9kaWUoZHJtR2V0Q2FwKGRpc3BsYXktPmRybV9mZCwgRFJNX0NBUF9DVVJTT1JfV0lE VEgsICZjdXJzb3Jfd2lkdGgpKTsKIAlpZiAoY3Vyc29yX3dpZHRoID49IG1vZGUtPmhkaXNwbGF5 KQpAQCAtMjI0LDYgKzIyNiwxMCBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlzcGxh eV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAlpZiAoY3Vyc29yX2hlaWdodCA+PSBtb2Rl LT52ZGlzcGxheSkKIAkJY3Vyc29yX2hlaWdodCA9IG1vZGUtPnZkaXNwbGF5OwogCityZXRyeToK KwluX292ZXJsYXlzID0gMDsKKwlpdGVyX21hc2sgPSAzOworCiAJZm9yX2VhY2hfcGxhbmVfb25f cGlwZShkaXNwbGF5LCBwaXBlLCBwbGFuZSkgewogCQlpbnQgaSA9IHBsYW5lLT5pbmRleDsKIApA QCAtMjM4LDEyICsyNDQsMTYgQEAgc3RhdGljIHZvaWQgc2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlf dCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJCQlwYXJtc1tpXS5oZWlnaHQgPSBjdXJzb3Jf aGVpZ2h0OwogCQkJcGFybXNbaV0ubWFzayA9IDEgPDwgMTsKIAkJfSBlbHNlIHsKLQkJCXBhcm1z W2ldLmZiID0gc3ByaXRlX2ZiOwotCQkJcGFybXNbaV0ubWFzayA9IDEgPDwgMjsKLQotCQkJaXRl cl9tYXNrIHw9IDEgPDwgMjsKLQotCQkJb3ZlcmxheXNbbl9vdmVybGF5cysrXSA9IGk7CisJCQlp ZiAobl9vdmVybGF5cyA8IChuX3BsYW5lcyAtIDIpKSB7CisJCQkJcGFybXNbaV0uZmIgPSBzcHJp dGVfZmI7CisJCQkJcGFybXNbaV0ubWFzayA9IDEgPDwgMjsKKwkJCQlpdGVyX21hc2sgfD0gMSA8 PCAyOworCQkJCW92ZXJsYXlzW25fb3ZlcmxheXMrK10gPSBpOworCQkJfQorCQkJZWxzZSB7CisJ CQkJcGFybXNbaV0uZmIgPSBOVUxMOworCQkJCXBhcm1zW2ldLm1hc2sgPSAwOworCQkJfQogCQl9 CiAJfQogCkBAIC0yNzgsMTYgKzI4OCwxMyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3Rf ZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAkgKiBQcmUgZ2VuOSBub3QgYWxs IHNpemVzIGFyZSBzdXBwb3J0ZWQsIGZpbmQgdGhlIGJpZ2dlc3QgcG9zc2libGUKIAkgKiBzaXpl IHRoYXQgY2FuIGJlIGVuYWJsZWQgb24gYWxsIHNwcml0ZSBwbGFuZXMuCiAJICovCi1yZXRyeToK IAlwcmV2X3cgPSBzcHJpdGVfd2lkdGggPSBjdXJzb3Jfd2lkdGg7CiAJcHJldl9oID0gc3ByaXRl X2hlaWdodCA9IGN1cnNvcl9oZWlnaHQ7CiAKIAltYXhfc3ByaXRlX3dpZHRoID0gKHNwcml0ZV93 aWR0aCA9PSBtb2RlLT5oZGlzcGxheSk7CiAJbWF4X3Nwcml0ZV9oZWlnaHQgPSAoc3ByaXRlX2hl aWdodCA9PSBtb2RlLT52ZGlzcGxheSk7CiAKLQl3aGlsZSAoMSkgewotCQlpbnQgcmV0OwotCisJ d2hpbGUgKCFtYXhfc3ByaXRlX3dpZHRoICYmICFtYXhfc3ByaXRlX2hlaWdodCkgewogCQlzZXRf c3ByaXRlX3doKGRpc3BsYXksIHBpcGUsIHBhcm1zLCBzcHJpdGVfZmIsCiAJCQkgICAgICBhbHBo YSwgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0KTsKIApAQCAtMjk1LDU0ICszMDIsNDkgQEAg cmV0cnk6CiAJCXJldCA9IGlndF9kaXNwbGF5X3RyeV9jb21taXRfYXRvbWljKGRpc3BsYXksIERS TV9NT0RFX0FUT01JQ19URVNUX09OTFkgfCBEUk1fTU9ERV9BVE9NSUNfQUxMT1dfTU9ERVNFVCwg TlVMTCk7CiAJCWlndF9hc3NlcnQoIWlzX2F0b21pY19jaGVja19mYWlsdXJlX2Vycm5vKHJldCkp OwogCi0JCWlmIChpc19hdG9taWNfY2hlY2tfcGxhbmVfc2l6ZV9lcnJubyhyZXQpKSB7Ci0JCQlp ZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0aCAmJgotCQkJICAgIGN1cnNvcl9oZWlnaHQg PT0gc3ByaXRlX2hlaWdodCkgewotCQkJCWlndF9hc3NlcnRfZihhbHBoYSwKLQkJCQkJICAgICAg IkNhbm5vdCBjb25maWd1cmUgdGhlIHRlc3Qgd2l0aCBhbGwgc3ByaXRlIHBsYW5lcyBlbmFibGVk XG4iKTsKLQotCQkJCS8qIHJldHJ5IG9uY2Ugd2l0aCBYUkdCIGZvcm1hdC4gKi8KLQkJCQlhbHBo YSA9IGZhbHNlOwotCQkJCWdvdG8gcmV0cnk7Ci0JCQl9Ci0KLQkJCXNwcml0ZV93aWR0aCA9IHBy ZXZfdzsKLQkJCXNwcml0ZV9oZWlnaHQgPSBwcmV2X2g7Ci0KLQkJCWlmIChtYXhfc3ByaXRlX3dp ZHRoICYmIG1heF9zcHJpdGVfaGVpZ2h0KSB7Ci0JCQkJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBw aXBlLCBwYXJtcywgc3ByaXRlX2ZiLAotCQkJCQkgICAgICBhbHBoYSwgc3ByaXRlX3dpZHRoLCBz cHJpdGVfaGVpZ2h0KTsKLQkJCQlicmVhazsKLQkJCX0KLQotCQkJaWYgKCFtYXhfc3ByaXRlX3dp ZHRoKQotCQkJCW1heF9zcHJpdGVfd2lkdGggPSB0cnVlOwotCQkJZWxzZQotCQkJCW1heF9zcHJp dGVfaGVpZ2h0ID0gdHJ1ZTsKLQkJfSBlbHNlIHsKKwkJaWYgKCFpc19hdG9taWNfY2hlY2tfcGxh bmVfc2l6ZV9lcnJubyhyZXQpKSB7CiAJCQlwcmV2X3cgPSBzcHJpdGVfd2lkdGg7CiAJCQlwcmV2 X2ggPSBzcHJpdGVfaGVpZ2h0OwotCQl9Ci0KLQkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKSB7Ci0J CQlzcHJpdGVfd2lkdGggKj0gMjsKLQorICAgIAorCQkJc3ByaXRlX3dpZHRoICo9IG1heF9zcHJp dGVfd2lkdGggPyAxIDogMjsKIAkJCWlmIChzcHJpdGVfd2lkdGggPj0gbW9kZS0+aGRpc3BsYXkp IHsKIAkJCQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1ZTsKLQogCQkJCXNwcml0ZV93aWR0aCA9IG1v ZGUtPmhkaXNwbGF5OwogCQkJfQotCQl9IGVsc2UgaWYgKCFtYXhfc3ByaXRlX2hlaWdodCkgewot CQkJc3ByaXRlX2hlaWdodCAqPSAyOwogCisJCQlzcHJpdGVfaGVpZ2h0ICo9IG1heF9zcHJpdGVf aGVpZ2h0ID8gMSA6IDI7CiAJCQlpZiAoc3ByaXRlX2hlaWdodCA+PSBtb2RlLT52ZGlzcGxheSkg ewogCQkJCW1heF9zcHJpdGVfaGVpZ2h0ID0gdHJ1ZTsKLQogCQkJCXNwcml0ZV9oZWlnaHQgPSBt b2RlLT52ZGlzcGxheTsKIAkJCX0KLQkJfSBlbHNlCi0JCQkvKiBNYXggc2l6ZWQgc3ByaXRlcyBm b3IgYWxsISAqLwotCQkJYnJlYWs7CisJCQljb250aW51ZTsKKwkJfQorCisJCWlmIChjdXJzb3Jf d2lkdGggPT0gc3ByaXRlX3dpZHRoICYmCisJCSAgICBjdXJzb3JfaGVpZ2h0ID09IHNwcml0ZV9o ZWlnaHQpIHsKKwkJCWlndF9hc3NlcnRfZihyZXRyaWVzID4gMCwKKwkJCQkgICAgICAiQ2Fubm90 IGNvbmZpZ3VyZSB0aGUgdGVzdCB3aXRoIGFsbCBzcHJpdGUgcGxhbmVzIGVuYWJsZWRcbiIpOwor CQkJLS1yZXRyaWVzOworCQkJLyogcmV0cnkgb25jZSB3aXRoIFhSR0IgZm9ybWF0LiAqLworCQkJ aWYgKGFscGhhKSB7CisJCQkJYWxwaGEgPSBmYWxzZTsKKwkJCQlpZ3Rfd2FybigiUmVtb3ZlZCBh bHBoYVxuIik7CisJCQl9CisJCQllbHNlIHsKKwkJCQlpZ3RfYXNzZXJ0X2Yobl9wbGFuZXMgPiAx LCAiTm8gcGxhbmVzIGxlZnQgdG8gcHJvY2VlZCB3aXRoISIpOworCQkJCW5fcGxhbmVzLS07CisJ CQkJaWd0X3dhcm4oIlJlZHVjZWQgYXZhaWxhYmxlIHBsYW5lcyB0byAlZFxuIiwgbl9wbGFuZXMp OworCQkJfQorCQkJZ290byByZXRyeTsKKwkJfQorCisJCXNwcml0ZV93aWR0aCA9IHByZXZfdzsK KwkJc3ByaXRlX2hlaWdodCA9IHByZXZfaDsKKworCQlpZiAoIW1heF9zcHJpdGVfd2lkdGgpCisJ CQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1ZTsKKwkJZWxzZQorCQkJbWF4X3Nwcml0ZV9oZWlnaHQg PSB0cnVlOwogCX0KIAogCWlndF9pbmZvKCJSdW5uaW5nIHRlc3Qgb24gcGlwZSAlcyB3aXRoIHJl c29sdXRpb24gJWR4JWQgYW5kIHNwcml0ZSBzaXplICVkeCVkIGFscGhhICVpXG4iLApAQCAtNDYz LDcgKzQ2NSw2IEBAIHJ1bl90cmFuc2l0aW9uX3Rlc3QoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwg ZW51bSBwaXBlIHBpcGUsIGlndF9vdXRwdXRfdCAqb3V0cHV0CiAKIAlpZiAoZmxhZ3MgJiBEUk1f TU9ERV9BVE9NSUNfQUxMT1dfTU9ERVNFVCkgewogCQlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1 dCwgUElQRV9OT05FKTsKLQogCQlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9B VE9NSUMpOwogCiAJCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0LCBwaXBlKTsKQEAgLTUyNSw4 ICs1MjYsMTAgQEAgcnVuX3RyYW5zaXRpb25fdGVzdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBl bnVtIHBpcGUgcGlwZSwgaWd0X291dHB1dF90ICpvdXRwdXQKIAkJfQogCiAJCS8qIGZvcmNlIHBs YW5lcyB0byBiZSBwYXJ0IG9mIGNvbW1pdCAqLwotCQlmb3JfZWFjaF9wbGFuZV9vbl9waXBlKGRp c3BsYXksIHBpcGUsIHBsYW5lKQotCQkJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihwbGFuZSwgMCwg MCk7CisJCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKKwkJ CWlmIChwYXJtc1twbGFuZS0+aW5kZXhdLm1hc2spCisJCQkJaWd0X3BsYW5lX3NldF9wb3NpdGlv bihwbGFuZSwgMCwgMCk7CisJCX0KIAogCQlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENP TU1JVF9BVE9NSUMpOwogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGlu Zm8vaWd0LWRldg==