From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lyude Paul Subject: Re: [PATCH i-g-t 3/4] tests/chamelium: Only initialize igt_display once Date: Fri, 17 Nov 2017 19:05:37 -0500 Message-ID: <1510963537.22441.3.camel@redhat.com> References: <20171116124522.4673-1-maarten.lankhorst@linux.intel.com> <20171116124522.4673-3-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id C17EE6EAB9 for ; Sat, 18 Nov 2017 00:05:38 +0000 (UTC) In-Reply-To: <20171116124522.4673-3-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: Maarten Lankhorst , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org UmV2aWV3ZWQtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+CgpPbiBUaHUsIDIwMTct MTEtMTYgYXQgMTM6NDUgKzAxMDAsIE1hYXJ0ZW4gTGFua2hvcnN0IHdyb3RlOgo+IEluc3RlYWQg b2YgZmlyc3QgY2FsbGluZyBrbXN0ZXN0X3Vuc2V0X2FsbF9jcnRjcywgYW5kIGNhbGxpbmcKPiBp Z3RfZGlzcGxheV9pbml0IGZvciBlYWNoIHRlc3QsIHVzZSBpZ3RfZGlzcGxheV9yZXNldCB0byBy ZXNldAo+IGlndF9kaXNwbGF5IGJldHdlZW4gdGVzdHMsIGFuZCB1c2UgYXRvbWljIGNvbW1pdCB0 byBkaXNhYmxlIGFsbAo+IHVudXNlZCBjcnRjcyBpbiBlbmFibGVfb3V0cHV0KCkuCj4gCj4gU2ln bmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGxpbnV4Lmlu dGVsLmNvbT4KPiAtLS0KPiAgdGVzdHMvY2hhbWVsaXVtLmMgfCA0NSArKysrKysrKysrKystLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDEyIGluc2Vy dGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS90ZXN0cy9jaGFtZWxp dW0uYyBiL3Rlc3RzL2NoYW1lbGl1bS5jCj4gaW5kZXggZDRhMTg1ZTc2ODczLi44ODU1YTgzMDAw NDkgMTAwNjQ0Cj4gLS0tIGEvdGVzdHMvY2hhbWVsaXVtLmMKPiArKysgYi90ZXN0cy9jaGFtZWxp dW0uYwo+IEBAIC0zMyw2ICszMyw3IEBACj4gIHR5cGVkZWYgc3RydWN0IHsKPiAgCXN0cnVjdCBj aGFtZWxpdW0gKmNoYW1lbGl1bTsKPiAgCXN0cnVjdCBjaGFtZWxpdW1fcG9ydCAqKnBvcnRzOwo+ ICsJaWd0X2Rpc3BsYXlfdCBkaXNwbGF5Owo+ICAJaW50IHBvcnRfY291bnQ7Cj4gIAo+ICAJaW50 IGRybV9mZDsKPiBAQCAtNDA5LDkgKzQxMCw5IEBAIHRlc3Rfc3VzcGVuZF9yZXN1bWVfZWRpZF9j aGFuZ2UoZGF0YV90ICpkYXRhLCBzdHJ1Y3QKPiBjaGFtZWxpdW1fcG9ydCAqcG9ydCwKPiAgCj4g IHN0YXRpYyBpZ3Rfb3V0cHV0X3QgKgo+ICBwcmVwYXJlX291dHB1dChkYXRhX3QgKmRhdGEsCj4g LQkgICAgICAgaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwKPiAgCSAgICAgICBzdHJ1Y3QgY2hhbWVs aXVtX3BvcnQgKnBvcnQpCj4gIHsKPiArCWlndF9kaXNwbGF5X3QgKmRpc3BsYXkgPSAmZGF0YS0+ ZGlzcGxheTsKPiAgCWlndF9vdXRwdXRfdCAqb3V0cHV0Owo+ICAJZHJtTW9kZVJlcyAqcmVzOwo+ ICAJZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yID0KPiBAQCAtNDIwLDcgKzQyMSw2IEBAIHBy ZXBhcmVfb3V0cHV0KGRhdGFfdCAqZGF0YSwKPiAgCWJvb2wgZm91bmQgPSBmYWxzZTsKPiAgCj4g IAlpZ3RfYXNzZXJ0KHJlcyA9IGRybU1vZGVHZXRSZXNvdXJjZXMoZGF0YS0+ZHJtX2ZkKSk7Cj4g LQlrbXN0ZXN0X3Vuc2V0X2FsbF9jcnRjcyhkYXRhLT5kcm1fZmQsIHJlcyk7Cj4gIAo+ICAJLyog VGhlIGNoYW1lbGl1bSdzIGRlZmF1bHQgRURJRCBoYXMgYSBsb3Qgb2YgcmVzb2x1dGlvbnMsIHdh eSBtb3JlCj4gdGhlbgo+ICAJICogd2UgbmVlZCB0byB0ZXN0Cj4gQEAgLTQzMCwxMSArNDMwLDkg QEAgcHJlcGFyZV9vdXRwdXQoZGF0YV90ICpkYXRhLAo+ICAJY2hhbWVsaXVtX3BsdWcoZGF0YS0+ Y2hhbWVsaXVtLCBwb3J0KTsKPiAgCXdhaXRfZm9yX2Nvbm5lY3RvcihkYXRhLCBwb3J0LCBEUk1f TU9ERV9DT05ORUNURUQpOwo+ICAKPiAtCWlndF9kaXNwbGF5X2luaXQoZGlzcGxheSwgZGF0YS0+ ZHJtX2ZkKTsKPiAtCW91dHB1dCA9IGlndF9vdXRwdXRfZnJvbV9jb25uZWN0b3IoZGlzcGxheSwg Y29ubmVjdG9yKTsKPiArCWlndF9kaXNwbGF5X3Jlc2V0KGRpc3BsYXkpOwo+ICAKPiAtCWlndF9h c3NlcnQoa21zdGVzdF9wcm9iZV9jb25uZWN0b3JfY29uZmlnKAo+IC0JCWRhdGEtPmRybV9mZCwg Y29ubmVjdG9yLT5jb25uZWN0b3JfaWQsIH4wLCAmb3V0cHV0LQo+ID5jb25maWcpKTsKPiArCW91 dHB1dCA9IGlndF9vdXRwdXRfZnJvbV9jb25uZWN0b3IoZGlzcGxheSwgY29ubmVjdG9yKTsKPiAg Cj4gIAlmb3JfZWFjaF9waXBlKGRpc3BsYXksIHBpcGUpIHsKPiAgCQlpZiAoIWlndF9waXBlX2Nv bm5lY3Rvcl92YWxpZChwaXBlLCBvdXRwdXQpKQo+IEBAIC00NzcsNyArNDc1LDcgQEAgZW5hYmxl X291dHB1dChkYXRhX3QgKmRhdGEsCj4gIAlpZ3RfcGlwZV9vYmpfcmVwbGFjZV9wcm9wX2Jsb2Io cHJpbWFyeS0+cGlwZSwgSUdUX0NSVENfR0FNTUFfTFVULAo+IE5VTEwsIDApOwo+ICAJaWd0X3Bp cGVfb2JqX3JlcGxhY2VfcHJvcF9ibG9iKHByaW1hcnktPnBpcGUsIElHVF9DUlRDX0NUTSwgTlVM TCwKPiAwKTsKPiAgCj4gLQlpZ3RfZGlzcGxheV9jb21taXQoZGlzcGxheSk7Cj4gKwlpZ3RfZGlz cGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9BVE9NSUMpOwo+ICAKPiAgCWlmIChjaGFtZWxp dW1fcG9ydF9nZXRfdHlwZShwb3J0KSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfVkdBKQo+ICAJCXVz bGVlcCgyNTAwMDApOwo+IEBAIC00ODUsMjUgKzQ4MywxMCBAQCBlbmFibGVfb3V0cHV0KGRhdGFf dCAqZGF0YSwKPiAgCWRybU1vZGVGcmVlQ29ubmVjdG9yKGNvbm5lY3Rvcik7Cj4gIH0KPiAgCj4g LXN0YXRpYyB2b2lkCj4gLWRpc2FibGVfb3V0cHV0KGRhdGFfdCAqZGF0YSwKPiAtCSAgICAgICBz dHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQsCj4gLQkgICAgICAgaWd0X291dHB1dF90ICpvdXRw dXQpCj4gLXsKPiAtCWlndF9kaXNwbGF5X3QgKmRpc3BsYXkgPSBvdXRwdXQtPmRpc3BsYXk7Cj4g LQlpZ3RfcGxhbmVfdCAqcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUob3V0cHV0 LAo+IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwo+IC0JaWd0X2Fzc2VydChwcmltYXJ5KTsKPiAt Cj4gLQkvKiBEaXNhYmxlIHRoZSBkaXNwbGF5ICovCj4gLQlpZ3RfcGxhbmVfc2V0X2ZiKHByaW1h cnksIE5VTEwpOwo+IC0JaWd0X2Rpc3BsYXlfY29tbWl0KGRpc3BsYXkpOwo+IC19Cj4gLQo+ICBz dGF0aWMgdm9pZAo+ICB0ZXN0X2Rpc3BsYXlfY3JjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1l bGl1bV9wb3J0ICpwb3J0LCBpbnQgY291bnQsCj4gIAkJIGJvb2wgZmFzdCkKPiAgewo+IC0JaWd0 X2Rpc3BsYXlfdCBkaXNwbGF5Owo+ICAJaWd0X291dHB1dF90ICpvdXRwdXQ7Cj4gIAlpZ3RfcGxh bmVfdCAqcHJpbWFyeTsKPiAgCWlndF9jcmNfdCAqY3JjOwo+IEBAIC01MTcsNyArNTAwLDcgQEAg dGVzdF9kaXNwbGF5X2NyYyhkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1fcG9ydAo+ICpw b3J0LCBpbnQgY291bnQsCj4gIAo+ICAJcmVzZXRfc3RhdGUoZGF0YSwgcG9ydCk7Cj4gIAo+IC0J b3V0cHV0ID0gcHJlcGFyZV9vdXRwdXQoZGF0YSwgJmRpc3BsYXksIHBvcnQpOwo+ICsJb3V0cHV0 ID0gcHJlcGFyZV9vdXRwdXQoZGF0YSwgcG9ydCk7Cj4gIAljb25uZWN0b3IgPSBjaGFtZWxpdW1f cG9ydF9nZXRfY29ubmVjdG9yKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwKPiBmYWxzZSk7Cj4gIAlw cmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShvdXRwdXQsCj4gRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWSk7Cj4gIAlpZ3RfYXNzZXJ0KHByaW1hcnkpOwo+IEBAIC01NjEsMTggKzU0NCwx NSBAQCB0ZXN0X2Rpc3BsYXlfY3JjKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0 Cj4gKnBvcnQsIGludCBjb3VudCwKPiAgCQlmcmVlKGV4cGVjdGVkX2NyYyk7Cj4gIAkJZnJlZShj cmMpOwo+ICAKPiAtCQlkaXNhYmxlX291dHB1dChkYXRhLCBwb3J0LCBvdXRwdXQpOwo+ICAJCWln dF9yZW1vdmVfZmIoZGF0YS0+ZHJtX2ZkLCAmZmIpOwo+ICAJfQo+ICAKPiAgCWRybU1vZGVGcmVl Q29ubmVjdG9yKGNvbm5lY3Rvcik7Cj4gLQlpZ3RfZGlzcGxheV9maW5pKCZkaXNwbGF5KTsKPiAg fQo+ICAKPiAgc3RhdGljIHZvaWQKPiAgdGVzdF9kaXNwbGF5X2ZyYW1lX2R1bXAoZGF0YV90ICpk YXRhLCBzdHJ1Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQpCj4gIHsKPiAtCWlndF9kaXNwbGF5X3Qg ZGlzcGxheTsKPiAgCWlndF9vdXRwdXRfdCAqb3V0cHV0Owo+ICAJaWd0X3BsYW5lX3QgKnByaW1h cnk7Cj4gIAlzdHJ1Y3QgaWd0X2ZiIGZiOwo+IEBAIC01ODMsNyArNTYzLDcgQEAgdGVzdF9kaXNw bGF5X2ZyYW1lX2R1bXAoZGF0YV90ICpkYXRhLCBzdHJ1Y3QKPiBjaGFtZWxpdW1fcG9ydCAqcG9y dCkKPiAgCj4gIAlyZXNldF9zdGF0ZShkYXRhLCBwb3J0KTsKPiAgCj4gLQlvdXRwdXQgPSBwcmVw YXJlX291dHB1dChkYXRhLCAmZGlzcGxheSwgcG9ydCk7Cj4gKwlvdXRwdXQgPSBwcmVwYXJlX291 dHB1dChkYXRhLCBwb3J0KTsKPiAgCWNvbm5lY3RvciA9IGNoYW1lbGl1bV9wb3J0X2dldF9jb25u ZWN0b3IoZGF0YS0+Y2hhbWVsaXVtLCBwb3J0LAo+IGZhbHNlKTsKPiAgCXByaW1hcnkgPSBpZ3Rf b3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwKPiBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsK PiAgCWlndF9hc3NlcnQocHJpbWFyeSk7Cj4gQEAgLTYwOCwxOCArNTg4LDE1IEBAIHRlc3RfZGlz cGxheV9mcmFtZV9kdW1wKGRhdGFfdCAqZGF0YSwgc3RydWN0Cj4gY2hhbWVsaXVtX3BvcnQgKnBv cnQpCj4gIAkJCWNoYW1lbGl1bV9kZXN0cm95X2ZyYW1lX2R1bXAoZnJhbWUpOwo+ICAJCX0KPiAg Cj4gLQkJZGlzYWJsZV9vdXRwdXQoZGF0YSwgcG9ydCwgb3V0cHV0KTsKPiAgCQlpZ3RfcmVtb3Zl X2ZiKGRhdGEtPmRybV9mZCwgJmZiKTsKPiAgCX0KPiAgCj4gIAlkcm1Nb2RlRnJlZUNvbm5lY3Rv cihjb25uZWN0b3IpOwo+IC0JaWd0X2Rpc3BsYXlfZmluaSgmZGlzcGxheSk7Cj4gIH0KPiAgCj4g IHN0YXRpYyB2b2lkCj4gIHRlc3RfYW5hbG9nX2ZyYW1lX2R1bXAoZGF0YV90ICpkYXRhLCBzdHJ1 Y3QgY2hhbWVsaXVtX3BvcnQgKnBvcnQpCj4gIHsKPiAtCWlndF9kaXNwbGF5X3QgZGlzcGxheTsK PiAgCWlndF9vdXRwdXRfdCAqb3V0cHV0Owo+ICAJaWd0X3BsYW5lX3QgKnByaW1hcnk7Cj4gIAlz dHJ1Y3QgaWd0X2ZiIGZiOwo+IEBAIC02MzEsNyArNjA4LDcgQEAgdGVzdF9hbmFsb2dfZnJhbWVf ZHVtcChkYXRhX3QgKmRhdGEsIHN0cnVjdAo+IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQo+ICAKPiAg CXJlc2V0X3N0YXRlKGRhdGEsIHBvcnQpOwo+ICAKPiAtCW91dHB1dCA9IHByZXBhcmVfb3V0cHV0 KGRhdGEsICZkaXNwbGF5LCBwb3J0KTsKPiArCW91dHB1dCA9IHByZXBhcmVfb3V0cHV0KGRhdGEs IHBvcnQpOwo+ICAJY29ubmVjdG9yID0gY2hhbWVsaXVtX3BvcnRfZ2V0X2Nvbm5lY3RvcihkYXRh LT5jaGFtZWxpdW0sIHBvcnQsCj4gZmFsc2UpOwo+ICAJcHJpbWFyeSA9IGlndF9vdXRwdXRfZ2V0 X3BsYW5lX3R5cGUob3V0cHV0LAo+IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOwo+ICAJaWd0X2Fz c2VydChwcmltYXJ5KTsKPiBAQCAtNjY2LDEyICs2NDMsMTAgQEAgdGVzdF9hbmFsb2dfZnJhbWVf ZHVtcChkYXRhX3QgKmRhdGEsIHN0cnVjdAo+IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQo+ICAKPiAg CQljaGFtZWxpdW1fZGVzdHJveV9mcmFtZV9kdW1wKGZyYW1lKTsKPiAgCj4gLQkJZGlzYWJsZV9v dXRwdXQoZGF0YSwgcG9ydCwgb3V0cHV0KTsKPiAgCQlpZ3RfcmVtb3ZlX2ZiKGRhdGEtPmRybV9m ZCwgJmZiKTsKPiAgCX0KPiAgCj4gIAlkcm1Nb2RlRnJlZUNvbm5lY3Rvcihjb25uZWN0b3IpOwo+ IC0JaWd0X2Rpc3BsYXlfZmluaSgmZGlzcGxheSk7Cj4gIH0KPiAgCj4gIHN0YXRpYyB2b2lkCj4g QEAgLTc3Myw2ICs3NDgsOSBAQCBpZ3RfbWFpbgo+ICAKPiAgCQkvKiBTbyBmYmNvbiBkb2Vzbid0 IHRyeSB0byByZXByb2JlIHRoaW5ncyBpdHNlbGYgKi8KPiAgCQlrbXN0ZXN0X3NldF92dF9ncmFw aGljc19tb2RlKCk7Cj4gKwo+ICsJCWlndF9kaXNwbGF5X2luaXQoJmRhdGEuZGlzcGxheSwgZGF0 YS5kcm1fZmQpOwo+ICsJCWlndF9yZXF1aXJlKGRhdGEuZGlzcGxheS5pc19hdG9taWMpOwo+ICAJ fQo+ICAKPiAgCWlndF9zdWJ0ZXN0X2dyb3VwIHsKPiBAQCAtOTUyLDYgKzkzMCw3IEBAIGlndF9t YWluCj4gIAl9Cj4gIAo+ICAJaWd0X2ZpeHR1cmUgewo+ICsJCWlndF9kaXNwbGF5X2ZpbmkoJmRh dGEuZGlzcGxheSk7Cj4gIAkJY2xvc2UoZGF0YS5kcm1fZmQpOwo+ICAJfQo+ICB9Cl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=