From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C61789DC9 for ; Thu, 4 Apr 2019 12:14:21 +0000 (UTC) From: Stanislav Lisovskiy Date: Thu, 4 Apr 2019 15:13:59 +0300 Message-Id: <20190404121359.3339-3-stanislav.lisovskiy@intel.com> In-Reply-To: <20190404121359.3339-1-stanislav.lisovskiy@intel.com> References: <20190404121359.3339-1-stanislav.lisovskiy@intel.com> Subject: [igt-dev] [PATCH i-g-t v5 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 cyB0byByZW1vdmUgaWYgaGl0dGluZwogICAgcmVzb3VyY2UgbGltaXRzLgoKU2lnbmVkLW9mZi1i eTogU3RhbmlzbGF2IExpc292c2tpeSA8c3RhbmlzbGF2Lmxpc292c2tpeUBpbnRlbC5jb20+Ci0t LQogdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMgfCAxMjMgKysrKysrKysrKysrKysrKysr KystLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDUyIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19hdG9taWNfdHJhbnNpdGlvbi5jIGIv dGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMKaW5kZXggNjM4ZmUxN2UuLmU2ZDU1Y2EwIDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYworKysgYi90ZXN0cy9rbXNf YXRvbWljX3RyYW5zaXRpb24uYwpAQCAtMjEyLDkgKzIxMiwxMiBAQCBzdGF0aWMgdm9pZCBzZXR1 cF9wYXJtcyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAl1bnNpZ25l ZCBzcHJpdGVfd2lkdGgsIHNwcml0ZV9oZWlnaHQsIHByZXZfdywgcHJldl9oOwogCWJvb2wgbWF4 X3Nwcml0ZV93aWR0aCwgbWF4X3Nwcml0ZV9oZWlnaHQsIGFscGhhID0gdHJ1ZTsKIAl1aW50MzJf dCBuX3BsYW5lcyA9IGRpc3BsYXktPnBpcGVzW3BpcGVdLm5fcGxhbmVzOwotCXVpbnQzMl90IG5f b3ZlcmxheXMgPSAwLCBvdmVybGF5c1tuX3BsYW5lc107CisJdWludDMyX3Qgbl9vdmVybGF5cywg b3ZlcmxheXNbbl9wbGFuZXNdOwogCWlndF9wbGFuZV90ICpwbGFuZTsKLQl1aW50MzJfdCBpdGVy X21hc2sgPSAzOworCXVpbnQzMl90IGl0ZXJfbWFzazsKKwlpbnQgcmV0cmllcyA9IG5fcGxhbmVz IC0gMTsKKwlpbnQgcmV0ID0gMDsKKwl1aW50MzJfdCBwbGFuZXNfdG9fcmVtb3ZlOwogCiAJZG9f b3JfZGllKGRybUdldENhcChkaXNwbGF5LT5kcm1fZmQsIERSTV9DQVBfQ1VSU09SX1dJRFRILCAm Y3Vyc29yX3dpZHRoKSk7CiAJaWYgKGN1cnNvcl93aWR0aCA+PSBtb2RlLT5oZGlzcGxheSkKQEAg LTIyNCw2ICsyMjcsMTEgQEAgc3RhdGljIHZvaWQgc2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlfdCAq ZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJaWYgKGN1cnNvcl9oZWlnaHQgPj0gbW9kZS0+dmRp c3BsYXkpCiAJCWN1cnNvcl9oZWlnaHQgPSBtb2RlLT52ZGlzcGxheTsKIAorcmV0cnk6CisJbl9v dmVybGF5cyA9IDA7CisJaXRlcl9tYXNrID0gMzsKKwlwbGFuZXNfdG9fcmVtb3ZlID0gZGlzcGxh eS0+cGlwZXNbcGlwZV0ubl9wbGFuZXMgLSBuX3BsYW5lczsKKwogCWZvcl9lYWNoX3BsYW5lX29u X3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKIAkJaW50IGkgPSBwbGFuZS0+aW5kZXg7CiAK QEAgLTIzOCwxMiArMjQ2LDMwIEBAIHN0YXRpYyB2b2lkIHNldHVwX3Bhcm1zKGlndF9kaXNwbGF5 X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLAogCQkJcGFybXNbaV0uaGVpZ2h0ID0gY3Vyc29y X2hlaWdodDsKIAkJCXBhcm1zW2ldLm1hc2sgPSAxIDw8IDE7CiAJCX0gZWxzZSB7Ci0JCQlwYXJt c1tpXS5mYiA9IHNwcml0ZV9mYjsKLQkJCXBhcm1zW2ldLm1hc2sgPSAxIDw8IDI7Ci0KLQkJCWl0 ZXJfbWFzayB8PSAxIDw8IDI7Ci0KLQkJCW92ZXJsYXlzW25fb3ZlcmxheXMrK10gPSBpOworCQkJ LyogUmFuZG9taXplIGlmIHdlIHJlbW92ZSB0aGF0IHNwcml0ZSBwbGFuZSBvciBub3QgKi8KKwkJ CXVpbnQzMl90IHJlbW92ZSA9IGhhcnNfcGV0cnVza2FfZjU0XzFfcmFuZG9tX3Vuc2FmZV9tYXgo Mik7CisJCQkvKgorCQkJICogRmlndXJlIG91dCBob3cgbXVjaCBzcHJpdGUgcGxhbmVzIGxlZnQ6 CisJCQkgKiBwbGFuZXMgbGVmdCA9IG92ZXJhbGwgYW1vdW50IC0gMSBwcmltYXJ5IC0gMSBjdXJz b3IgLSBzcHJpdGUgcGxhbmVzIHVzZWQKKwkJCSAqLworCQkJaW50IHBsYW5lc19sZWZ0ID0gZGlz cGxheS0+cGlwZXNbcGlwZV0ubl9wbGFuZXMgLSAyIC0gbl9vdmVybGF5czsKKwkJCS8qCisJCQkg KiBSZW1vdmUgdGhlIHBsYW5lIGlmIHJlbW92ZSBpcyBzZXQgYW5kIHdlIGhhdmUgc3ByaXRlIHBs YW5lcyB0byByZW1vdmUuCisJCQkgKiBJZiB3ZSBoYXZlIGxlZnQgc2FtZSBvciBsZXNzIGFtb3Vu dCBvZiBwbGFuZXMgdGhhbiB3ZSBuZWVkCisJCQkgKiB0byByZW1vdmUgdGhlbiBubyByYW5kb21p emF0aW9uLCBqdXN0IHJlbW92ZS4KKwkJCSAqLworCQkJaWYgKChyZW1vdmUgJiYgcGxhbmVzX3Rv X3JlbW92ZSA+IDApIHx8IChwbGFuZXNfdG9fcmVtb3ZlID49IHBsYW5lc19sZWZ0KSkgeworCQkJ CXBhcm1zW2ldLmZiID0gTlVMTDsKKwkJCQlwYXJtc1tpXS5tYXNrID0gMDsKKwkJCQlwbGFuZXNf dG9fcmVtb3ZlLS07CisJCQkJaWd0X3dhcm4oIlJlbW92ZWQgcGxhbmUgJWRcbiIsIGkpOworCQkJ fQorCQkJZWxzZSB7CisJCQkJcGFybXNbaV0uZmIgPSBzcHJpdGVfZmI7CisJCQkJcGFybXNbaV0u bWFzayA9IDEgPDwgMjsKKwkJCQlpdGVyX21hc2sgfD0gMSA8PCAyOworCQkJCW92ZXJsYXlzW25f b3ZlcmxheXMrK10gPSBpOworCQkJfQogCQl9CiAJfQogCkBAIC0yNzgsMTYgKzMwNCwxMyBAQCBz dGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUg cGlwZSwKIAkgKiBQcmUgZ2VuOSBub3QgYWxsIHNpemVzIGFyZSBzdXBwb3J0ZWQsIGZpbmQgdGhl IGJpZ2dlc3QgcG9zc2libGUKIAkgKiBzaXplIHRoYXQgY2FuIGJlIGVuYWJsZWQgb24gYWxsIHNw cml0ZSBwbGFuZXMuCiAJICovCi1yZXRyeToKIAlwcmV2X3cgPSBzcHJpdGVfd2lkdGggPSBjdXJz b3Jfd2lkdGg7CiAJcHJldl9oID0gc3ByaXRlX2hlaWdodCA9IGN1cnNvcl9oZWlnaHQ7CiAKIAlt YXhfc3ByaXRlX3dpZHRoID0gKHNwcml0ZV93aWR0aCA9PSBtb2RlLT5oZGlzcGxheSk7CiAJbWF4 X3Nwcml0ZV9oZWlnaHQgPSAoc3ByaXRlX2hlaWdodCA9PSBtb2RlLT52ZGlzcGxheSk7CiAKLQl3 aGlsZSAoMSkgewotCQlpbnQgcmV0OwotCisJd2hpbGUgKCFtYXhfc3ByaXRlX3dpZHRoICYmICFt YXhfc3ByaXRlX2hlaWdodCkgewogCQlzZXRfc3ByaXRlX3doKGRpc3BsYXksIHBpcGUsIHBhcm1z LCBzcHJpdGVfZmIsCiAJCQkgICAgICBhbHBoYSwgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0 KTsKIApAQCAtMjk1LDU0ICszMTgsNDkgQEAgcmV0cnk6CiAJCXJldCA9IGlndF9kaXNwbGF5X3Ry eV9jb21taXRfYXRvbWljKGRpc3BsYXksIERSTV9NT0RFX0FUT01JQ19URVNUX09OTFkgfCBEUk1f TU9ERV9BVE9NSUNfQUxMT1dfTU9ERVNFVCwgTlVMTCk7CiAJCWlndF9hc3NlcnQoIWlzX2F0b21p Y19jaGVja19mYWlsdXJlX2Vycm5vKHJldCkpOwogCi0JCWlmIChpc19hdG9taWNfY2hlY2tfcGxh bmVfc2l6ZV9lcnJubyhyZXQpKSB7Ci0JCQlpZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0 aCAmJgotCQkJICAgIGN1cnNvcl9oZWlnaHQgPT0gc3ByaXRlX2hlaWdodCkgewotCQkJCWlndF9h c3NlcnRfZihhbHBoYSwKLQkJCQkJICAgICAgIkNhbm5vdCBjb25maWd1cmUgdGhlIHRlc3Qgd2l0 aCBhbGwgc3ByaXRlIHBsYW5lcyBlbmFibGVkXG4iKTsKLQotCQkJCS8qIHJldHJ5IG9uY2Ugd2l0 aCBYUkdCIGZvcm1hdC4gKi8KLQkJCQlhbHBoYSA9IGZhbHNlOwotCQkJCWdvdG8gcmV0cnk7Ci0J CQl9Ci0KLQkJCXNwcml0ZV93aWR0aCA9IHByZXZfdzsKLQkJCXNwcml0ZV9oZWlnaHQgPSBwcmV2 X2g7Ci0KLQkJCWlmIChtYXhfc3ByaXRlX3dpZHRoICYmIG1heF9zcHJpdGVfaGVpZ2h0KSB7Ci0J CQkJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBwaXBlLCBwYXJtcywgc3ByaXRlX2ZiLAotCQkJCQkg ICAgICBhbHBoYSwgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0KTsKLQkJCQlicmVhazsKLQkJ CX0KLQotCQkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKQotCQkJCW1heF9zcHJpdGVfd2lkdGggPSB0 cnVlOwotCQkJZWxzZQotCQkJCW1heF9zcHJpdGVfaGVpZ2h0ID0gdHJ1ZTsKLQkJfSBlbHNlIHsK KwkJaWYgKCFpc19hdG9taWNfY2hlY2tfcGxhbmVfc2l6ZV9lcnJubyhyZXQpKSB7CiAJCQlwcmV2 X3cgPSBzcHJpdGVfd2lkdGg7CiAJCQlwcmV2X2ggPSBzcHJpdGVfaGVpZ2h0OwotCQl9Ci0KLQkJ aWYgKCFtYXhfc3ByaXRlX3dpZHRoKSB7Ci0JCQlzcHJpdGVfd2lkdGggKj0gMjsKLQorICAgIAor CQkJc3ByaXRlX3dpZHRoICo9IG1heF9zcHJpdGVfd2lkdGggPyAxIDogMjsKIAkJCWlmIChzcHJp dGVfd2lkdGggPj0gbW9kZS0+aGRpc3BsYXkpIHsKIAkJCQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1 ZTsKLQogCQkJCXNwcml0ZV93aWR0aCA9IG1vZGUtPmhkaXNwbGF5OwogCQkJfQotCQl9IGVsc2Ug aWYgKCFtYXhfc3ByaXRlX2hlaWdodCkgewotCQkJc3ByaXRlX2hlaWdodCAqPSAyOwogCisJCQlz cHJpdGVfaGVpZ2h0ICo9IG1heF9zcHJpdGVfaGVpZ2h0ID8gMSA6IDI7CiAJCQlpZiAoc3ByaXRl X2hlaWdodCA+PSBtb2RlLT52ZGlzcGxheSkgewogCQkJCW1heF9zcHJpdGVfaGVpZ2h0ID0gdHJ1 ZTsKLQogCQkJCXNwcml0ZV9oZWlnaHQgPSBtb2RlLT52ZGlzcGxheTsKIAkJCX0KLQkJfSBlbHNl Ci0JCQkvKiBNYXggc2l6ZWQgc3ByaXRlcyBmb3IgYWxsISAqLwotCQkJYnJlYWs7CisJCQljb250 aW51ZTsKKwkJfQorCisJCWlmIChjdXJzb3Jfd2lkdGggPT0gc3ByaXRlX3dpZHRoICYmCisJCSAg ICBjdXJzb3JfaGVpZ2h0ID09IHNwcml0ZV9oZWlnaHQpIHsKKwkJCWlndF9hc3NlcnRfZihyZXRy aWVzID4gMCwKKwkJCQkgICAgICAiQ2Fubm90IGNvbmZpZ3VyZSB0aGUgdGVzdCB3aXRoIGFsbCBz cHJpdGUgcGxhbmVzIGVuYWJsZWRcbiIpOworCQkJLS1yZXRyaWVzOworCQkJLyogcmV0cnkgb25j ZSB3aXRoIFhSR0IgZm9ybWF0LiAqLworCQkJaWYgKGFscGhhKSB7CisJCQkJYWxwaGEgPSBmYWxz ZTsKKwkJCQlpZ3Rfd2FybigiUmVtb3ZlZCBhbHBoYVxuIik7CisJCQl9CisJCQllbHNlIHsKKwkJ CQlpZ3RfYXNzZXJ0X2Yobl9wbGFuZXMgPiAxLCAiTm8gcGxhbmVzIGxlZnQgdG8gcHJvY2VlZCB3 aXRoISIpOworCQkJCW5fcGxhbmVzLS07CisJCQkJaWd0X3dhcm4oIlJlZHVjZWQgYXZhaWxhYmxl IHBsYW5lcyB0byAlZFxuIiwgbl9wbGFuZXMpOworCQkJfQorCQkJZ290byByZXRyeTsKKwkJfQor CisJCXNwcml0ZV93aWR0aCA9IHByZXZfdzsKKwkJc3ByaXRlX2hlaWdodCA9IHByZXZfaDsKKwor CQlpZiAoIW1heF9zcHJpdGVfd2lkdGgpCisJCQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1ZTsKKwkJ ZWxzZQorCQkJbWF4X3Nwcml0ZV9oZWlnaHQgPSB0cnVlOwogCX0KIAogCWlndF9pbmZvKCJSdW5u aW5nIHRlc3Qgb24gcGlwZSAlcyB3aXRoIHJlc29sdXRpb24gJWR4JWQgYW5kIHNwcml0ZSBzaXpl ICVkeCVkIGFscGhhICVpXG4iLApAQCAtNDYzLDcgKzQ4MSw2IEBAIHJ1bl90cmFuc2l0aW9uX3Rl c3QoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsIGlndF9vdXRwdXRfdCAq b3V0cHV0CiAKIAlpZiAoZmxhZ3MgJiBEUk1fTU9ERV9BVE9NSUNfQUxMT1dfTU9ERVNFVCkgewog CQlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dCwgUElQRV9OT05FKTsKLQogCQlpZ3RfZGlzcGxh eV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCiAJCWlndF9vdXRwdXRfc2V0X3Bp cGUob3V0cHV0LCBwaXBlKTsKQEAgLTUyNSw4ICs1NDIsMTAgQEAgcnVuX3RyYW5zaXRpb25fdGVz dChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwgaWd0X291dHB1dF90ICpv dXRwdXQKIAkJfQogCiAJCS8qIGZvcmNlIHBsYW5lcyB0byBiZSBwYXJ0IG9mIGNvbW1pdCAqLwot CQlmb3JfZWFjaF9wbGFuZV9vbl9waXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKQotCQkJaWd0X3Bs YW5lX3NldF9wb3NpdGlvbihwbGFuZSwgMCwgMCk7CisJCWZvcl9lYWNoX3BsYW5lX29uX3BpcGUo ZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKKwkJCWlmIChwYXJtc1twbGFuZS0+aW5kZXhdLm1hc2sp CisJCQkJaWd0X3BsYW5lX3NldF9wb3NpdGlvbihwbGFuZSwgMCwgMCk7CisJCX0KIAogCQlpZ3Rf ZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCi0tIAoyLjE3LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmlndC1kZXYgbWFp bGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaWd0LWRldg==