From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [PATCH i-g-t 3/4] tests/chamelium: Only initialize igt_display once Date: Thu, 16 Nov 2017 13:45:21 +0100 Message-ID: <20171116124522.4673-3-maarten.lankhorst@linux.intel.com> References: <20171116124522.4673-1-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mblankhorst.nl (mblankhorst.nl [IPv6:2a02:2308::216:3eff:fe92:dfa3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4981D6E7CB for ; Thu, 16 Nov 2017 12:45:28 +0000 (UTC) In-Reply-To: <20171116124522.4673-1-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org SW5zdGVhZCBvZiBmaXJzdCBjYWxsaW5nIGttc3Rlc3RfdW5zZXRfYWxsX2NydGNzLCBhbmQgY2Fs bGluZwppZ3RfZGlzcGxheV9pbml0IGZvciBlYWNoIHRlc3QsIHVzZSBpZ3RfZGlzcGxheV9yZXNl dCB0byByZXNldAppZ3RfZGlzcGxheSBiZXR3ZWVuIHRlc3RzLCBhbmQgdXNlIGF0b21pYyBjb21t aXQgdG8gZGlzYWJsZSBhbGwKdW51c2VkIGNydGNzIGluIGVuYWJsZV9vdXRwdXQoKS4KClNpZ25l ZC1vZmYtYnk6IE1hYXJ0ZW4gTGFua2hvcnN0IDxtYWFydGVuLmxhbmtob3JzdEBsaW51eC5pbnRl bC5jb20+Ci0tLQogdGVzdHMvY2hhbWVsaXVtLmMgfCA0NSArKysrKysrKysrKystLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCsp LCAzMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9jaGFtZWxpdW0uYyBiL3Rlc3Rz L2NoYW1lbGl1bS5jCmluZGV4IGQ0YTE4NWU3Njg3My4uODg1NWE4MzAwMDQ5IDEwMDY0NAotLS0g YS90ZXN0cy9jaGFtZWxpdW0uYworKysgYi90ZXN0cy9jaGFtZWxpdW0uYwpAQCAtMzMsNiArMzMs NyBAQAogdHlwZWRlZiBzdHJ1Y3QgewogCXN0cnVjdCBjaGFtZWxpdW0gKmNoYW1lbGl1bTsKIAlz dHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKipwb3J0czsKKwlpZ3RfZGlzcGxheV90IGRpc3BsYXk7CiAJ aW50IHBvcnRfY291bnQ7CiAKIAlpbnQgZHJtX2ZkOwpAQCAtNDA5LDkgKzQxMCw5IEBAIHRlc3Rf c3VzcGVuZF9yZXN1bWVfZWRpZF9jaGFuZ2UoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVt X3BvcnQgKnBvcnQsCiAKIHN0YXRpYyBpZ3Rfb3V0cHV0X3QgKgogcHJlcGFyZV9vdXRwdXQoZGF0 YV90ICpkYXRhLAotCSAgICAgICBpZ3RfZGlzcGxheV90ICpkaXNwbGF5LAogCSAgICAgICBzdHJ1 Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQpCiB7CisJaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSA9ICZk YXRhLT5kaXNwbGF5OwogCWlndF9vdXRwdXRfdCAqb3V0cHV0OwogCWRybU1vZGVSZXMgKnJlczsK IAlkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3IgPQpAQCAtNDIwLDcgKzQyMSw2IEBAIHByZXBh cmVfb3V0cHV0KGRhdGFfdCAqZGF0YSwKIAlib29sIGZvdW5kID0gZmFsc2U7CiAKIAlpZ3RfYXNz ZXJ0KHJlcyA9IGRybU1vZGVHZXRSZXNvdXJjZXMoZGF0YS0+ZHJtX2ZkKSk7Ci0Ja21zdGVzdF91 bnNldF9hbGxfY3J0Y3MoZGF0YS0+ZHJtX2ZkLCByZXMpOwogCiAJLyogVGhlIGNoYW1lbGl1bSdz IGRlZmF1bHQgRURJRCBoYXMgYSBsb3Qgb2YgcmVzb2x1dGlvbnMsIHdheSBtb3JlIHRoZW4KIAkg KiB3ZSBuZWVkIHRvIHRlc3QKQEAgLTQzMCwxMSArNDMwLDkgQEAgcHJlcGFyZV9vdXRwdXQoZGF0 YV90ICpkYXRhLAogCWNoYW1lbGl1bV9wbHVnKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCk7CiAJd2Fp dF9mb3JfY29ubmVjdG9yKGRhdGEsIHBvcnQsIERSTV9NT0RFX0NPTk5FQ1RFRCk7CiAKLQlpZ3Rf ZGlzcGxheV9pbml0KGRpc3BsYXksIGRhdGEtPmRybV9mZCk7Ci0Jb3V0cHV0ID0gaWd0X291dHB1 dF9mcm9tX2Nvbm5lY3RvcihkaXNwbGF5LCBjb25uZWN0b3IpOworCWlndF9kaXNwbGF5X3Jlc2V0 KGRpc3BsYXkpOwogCi0JaWd0X2Fzc2VydChrbXN0ZXN0X3Byb2JlX2Nvbm5lY3Rvcl9jb25maWco Ci0JCWRhdGEtPmRybV9mZCwgY29ubmVjdG9yLT5jb25uZWN0b3JfaWQsIH4wLCAmb3V0cHV0LT5j b25maWcpKTsKKwlvdXRwdXQgPSBpZ3Rfb3V0cHV0X2Zyb21fY29ubmVjdG9yKGRpc3BsYXksIGNv bm5lY3Rvcik7CiAKIAlmb3JfZWFjaF9waXBlKGRpc3BsYXksIHBpcGUpIHsKIAkJaWYgKCFpZ3Rf cGlwZV9jb25uZWN0b3JfdmFsaWQocGlwZSwgb3V0cHV0KSkKQEAgLTQ3Nyw3ICs0NzUsNyBAQCBl bmFibGVfb3V0cHV0KGRhdGFfdCAqZGF0YSwKIAlpZ3RfcGlwZV9vYmpfcmVwbGFjZV9wcm9wX2Js b2IocHJpbWFyeS0+cGlwZSwgSUdUX0NSVENfR0FNTUFfTFVULCBOVUxMLCAwKTsKIAlpZ3RfcGlw ZV9vYmpfcmVwbGFjZV9wcm9wX2Jsb2IocHJpbWFyeS0+cGlwZSwgSUdUX0NSVENfQ1RNLCBOVUxM LCAwKTsKIAotCWlndF9kaXNwbGF5X2NvbW1pdChkaXNwbGF5KTsKKwlpZ3RfZGlzcGxheV9jb21t aXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwogCiAJaWYgKGNoYW1lbGl1bV9wb3J0X2dldF90 eXBlKHBvcnQpID09IERSTV9NT0RFX0NPTk5FQ1RPUl9WR0EpCiAJCXVzbGVlcCgyNTAwMDApOwpA QCAtNDg1LDI1ICs0ODMsMTAgQEAgZW5hYmxlX291dHB1dChkYXRhX3QgKmRhdGEsCiAJZHJtTW9k ZUZyZWVDb25uZWN0b3IoY29ubmVjdG9yKTsKIH0KIAotc3RhdGljIHZvaWQKLWRpc2FibGVfb3V0 cHV0KGRhdGFfdCAqZGF0YSwKLQkgICAgICAgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0LAot CSAgICAgICBpZ3Rfb3V0cHV0X3QgKm91dHB1dCkKLXsKLQlpZ3RfZGlzcGxheV90ICpkaXNwbGF5 ID0gb3V0cHV0LT5kaXNwbGF5OwotCWlndF9wbGFuZV90ICpwcmltYXJ5ID0gaWd0X291dHB1dF9n ZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwotCWlndF9hc3Nl cnQocHJpbWFyeSk7Ci0KLQkvKiBEaXNhYmxlIHRoZSBkaXNwbGF5ICovCi0JaWd0X3BsYW5lX3Nl dF9mYihwcmltYXJ5LCBOVUxMKTsKLQlpZ3RfZGlzcGxheV9jb21taXQoZGlzcGxheSk7Ci19Ci0K IHN0YXRpYyB2b2lkCiB0ZXN0X2Rpc3BsYXlfY3JjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1l bGl1bV9wb3J0ICpwb3J0LCBpbnQgY291bnQsCiAJCSBib29sIGZhc3QpCiB7Ci0JaWd0X2Rpc3Bs YXlfdCBkaXNwbGF5OwogCWlndF9vdXRwdXRfdCAqb3V0cHV0OwogCWlndF9wbGFuZV90ICpwcmlt YXJ5OwogCWlndF9jcmNfdCAqY3JjOwpAQCAtNTE3LDcgKzUwMCw3IEBAIHRlc3RfZGlzcGxheV9j cmMoZGF0YV90ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQsIGludCBjb3VudCwK IAogCXJlc2V0X3N0YXRlKGRhdGEsIHBvcnQpOwogCi0Jb3V0cHV0ID0gcHJlcGFyZV9vdXRwdXQo ZGF0YSwgJmRpc3BsYXksIHBvcnQpOworCW91dHB1dCA9IHByZXBhcmVfb3V0cHV0KGRhdGEsIHBv cnQpOwogCWNvbm5lY3RvciA9IGNoYW1lbGl1bV9wb3J0X2dldF9jb25uZWN0b3IoZGF0YS0+Y2hh bWVsaXVtLCBwb3J0LCBmYWxzZSk7CiAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5 cGUob3V0cHV0LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKIAlpZ3RfYXNzZXJ0KHByaW1hcnkp OwpAQCAtNTYxLDE4ICs1NDQsMTUgQEAgdGVzdF9kaXNwbGF5X2NyYyhkYXRhX3QgKmRhdGEsIHN0 cnVjdCBjaGFtZWxpdW1fcG9ydCAqcG9ydCwgaW50IGNvdW50LAogCQlmcmVlKGV4cGVjdGVkX2Ny Yyk7CiAJCWZyZWUoY3JjKTsKIAotCQlkaXNhYmxlX291dHB1dChkYXRhLCBwb3J0LCBvdXRwdXQp OwogCQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmRybV9mZCwgJmZiKTsKIAl9CiAKIAlkcm1Nb2RlRnJl ZUNvbm5lY3Rvcihjb25uZWN0b3IpOwotCWlndF9kaXNwbGF5X2ZpbmkoJmRpc3BsYXkpOwogfQog CiBzdGF0aWMgdm9pZAogdGVzdF9kaXNwbGF5X2ZyYW1lX2R1bXAoZGF0YV90ICpkYXRhLCBzdHJ1 Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQpCiB7Ci0JaWd0X2Rpc3BsYXlfdCBkaXNwbGF5OwogCWln dF9vdXRwdXRfdCAqb3V0cHV0OwogCWlndF9wbGFuZV90ICpwcmltYXJ5OwogCXN0cnVjdCBpZ3Rf ZmIgZmI7CkBAIC01ODMsNyArNTYzLDcgQEAgdGVzdF9kaXNwbGF5X2ZyYW1lX2R1bXAoZGF0YV90 ICpkYXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQpCiAKIAlyZXNldF9zdGF0ZShkYXRh LCBwb3J0KTsKIAotCW91dHB1dCA9IHByZXBhcmVfb3V0cHV0KGRhdGEsICZkaXNwbGF5LCBwb3J0 KTsKKwlvdXRwdXQgPSBwcmVwYXJlX291dHB1dChkYXRhLCBwb3J0KTsKIAljb25uZWN0b3IgPSBj aGFtZWxpdW1fcG9ydF9nZXRfY29ubmVjdG9yKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwgZmFsc2Up OwogCXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5F X1RZUEVfUFJJTUFSWSk7CiAJaWd0X2Fzc2VydChwcmltYXJ5KTsKQEAgLTYwOCwxOCArNTg4LDE1 IEBAIHRlc3RfZGlzcGxheV9mcmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1 bV9wb3J0ICpwb3J0KQogCQkJY2hhbWVsaXVtX2Rlc3Ryb3lfZnJhbWVfZHVtcChmcmFtZSk7CiAJ CX0KIAotCQlkaXNhYmxlX291dHB1dChkYXRhLCBwb3J0LCBvdXRwdXQpOwogCQlpZ3RfcmVtb3Zl X2ZiKGRhdGEtPmRybV9mZCwgJmZiKTsKIAl9CiAKIAlkcm1Nb2RlRnJlZUNvbm5lY3Rvcihjb25u ZWN0b3IpOwotCWlndF9kaXNwbGF5X2ZpbmkoJmRpc3BsYXkpOwogfQogCiBzdGF0aWMgdm9pZAog dGVzdF9hbmFsb2dfZnJhbWVfZHVtcChkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9y dCAqcG9ydCkKIHsKLQlpZ3RfZGlzcGxheV90IGRpc3BsYXk7CiAJaWd0X291dHB1dF90ICpvdXRw dXQ7CiAJaWd0X3BsYW5lX3QgKnByaW1hcnk7CiAJc3RydWN0IGlndF9mYiBmYjsKQEAgLTYzMSw3 ICs2MDgsNyBAQCB0ZXN0X2FuYWxvZ19mcmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNo YW1lbGl1bV9wb3J0ICpwb3J0KQogCiAJcmVzZXRfc3RhdGUoZGF0YSwgcG9ydCk7CiAKLQlvdXRw dXQgPSBwcmVwYXJlX291dHB1dChkYXRhLCAmZGlzcGxheSwgcG9ydCk7CisJb3V0cHV0ID0gcHJl cGFyZV9vdXRwdXQoZGF0YSwgcG9ydCk7CiAJY29ubmVjdG9yID0gY2hhbWVsaXVtX3BvcnRfZ2V0 X2Nvbm5lY3RvcihkYXRhLT5jaGFtZWxpdW0sIHBvcnQsIGZhbHNlKTsKIAlwcmltYXJ5ID0gaWd0 X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwog CWlndF9hc3NlcnQocHJpbWFyeSk7CkBAIC02NjYsMTIgKzY0MywxMCBAQCB0ZXN0X2FuYWxvZ19m cmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQogCiAJ CWNoYW1lbGl1bV9kZXN0cm95X2ZyYW1lX2R1bXAoZnJhbWUpOwogCi0JCWRpc2FibGVfb3V0cHV0 KGRhdGEsIHBvcnQsIG91dHB1dCk7CiAJCWlndF9yZW1vdmVfZmIoZGF0YS0+ZHJtX2ZkLCAmZmIp OwogCX0KIAogCWRybU1vZGVGcmVlQ29ubmVjdG9yKGNvbm5lY3Rvcik7Ci0JaWd0X2Rpc3BsYXlf ZmluaSgmZGlzcGxheSk7CiB9CiAKIHN0YXRpYyB2b2lkCkBAIC03NzMsNiArNzQ4LDkgQEAgaWd0 X21haW4KIAogCQkvKiBTbyBmYmNvbiBkb2Vzbid0IHRyeSB0byByZXByb2JlIHRoaW5ncyBpdHNl bGYgKi8KIAkJa21zdGVzdF9zZXRfdnRfZ3JhcGhpY3NfbW9kZSgpOworCisJCWlndF9kaXNwbGF5 X2luaXQoJmRhdGEuZGlzcGxheSwgZGF0YS5kcm1fZmQpOworCQlpZ3RfcmVxdWlyZShkYXRhLmRp c3BsYXkuaXNfYXRvbWljKTsKIAl9CiAKIAlpZ3Rfc3VidGVzdF9ncm91cCB7CkBAIC05NTIsNiAr OTMwLDcgQEAgaWd0X21haW4KIAl9CiAKIAlpZ3RfZml4dHVyZSB7CisJCWlndF9kaXNwbGF5X2Zp bmkoJmRhdGEuZGlzcGxheSk7CiAJCWNsb3NlKGRhdGEuZHJtX2ZkKTsKIAl9CiB9Ci0tIAoyLjE1 LjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVs LWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=