From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8161A6E6A6 for ; Mon, 1 Apr 2019 11:23:30 +0000 (UTC) From: Stanislav Lisovskiy Date: Mon, 1 Apr 2019 14:23:05 +0300 Message-Id: <20190401112305.6832-4-stanislav.lisovskiy@intel.com> In-Reply-To: <20190401112305.6832-1-stanislav.lisovskiy@intel.com> References: <20190401112305.6832-1-stanislav.lisovskiy@intel.com> Subject: [igt-dev] [PATCH i-g-t v3 3/3] igt/tests/kms_atomic_transition: Remove redundant code 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: UmVtb3ZlZCBleGNlc3NpdmUgbmVzdGVkIGNvbmRpdGlvbnMsIG1ha2luZyBjb2RlIGEgYml0Cm1v cmUgcmVhZGFibGUoaG9wZWZ1bGx5KS4KClNpZ25lZC1vZmYtYnk6IFN0YW5pc2xhdiBMaXNvdnNr aXkgPHN0YW5pc2xhdi5saXNvdnNraXlAaW50ZWwuY29tPgotLS0KIHRlc3RzL2ttc19hdG9taWNf dHJhbnNpdGlvbi5jIHwgODYgKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCA1MCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS90ZXN0cy9rbXNfYXRvbWljX3RyYW5zaXRpb24uYyBiL3Rlc3RzL2ttc19hdG9taWNfdHJh bnNpdGlvbi5jCmluZGV4IGU0ZGVlN2UyLi4xNzU1NDZkZCAxMDA2NDQKLS0tIGEvdGVzdHMva21z X2F0b21pY190cmFuc2l0aW9uLmMKKysrIGIvdGVzdHMva21zX2F0b21pY190cmFuc2l0aW9uLmMK QEAgLTIxNiw2ICsyMTYsNyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9wYXJtcyhpZ3RfZGlzcGxheV90 ICpkaXNwbGF5LCBlbnVtIHBpcGUgcGlwZSwKIAlpZ3RfcGxhbmVfdCAqcGxhbmU7CiAJdWludDMy X3QgaXRlcl9tYXNrOwogCWludCByZXRyaWVzID0gbl9wbGFuZXMgLSAxOworCWludCByZXQgPSAw OwogCiAJZG9fb3JfZGllKGRybUdldENhcChkaXNwbGF5LT5kcm1fZmQsIERSTV9DQVBfQ1VSU09S X1dJRFRILCAmY3Vyc29yX3dpZHRoKSk7CiAJaWYgKGN1cnNvcl93aWR0aCA+PSBtb2RlLT5oZGlz cGxheSkKQEAgLTI4OSw5ICsyOTAsNyBAQCByZXRyeToKIAltYXhfc3ByaXRlX3dpZHRoID0gKHNw cml0ZV93aWR0aCA9PSBtb2RlLT5oZGlzcGxheSk7CiAJbWF4X3Nwcml0ZV9oZWlnaHQgPSAoc3By aXRlX2hlaWdodCA9PSBtb2RlLT52ZGlzcGxheSk7CiAKLQl3aGlsZSAoMSkgewotCQlpbnQgcmV0 OwotCisJd2hpbGUgKCFtYXhfc3ByaXRlX3dpZHRoICYmICFtYXhfc3ByaXRlX2hlaWdodCkgewog CQlzZXRfc3ByaXRlX3doKGRpc3BsYXksIHBpcGUsIHBhcm1zLCBzcHJpdGVfZmIsCiAJCQkgICAg ICBhbHBoYSwgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0KTsKIApAQCAtMjk5LDY0ICsyOTgs NTEgQEAgcmV0cnk6CiAJCXJldCA9IGlndF9kaXNwbGF5X3RyeV9jb21taXRfYXRvbWljKGRpc3Bs YXksIERSTV9NT0RFX0FUT01JQ19URVNUX09OTFkgfCBEUk1fTU9ERV9BVE9NSUNfQUxMT1dfTU9E RVNFVCwgTlVMTCk7CiAJCWlndF9hc3NlcnQoIWlzX2F0b21pY19jaGVja19mYWlsdXJlX2Vycm5v KHJldCkpOwogCi0JCWlmIChpc19hdG9taWNfY2hlY2tfcGxhbmVfc2l6ZV9lcnJubyhyZXQpKSB7 Ci0JCQlpZiAoY3Vyc29yX3dpZHRoID09IHNwcml0ZV93aWR0aCAmJgotCQkJICAgIGN1cnNvcl9o ZWlnaHQgPT0gc3ByaXRlX2hlaWdodCkgewotCQkJCWlmICgtLXJldHJpZXMgPj0gMCkgewotCQkJ CQkvKiByZXRyeSBvbmNlIHdpdGggWFJHQiBmb3JtYXQuICovCi0JCQkJCWlmIChhbHBoYSkgewot CQkJCQkJYWxwaGEgPSBmYWxzZTsKLQkJCQkJfQotCQkJCQllbHNlIGlmIChkaXNwbGF5LT5waXBl c1twaXBlXS5uX3BsYW5lcyA+IDApIHsKLQkJCQkJCWRpc3BsYXktPnBpcGVzW3BpcGVdLm5fcGxh bmVzLS07Ci0JCQkJCQlpZ3Rfd2FybigiUmVkdWNlZCBhdmFpbGFibGUgcGxhbmVzIHRvICVkXG4i LAotCQkJCQkJCSAgICBkaXNwbGF5LT5waXBlc1twaXBlXS5uX3BsYW5lcyk7Ci0JCQkJCX0KLQkJ CQkJbl9wbGFuZXMgPSBkaXNwbGF5LT5waXBlc1twaXBlXS5uX3BsYW5lczsKLQkJCQkJaWd0X2Fz c2VydF9mKG5fcGxhbmVzID4gMCwgIk5vIHBsYW5lcyBsZWZ0IHRvIHByb2NlZWQgd2l0aCEiKTsK LQkJCQkJZ290byByZXRyeTsKLQkJCQl9Ci0JCQkJaWd0X2Fzc2VydF9mKHJldHJpZXMgPiAwLAot CQkJCSAgICAgICJDYW5ub3QgY29uZmlndXJlIHRoZSB0ZXN0IHdpdGggYWxsIHNwcml0ZSBwbGFu ZXMgZW5hYmxlZFxuIik7Ci0JCQl9Ci0KLQkJCXNwcml0ZV93aWR0aCA9IHByZXZfdzsKLQkJCXNw cml0ZV9oZWlnaHQgPSBwcmV2X2g7Ci0KLQkJCWlmIChtYXhfc3ByaXRlX3dpZHRoICYmIG1heF9z cHJpdGVfaGVpZ2h0KSB7Ci0JCQkJc2V0X3Nwcml0ZV93aChkaXNwbGF5LCBwaXBlLCBwYXJtcywg c3ByaXRlX2ZiLAotCQkJCQkgICAgICBhbHBoYSwgc3ByaXRlX3dpZHRoLCBzcHJpdGVfaGVpZ2h0 KTsKLQkJCQlicmVhazsKLQkJCX0KLQotCQkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKQotCQkJCW1h eF9zcHJpdGVfd2lkdGggPSB0cnVlOwotCQkJZWxzZQotCQkJCW1heF9zcHJpdGVfaGVpZ2h0ID0g dHJ1ZTsKLQkJfSBlbHNlIHsKKwkJaWYgKCFpc19hdG9taWNfY2hlY2tfcGxhbmVfc2l6ZV9lcnJu byhyZXQpKSB7CiAJCQlwcmV2X3cgPSBzcHJpdGVfd2lkdGg7CiAJCQlwcmV2X2ggPSBzcHJpdGVf aGVpZ2h0OwotCQl9Ci0KLQkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKSB7Ci0JCQlzcHJpdGVfd2lk dGggKj0gMjsKLQorICAgIAorCQkJc3ByaXRlX3dpZHRoICo9IG1heF9zcHJpdGVfd2lkdGggPyAx IDogMjsKIAkJCWlmIChzcHJpdGVfd2lkdGggPj0gbW9kZS0+aGRpc3BsYXkpIHsKIAkJCQltYXhf c3ByaXRlX3dpZHRoID0gdHJ1ZTsKLQogCQkJCXNwcml0ZV93aWR0aCA9IG1vZGUtPmhkaXNwbGF5 OwogCQkJfQotCQl9IGVsc2UgaWYgKCFtYXhfc3ByaXRlX2hlaWdodCkgewotCQkJc3ByaXRlX2hl aWdodCAqPSAyOwogCisJCQlzcHJpdGVfaGVpZ2h0ICo9IG1heF9zcHJpdGVfaGVpZ2h0ID8gMSA6 IDI7CiAJCQlpZiAoc3ByaXRlX2hlaWdodCA+PSBtb2RlLT52ZGlzcGxheSkgewogCQkJCW1heF9z cHJpdGVfaGVpZ2h0ID0gdHJ1ZTsKLQogCQkJCXNwcml0ZV9oZWlnaHQgPSBtb2RlLT52ZGlzcGxh eTsKIAkJCX0KLQkJfSBlbHNlCi0JCQkvKiBNYXggc2l6ZWQgc3ByaXRlcyBmb3IgYWxsISAqLwot CQkJYnJlYWs7CisJCQljb250aW51ZTsKKwkJfQorCisJCWlmIChjdXJzb3Jfd2lkdGggPT0gc3By aXRlX3dpZHRoICYmCisJCSAgICBjdXJzb3JfaGVpZ2h0ID09IHNwcml0ZV9oZWlnaHQpIHsKKwkJ CWlndF9hc3NlcnRfZihyZXRyaWVzID4gMCwKKwkJCQkgICAgICAiQ2Fubm90IGNvbmZpZ3VyZSB0 aGUgdGVzdCB3aXRoIGFsbCBzcHJpdGUgcGxhbmVzIGVuYWJsZWRcbiIpOworCQkJLS1yZXRyaWVz OworCQkJLyogcmV0cnkgb25jZSB3aXRoIFhSR0IgZm9ybWF0LiAqLworCQkJaWYgKGFscGhhKSB7 CisJCQkJYWxwaGEgPSBmYWxzZTsKKwkJCX0KKwkJCWVsc2UgeworCQkJCWlndF9hc3NlcnRfZihu X3BsYW5lcyA+IDEsICJObyBwbGFuZXMgbGVmdCB0byBwcm9jZWVkIHdpdGghIik7CisKKwkJCQlk aXNwbGF5LT5waXBlc1twaXBlXS5uX3BsYW5lcy0tOworCQkJCW5fcGxhbmVzID0gZGlzcGxheS0+ cGlwZXNbcGlwZV0ubl9wbGFuZXM7CisJCQkJaWd0X3dhcm4oIlJlZHVjZWQgYXZhaWxhYmxlIHBs YW5lcyB0byAlZFxuIiwKKwkJCQkJICAgIGRpc3BsYXktPnBpcGVzW3BpcGVdLm5fcGxhbmVzKTsK KwkJCX0KKwkJCWdvdG8gcmV0cnk7CisJCX0KKworCQlzcHJpdGVfd2lkdGggPSBwcmV2X3c7CisJ CXNwcml0ZV9oZWlnaHQgPSBwcmV2X2g7CisKKwkJaWYgKCFtYXhfc3ByaXRlX3dpZHRoKQorCQkJ bWF4X3Nwcml0ZV93aWR0aCA9IHRydWU7CisJCWVsc2UKKwkJCW1heF9zcHJpdGVfaGVpZ2h0ID0g dHJ1ZTsKIAl9CiAKIAlpZ3RfaW5mbygiUnVubmluZyB0ZXN0IG9uIHBpcGUgJXMgd2l0aCByZXNv bHV0aW9uICVkeCVkIGFuZCBzcHJpdGUgc2l6ZSAlZHglZCBhbHBoYSAlaVxuIiwKLS0gCjIuMTcu MQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KaWd0LWRl diBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2