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 BE6F06E8DD for ; Wed, 3 Apr 2019 12:45:44 +0000 (UTC) From: Stanislav Lisovskiy Date: Wed, 3 Apr 2019 15:45:25 +0300 Message-Id: <20190403124525.17055-3-stanislav.lisovskiy@intel.com> In-Reply-To: <20190403124525.17055-1-stanislav.lisovskiy@intel.com> References: <20190403124525.17055-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 b3BlZnVsbHkpLiBTdG9wcGVkIHVzaW5nIGdsb2JhbCBuX3BsYW5lcwogICAgdmFyaWFibGUgYXMg aXQgbWlnaHQgY2F1c2UgcmVzb3VyY2VzIGJlaW5nIHVucmVsZWFzZWQuCiAgICBVc2luZyBub3cg cGFybXNbaV0ubWFzayBhcyBhIHdheSB0byBkZXRlcm1pbmUgaWYgcGxhbmUKICAgIGhhcyB0byBi ZSBpbmNsdWRlZCBpbnRvIGNvbW1pdC4KClNpZ25lZC1vZmYtYnk6IFN0YW5pc2xhdiBMaXNvdnNr aXkgPHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29tPgotLS0KIHRlc3RzL2ttc19hdG9taWNf dHJhbnNpdGlvbi5jIHwgMTA1ICsrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA1NCBpbnNlcnRpb25zKCspLCA1MSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYyBiL3Rlc3RzL2ttc19hdG9taWNfdHJh bnNpdGlvbi5jCmluZGV4IDYzOGZlMTdlLi5lZTA3ODgwZSAxMDA2NDQKLS0tIGEvdGVzdHMva21z X2F0b21pY190cmFuc2l0aW9uLmMKKysrIGIvdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMK QEAgLTIxNCw3ICsyMTQsOSBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlzcGxheV90 ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAl1aW50MzJfdCBuX3BsYW5lcyA9IGRpc3BsYXkt PnBpcGVzW3BpcGVdLm5fcGxhbmVzOwogCXVpbnQzMl90IG5fb3ZlcmxheXMgPSAwLCBvdmVybGF5 c1tuX3BsYW5lc107CiAJaWd0X3BsYW5lX3QgKnBsYW5lOwotCXVpbnQzMl90IGl0ZXJfbWFzayA9 IDM7CisJdWludDMyX3QgaXRlcl9tYXNrOworCWludCByZXRyaWVzID0gbl9wbGFuZXMgLSAxOwor CWludCByZXQgPSAwOwogCiAJZG9fb3JfZGllKGRybUdldENhcChkaXNwbGF5LT5kcm1fZmQsIERS TV9DQVBfQ1VSU09SX1dJRFRILCAmY3Vyc29yX3dpZHRoKSk7CiAJaWYgKGN1cnNvcl93aWR0aCA+ PSBtb2RlLT5oZGlzcGxheSkKQEAgLTIyNCw2ICsyMjYsMTAgQEAgc3RhdGljIHZvaWQgc2V0dXBf cGFybXMoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJaWYgKGN1cnNv cl9oZWlnaHQgPj0gbW9kZS0+dmRpc3BsYXkpCiAJCWN1cnNvcl9oZWlnaHQgPSBtb2RlLT52ZGlz cGxheTsKIAorcmV0cnk6CisJbl9vdmVybGF5cyA9IDA7CisJaXRlcl9tYXNrID0gMzsKKwogCWZv cl9lYWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKIAkJaW50IGkgPSBw bGFuZS0+aW5kZXg7CiAKQEAgLTIzOCwxMiArMjQ0LDE2IEBAIHN0YXRpYyB2b2lkIHNldHVwX3Bh cm1zKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLAogCQkJcGFybXNbaV0u aGVpZ2h0ID0gY3Vyc29yX2hlaWdodDsKIAkJCXBhcm1zW2ldLm1hc2sgPSAxIDw8IDE7CiAJCX0g ZWxzZSB7Ci0JCQlwYXJtc1tpXS5mYiA9IHNwcml0ZV9mYjsKLQkJCXBhcm1zW2ldLm1hc2sgPSAx IDw8IDI7Ci0KLQkJCWl0ZXJfbWFzayB8PSAxIDw8IDI7Ci0KLQkJCW92ZXJsYXlzW25fb3Zlcmxh eXMrK10gPSBpOworCQkJaWYgKG5fb3ZlcmxheXMgPCAobl9wbGFuZXMgLSAyKSkgeworCQkJCXBh cm1zW2ldLmZiID0gc3ByaXRlX2ZiOworCQkJCXBhcm1zW2ldLm1hc2sgPSAxIDw8IDI7CisJCQkJ aXRlcl9tYXNrIHw9IDEgPDwgMjsKKwkJCQlvdmVybGF5c1tuX292ZXJsYXlzKytdID0gaTsKKwkJ CX0KKwkJCWVsc2UgeworCQkJCXBhcm1zW2ldLmZiID0gTlVMTDsKKwkJCQlwYXJtc1tpXS5tYXNr ID0gMDsKKwkJCX0KIAkJfQogCX0KIApAQCAtMjc4LDE2ICsyODgsMTMgQEAgc3RhdGljIHZvaWQg c2V0dXBfcGFybXMoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsCiAJICog UHJlIGdlbjkgbm90IGFsbCBzaXplcyBhcmUgc3VwcG9ydGVkLCBmaW5kIHRoZSBiaWdnZXN0IHBv c3NpYmxlCiAJICogc2l6ZSB0aGF0IGNhbiBiZSBlbmFibGVkIG9uIGFsbCBzcHJpdGUgcGxhbmVz LgogCSAqLwotcmV0cnk6CiAJcHJldl93ID0gc3ByaXRlX3dpZHRoID0gY3Vyc29yX3dpZHRoOwog CXByZXZfaCA9IHNwcml0ZV9oZWlnaHQgPSBjdXJzb3JfaGVpZ2h0OwogCiAJbWF4X3Nwcml0ZV93 aWR0aCA9IChzcHJpdGVfd2lkdGggPT0gbW9kZS0+aGRpc3BsYXkpOwogCW1heF9zcHJpdGVfaGVp Z2h0ID0gKHNwcml0ZV9oZWlnaHQgPT0gbW9kZS0+dmRpc3BsYXkpOwogCi0Jd2hpbGUgKDEpIHsK LQkJaW50IHJldDsKLQorCXdoaWxlICghbWF4X3Nwcml0ZV93aWR0aCAmJiAhbWF4X3Nwcml0ZV9o ZWlnaHQpIHsKIAkJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBwaXBlLCBwYXJtcywgc3ByaXRlX2Zi LAogCQkJICAgICAgYWxwaGEsIHNwcml0ZV93aWR0aCwgc3ByaXRlX2hlaWdodCk7CiAKQEAgLTI5 NSw1NCArMzAyLDQ5IEBAIHJldHJ5OgogCQlyZXQgPSBpZ3RfZGlzcGxheV90cnlfY29tbWl0X2F0 b21pYyhkaXNwbGF5LCBEUk1fTU9ERV9BVE9NSUNfVEVTVF9PTkxZIHwgRFJNX01PREVfQVRPTUlD X0FMTE9XX01PREVTRVQsIE5VTEwpOwogCQlpZ3RfYXNzZXJ0KCFpc19hdG9taWNfY2hlY2tfZmFp bHVyZV9lcnJubyhyZXQpKTsKIAotCQlpZiAoaXNfYXRvbWljX2NoZWNrX3BsYW5lX3NpemVfZXJy bm8ocmV0KSkgewotCQkJaWYgKGN1cnNvcl93aWR0aCA9PSBzcHJpdGVfd2lkdGggJiYKLQkJCSAg ICBjdXJzb3JfaGVpZ2h0ID09IHNwcml0ZV9oZWlnaHQpIHsKLQkJCQlpZ3RfYXNzZXJ0X2YoYWxw aGEsCi0JCQkJCSAgICAgICJDYW5ub3QgY29uZmlndXJlIHRoZSB0ZXN0IHdpdGggYWxsIHNwcml0 ZSBwbGFuZXMgZW5hYmxlZFxuIik7Ci0KLQkJCQkvKiByZXRyeSBvbmNlIHdpdGggWFJHQiBmb3Jt YXQuICovCi0JCQkJYWxwaGEgPSBmYWxzZTsKLQkJCQlnb3RvIHJldHJ5OwotCQkJfQotCi0JCQlz cHJpdGVfd2lkdGggPSBwcmV2X3c7Ci0JCQlzcHJpdGVfaGVpZ2h0ID0gcHJldl9oOwotCi0JCQlp ZiAobWF4X3Nwcml0ZV93aWR0aCAmJiBtYXhfc3ByaXRlX2hlaWdodCkgewotCQkJCXNldF9zcHJp dGVfd2goZGlzcGxheSwgcGlwZSwgcGFybXMsIHNwcml0ZV9mYiwKLQkJCQkJICAgICAgYWxwaGEs IHNwcml0ZV93aWR0aCwgc3ByaXRlX2hlaWdodCk7Ci0JCQkJYnJlYWs7Ci0JCQl9Ci0KLQkJCWlm ICghbWF4X3Nwcml0ZV93aWR0aCkKLQkJCQltYXhfc3ByaXRlX3dpZHRoID0gdHJ1ZTsKLQkJCWVs c2UKLQkJCQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7Ci0JCX0gZWxzZSB7CisJCWlmICghaXNf YXRvbWljX2NoZWNrX3BsYW5lX3NpemVfZXJybm8ocmV0KSkgewogCQkJcHJldl93ID0gc3ByaXRl X3dpZHRoOwogCQkJcHJldl9oID0gc3ByaXRlX2hlaWdodDsKLQkJfQotCi0JCWlmICghbWF4X3Nw cml0ZV93aWR0aCkgewotCQkJc3ByaXRlX3dpZHRoICo9IDI7Ci0KKyAgICAKKwkJCXNwcml0ZV93 aWR0aCAqPSBtYXhfc3ByaXRlX3dpZHRoID8gMSA6IDI7CiAJCQlpZiAoc3ByaXRlX3dpZHRoID49 IG1vZGUtPmhkaXNwbGF5KSB7CiAJCQkJbWF4X3Nwcml0ZV93aWR0aCA9IHRydWU7Ci0KIAkJCQlz cHJpdGVfd2lkdGggPSBtb2RlLT5oZGlzcGxheTsKIAkJCX0KLQkJfSBlbHNlIGlmICghbWF4X3Nw cml0ZV9oZWlnaHQpIHsKLQkJCXNwcml0ZV9oZWlnaHQgKj0gMjsKIAorCQkJc3ByaXRlX2hlaWdo dCAqPSBtYXhfc3ByaXRlX2hlaWdodCA/IDEgOiAyOwogCQkJaWYgKHNwcml0ZV9oZWlnaHQgPj0g bW9kZS0+dmRpc3BsYXkpIHsKIAkJCQltYXhfc3ByaXRlX2hlaWdodCA9IHRydWU7Ci0KIAkJCQlz cHJpdGVfaGVpZ2h0ID0gbW9kZS0+dmRpc3BsYXk7CiAJCQl9Ci0JCX0gZWxzZQotCQkJLyogTWF4 IHNpemVkIHNwcml0ZXMgZm9yIGFsbCEgKi8KLQkJCWJyZWFrOworCQkJY29udGludWU7CisJCX0K KworCQlpZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0aCAmJgorCQkgICAgY3Vyc29yX2hl aWdodCA9PSBzcHJpdGVfaGVpZ2h0KSB7CisJCQlpZ3RfYXNzZXJ0X2YocmV0cmllcyA+IDAsCisJ CQkJICAgICAgIkNhbm5vdCBjb25maWd1cmUgdGhlIHRlc3Qgd2l0aCBhbGwgc3ByaXRlIHBsYW5l cyBlbmFibGVkXG4iKTsKKwkJCS0tcmV0cmllczsKKwkJCS8qIHJldHJ5IG9uY2Ugd2l0aCBYUkdC IGZvcm1hdC4gKi8KKwkJCWlmIChhbHBoYSkgeworCQkJCWFscGhhID0gZmFsc2U7CisJCQkJaWd0 X3dhcm4oIlJlbW92ZWQgYWxwaGFcbiIpOworCQkJfQorCQkJZWxzZSB7CisJCQkJaWd0X2Fzc2Vy dF9mKG5fcGxhbmVzID4gMSwgIk5vIHBsYW5lcyBsZWZ0IHRvIHByb2NlZWQgd2l0aCEiKTsKKwkJ CQluX3BsYW5lcy0tOworCQkJCWlndF93YXJuKCJSZWR1Y2VkIGF2YWlsYWJsZSBwbGFuZXMgdG8g JWRcbiIsIG5fcGxhbmVzKTsKKwkJCX0KKwkJCWdvdG8gcmV0cnk7CisJCX0KKworCQlzcHJpdGVf d2lkdGggPSBwcmV2X3c7CisJCXNwcml0ZV9oZWlnaHQgPSBwcmV2X2g7CisKKwkJaWYgKCFtYXhf c3ByaXRlX3dpZHRoKQorCQkJbWF4X3Nwcml0ZV93aWR0aCA9IHRydWU7CisJCWVsc2UKKwkJCW1h eF9zcHJpdGVfaGVpZ2h0ID0gdHJ1ZTsKIAl9CiAKIAlpZ3RfaW5mbygiUnVubmluZyB0ZXN0IG9u IHBpcGUgJXMgd2l0aCByZXNvbHV0aW9uICVkeCVkIGFuZCBzcHJpdGUgc2l6ZSAlZHglZCBhbHBo YSAlaVxuIiwKQEAgLTQ2Myw3ICs0NjUsNiBAQCBydW5fdHJhbnNpdGlvbl90ZXN0KGlndF9kaXNw bGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLCBpZ3Rfb3V0cHV0X3QgKm91dHB1dAogCiAJ aWYgKGZsYWdzICYgRFJNX01PREVfQVRPTUlDX0FMTE9XX01PREVTRVQpIHsKIAkJaWd0X291dHB1 dF9zZXRfcGlwZShvdXRwdXQsIFBJUEVfTk9ORSk7Ci0KIAkJaWd0X2Rpc3BsYXlfY29tbWl0Mihk aXNwbGF5LCBDT01NSVRfQVRPTUlDKTsKIAogCQlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1dCwg cGlwZSk7CkBAIC01MjUsOCArNTI2LDEwIEBAIHJ1bl90cmFuc2l0aW9uX3Rlc3QoaWd0X2Rpc3Bs YXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsIGlndF9vdXRwdXRfdCAqb3V0cHV0CiAJCX0K IAogCQkvKiBmb3JjZSBwbGFuZXMgdG8gYmUgcGFydCBvZiBjb21taXQgKi8KLQkJZm9yX2VhY2hf cGxhbmVfb25fcGlwZShkaXNwbGF5LCBwaXBlLCBwbGFuZSkKLQkJCWlndF9wbGFuZV9zZXRfcG9z aXRpb24ocGxhbmUsIDAsIDApOworCQlmb3JfZWFjaF9wbGFuZV9vbl9waXBlKGRpc3BsYXksIHBp cGUsIHBsYW5lKSB7CisJCQlpZiAocGFybXNbcGxhbmUtPmluZGV4XS5tYXNrKQorCQkJCWlndF9w bGFuZV9zZXRfcG9zaXRpb24ocGxhbmUsIDAsIDApOworCQl9CiAKIAkJaWd0X2Rpc3BsYXlfY29t bWl0MihkaXNwbGF5LCBDT01NSVRfQVRPTUlDKTsKIAotLSAKMi4xNy4xCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwppZ3QtZGV2IG1haWxpbmcgbGlzdApp Z3QtZGV2QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2lndC1kZXY=