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 1AE7D6E289 for ; Wed, 27 Mar 2019 20:03:35 +0000 (UTC) From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 27 Mar 2019 13:03:30 -0700 Message-Id: <20190327200331.28602-7-jose.souza@intel.com> In-Reply-To: <20190327200331.28602-1-jose.souza@intel.com> References: <20190327200331.28602-1-jose.souza@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v2 7/8] tests/fbcon_fbt: Do not try to open the same driver twice as master List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 List-ID: SWYgYSBzdWJ0ZXN0IGZhaWwgYmVmb3JlIHRoZSB0ZWFyZG93bl9kcm0oKSBjYWxsIGl0IHdpbGwg a2VlcCB0aGUKZHJpdmVyIG9wZW4gYXMgbWFzdGVyIGNhdXNpbmcgdGhlIHRlc3QgdG8gZmFpbCB3 aGVuIHRyeWluZyB0byBvcGVuCnRoZSBkcml2ZXIgYWdhaW4gYXMgbWFzdGVyLCBzbyBsZXRzIHNo YXJlIHRoZSBkcm1faW5mbyBzdHJ1Y3QgYW5kCmNoZWNrIGlmIGRyaXZlciBpcyBhbHJlYWR5IG9w ZW4uCgpTdGFydGluZyBzdWJ0ZXN0OiBwc3IKKGttc19mYmNvbl9mYnQ6NTI3MCkgQ1JJVElDQUw6 IFRlc3QgYXNzZXJ0aW9uIGZhaWx1cmUgZnVuY3Rpb24gc3VidGVzdCwgZmlsZSAuLi90ZXN0cy9r bXNfZmJjb25fZmJ0LmM6MjU5Ogooa21zX2ZiY29uX2ZidDo1MjcwKSBDUklUSUNBTDogRmFpbGVk IGFzc2VydGlvbjogZmVhdHVyZS0+d2FpdF91bnRpbF91cGRhdGUoZHJtLmRlYnVnZnNfZmQpClN0 YWNrIHRyYWNlOgogICMwIC4uL2xpYi9pZ3RfY29yZS5jOjE0NzQgX19pZ3RfZmFpbF9hc3NlcnQo KQogICMxIC4uL3Rlc3RzL2ttc19mYmNvbl9mYnQuYzoyNjEgc3VidGVzdCgpCiAgIzIgLi4vdGVz dHMva21zX2ZiY29uX2ZidC5jOjMxNiBfX3JlYWxfbWFpbjMwOSgpCiAgIzMgLi4vdGVzdHMva21z X2ZiY29uX2ZidC5jOjMwOSBtYWluKCkKICAjNCAuLi9jc3UvbGliYy1zdGFydC5jOjMyNSBfX2xp YmNfc3RhcnRfbWFpbigpCiAgIzUgW19zdGFydCsweDI5XQogICM2IFs8dW5rbm93bj4rMHgwXQpT dWJ0ZXN0IHBzciBmYWlsZWQuCioqKiogREVCVUcgKioqKgooa21zX2ZiY29uX2ZidDo1MjcwKSBk cm10ZXN0LURFQlVHOiBUZXN0IHJlcXVpcmVtZW50IHBhc3NlZDogIShmZDwwKQooa21zX2ZiY29u X2ZidDo1MjcwKSBpZ3RfZGVidWdmcy1ERUJVRzogT3BlbmluZyBkZWJ1Z2ZzIGRpcmVjdG9yeSAn L3N5cy9rZXJuZWwvZGVidWcvZHJpLzEnCihrbXNfZmJjb25fZmJ0OjUyNzApIERFQlVHOiBUZXN0 IHJlcXVpcmVtZW50IHBhc3NlZDogZHJtLT5yZXMKKGttc19mYmNvbl9mYnQ6NTI3MCkgaWd0X2tt cy1ERUJVRzogVlQ6IGdyYXBoaWNzIG1vZGUgc2V0IChtb2RlIHdhcyAweDApCihrbXNfZmJjb25f ZmJ0OjUyNzApIERFQlVHOiBUZXN0IHJlcXVpcmVtZW50IHBhc3NlZDogZmVhdHVyZS0+c3VwcG9y dGVkX29uX2NoaXBzZXQoZHJtLmRlYnVnZnNfZmQpCihrbXNfZmJjb25fZmJ0OjUyNzApIENSSVRJ Q0FMOiBUZXN0IGFzc2VydGlvbiBmYWlsdXJlIGZ1bmN0aW9uIHN1YnRlc3QsIGZpbGUgLi4vdGVz dHMva21zX2ZiY29uX2ZidC5jOjI1OToKKGttc19mYmNvbl9mYnQ6NTI3MCkgQ1JJVElDQUw6IEZh aWxlZCBhc3NlcnRpb246IGZlYXR1cmUtPndhaXRfdW50aWxfdXBkYXRlKGRybS5kZWJ1Z2ZzX2Zk KQooa21zX2ZiY29uX2ZidDo1MjcwKSBpZ3RfY29yZS1JTkZPOiBTdGFjayB0cmFjZToKKGttc19m YmNvbl9mYnQ6NTI3MCkgaWd0X2NvcmUtSU5GTzogICAjMCAuLi9saWIvaWd0X2NvcmUuYzoxNDc0 IF9faWd0X2ZhaWxfYXNzZXJ0KCkKKGttc19mYmNvbl9mYnQ6NTI3MCkgaWd0X2NvcmUtSU5GTzog ICAjMSAuLi90ZXN0cy9rbXNfZmJjb25fZmJ0LmM6MjYxIHN1YnRlc3QoKQooa21zX2ZiY29uX2Zi dDo1MjcwKSBpZ3RfY29yZS1JTkZPOiAgICMyIC4uL3Rlc3RzL2ttc19mYmNvbl9mYnQuYzozMTYg X19yZWFsX21haW4zMDkoKQooa21zX2ZiY29uX2ZidDo1MjcwKSBpZ3RfY29yZS1JTkZPOiAgICMz IC4uL3Rlc3RzL2ttc19mYmNvbl9mYnQuYzozMDkgbWFpbigpCihrbXNfZmJjb25fZmJ0OjUyNzAp IGlndF9jb3JlLUlORk86ICAgIzQgLi4vY3N1L2xpYmMtc3RhcnQuYzozMjUgX19saWJjX3N0YXJ0 X21haW4oKQooa21zX2ZiY29uX2ZidDo1MjcwKSBpZ3RfY29yZS1JTkZPOiAgICM1IFtfc3RhcnQr MHgyOV0KKGttc19mYmNvbl9mYnQ6NTI3MCkgaWd0X2NvcmUtSU5GTzogICAjNiBbPHVua25vd24+ KzB4MF0KKioqKiAgRU5EICAqKioqClN1YnRlc3QgcHNyOiBGQUlMICgwLjg0NXMpClN0YXJ0aW5n IHN1YnRlc3Q6IGZiYy1zdXNwZW5kClRlc3QgcmVxdWlyZW1lbnQgbm90IG1ldCBpbiBmdW5jdGlv biBpZ3RfZGV2aWNlX3NldF9tYXN0ZXIsIGZpbGUgLi4vbGliL2lndF9kZXZpY2UuYzo1NToKVGVz dCByZXF1aXJlbWVudDogX19pZ3RfZGV2aWNlX3NldF9tYXN0ZXIoZmQpID09IDAKQ2FuJ3QgYmVj b21lIERSTSBtYXN0ZXIsIHBsZWFzZSBjaGVjayBpZiBubyBvdGhlciBEUk0gY2xpZW50IGlzIHJ1 bm5pbmcuClN1YnRlc3QgZmJjLXN1c3BlbmQ6IFNLSVAgKDAuMDAxcykKU3RhcnRpbmcgc3VidGVz dDogcHNyLXN1c3BlbmQKVGVzdCByZXF1aXJlbWVudCBub3QgbWV0IGluIGZ1bmN0aW9uIGlndF9k ZXZpY2Vfc2V0X21hc3RlciwgZmlsZSAuLi9saWIvaWd0X2RldmljZS5jOjU1OgpUZXN0IHJlcXVp cmVtZW50OiBfX2lndF9kZXZpY2Vfc2V0X21hc3RlcihmZCkgPT0gMApDYW4ndCBiZWNvbWUgRFJN IG1hc3RlciwgcGxlYXNlIGNoZWNrIGlmIG5vIG90aGVyIERSTSBjbGllbnQgaXMgcnVubmluZy4K U3VidGVzdCBwc3Itc3VzcGVuZDogU0tJUCAoMC4wMDBzKQoKU2lnbmVkLW9mZi1ieTogSm9zw6kg Um9iZXJ0byBkZSBTb3V6YSA8am9zZS5zb3V6YUBpbnRlbC5jb20+Ci0tLQogdGVzdHMva21zX2Zi Y29uX2ZidC5jIHwgNTUgKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t LQogMSBmaWxlIGNoYW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDIzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3Rlc3RzL2ttc19mYmNvbl9mYnQuYyBiL3Rlc3RzL2ttc19mYmNvbl9mYnQuYwpp bmRleCAyZjE1OGUyZi4uNjZmMjE0YzUgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19mYmNvbl9mYnQu YworKysgYi90ZXN0cy9rbXNfZmJjb25fZmJ0LmMKQEAgLTYwLDYgKzYwLDkgQEAgc3RhdGljIHZv aWQgc2V0dXBfZHJtKHN0cnVjdCBkcm1faW5mbyAqZHJtKQogewogCWludCBpOwogCisJaWYgKGRy bS0+ZmQgPj0gMCkKKwkJcmV0dXJuOworCiAJZHJtLT5mZCA9IGRybV9vcGVuX2RyaXZlcl9tYXN0 ZXIoRFJJVkVSX0lOVEVMKTsKIAlkcm0tPmRlYnVnZnNfZmQgPSBpZ3RfZGVidWdmc19kaXIoZHJt LT5mZCk7CiAKQEAgLTg1LDYgKzg4LDcgQEAgc3RhdGljIHZvaWQgdGVhcmRvd25fZHJtKHN0cnVj dCBkcm1faW5mbyAqZHJtKQogCiAJZHJtTW9kZUZyZWVSZXNvdXJjZXMoZHJtLT5yZXMpOwogCWln dF9hc3NlcnQoY2xvc2UoZHJtLT5mZCkgPT0gMCk7CisJZHJtLT5mZCA9IC0xOwogfQogCiBzdGF0 aWMgYm9vbCBmYmNfc3VwcG9ydGVkX29uX2NoaXBzZXQoaW50IGRlYnVnZnNfZmQpCkBAIC0yNDIs NTEgKzI0Niw1MCBAQCBzdHJ1Y3QgZmVhdHVyZSB7CiAJLmVuYWJsZSA9IHBzcl9kZWJ1Z2ZzX2Vu YWJsZSwKIH07CiAKLXN0YXRpYyB2b2lkIHN1YnRlc3Qoc3RydWN0IGZlYXR1cmUgKmZlYXR1cmUs IGJvb2wgc3VzcGVuZCkKK3N0YXRpYyB2b2lkIHN1YnRlc3Qoc3RydWN0IGRybV9pbmZvICpkcm0s IHN0cnVjdCBmZWF0dXJlICpmZWF0dXJlLCBib29sIHN1c3BlbmQpCiB7Ci0Jc3RydWN0IGRybV9p bmZvIGRybTsKIAlzdHJ1Y3QgaWd0X2ZiIGZiOwogCi0Jc2V0dXBfZHJtKCZkcm0pOworCXNldHVw X2RybShkcm0pOwogCi0JaWd0X3JlcXVpcmUoZmVhdHVyZS0+c3VwcG9ydGVkX29uX2NoaXBzZXQo ZHJtLmRlYnVnZnNfZmQpKTsKKwlpZ3RfcmVxdWlyZShmZWF0dXJlLT5zdXBwb3J0ZWRfb25fY2hp cHNldChkcm0tPmRlYnVnZnNfZmQpKTsKIAotCWRpc2FibGVfZmVhdHVyZXMoZHJtLmRlYnVnZnNf ZmQpOwotCWZlYXR1cmUtPmVuYWJsZShkcm0uZGVidWdmc19mZCk7CisJZGlzYWJsZV9mZWF0dXJl cyhkcm0tPmRlYnVnZnNfZmQpOworCWZlYXR1cmUtPmVuYWJsZShkcm0tPmRlYnVnZnNfZmQpOwog Ci0Ja21zdGVzdF91bnNldF9hbGxfY3J0Y3MoZHJtLmZkLCBkcm0ucmVzKTsKKwlrbXN0ZXN0X3Vu c2V0X2FsbF9jcnRjcyhkcm0tPmZkLCBkcm0tPnJlcyk7CiAJd2FpdF91c2VyKCJNb2RlcyB1bnNl dC4iKTsKLQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfdXBkYXRlKGRybS5kZWJ1Z2Zz X2ZkKSk7CisJaWd0X2Fzc2VydChmZWF0dXJlLT53YWl0X3VudGlsX3VwZGF0ZShkcm0tPmRlYnVn ZnNfZmQpKTsKIAotCXNldF9tb2RlX2Zvcl9vbmVfc2NyZWVuKCZkcm0sICZmYiwgZmVhdHVyZS0+ Y29ubmVjdG9yX3Bvc3NpYmxlX2ZuKTsKKwlzZXRfbW9kZV9mb3Jfb25lX3NjcmVlbihkcm0sICZm YiwgZmVhdHVyZS0+Y29ubmVjdG9yX3Bvc3NpYmxlX2ZuKTsKIAl3YWl0X3VzZXIoIlNjcmVlbiBz ZXQuIik7Ci0JaWd0X2Fzc2VydChmZWF0dXJlLT53YWl0X3VudGlsX2VuYWJsZWQoZHJtLmRlYnVn ZnNfZmQpKTsKKwlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxlZChkcm0tPmRl YnVnZnNfZmQpKTsKIAogCWlmIChzdXNwZW5kKSB7CiAJCWlndF9zeXN0ZW1fc3VzcGVuZF9hdXRv cmVzdW1lKFNVU1BFTkRfU1RBVEVfTUVNLAogCQkJCQkgICAgICBTVVNQRU5EX1RFU1RfTk9ORSk7 CiAJCXNsZWVwKDUpOwotCQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxlZChk cm0uZGVidWdmc19mZCkpOworCQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxl ZChkcm0tPmRlYnVnZnNfZmQpKTsKIAl9CiAKLQlpZ3RfcmVtb3ZlX2ZiKGRybS5mZCwgJmZiKTsK LQl0ZWFyZG93bl9kcm0oJmRybSk7CisJaWd0X3JlbW92ZV9mYihkcm0tPmZkLCAmZmIpOworCXRl YXJkb3duX2RybShkcm0pOwogCiAJLyogV2FpdCBmb3IgZmJjb24gdG8gcmVzdG9yZSBpdHNlbGYu ICovCiAJc2xlZXAoMyk7CiAKIAl3YWl0X3VzZXIoIkJhY2sgdG8gZmJjb24uIik7Ci0JaWd0X2Fz c2VydChmZWF0dXJlLT53YWl0X3VudGlsX3VwZGF0ZShkcm0uZGVidWdmc19mZCkpOworCWlndF9h c3NlcnQoZmVhdHVyZS0+d2FpdF91bnRpbF91cGRhdGUoZHJtLT5kZWJ1Z2ZzX2ZkKSk7CiAKIAlp ZiAoc3VzcGVuZCkgewogCQlpZ3Rfc3lzdGVtX3N1c3BlbmRfYXV0b3Jlc3VtZShTVVNQRU5EX1NU QVRFX01FTSwKIAkJCQkJICAgICAgU1VTUEVORF9URVNUX05PTkUpOwogCQlzbGVlcCg1KTsKLQkJ aWd0X2Fzc2VydChmZWF0dXJlLT53YWl0X3VudGlsX3VwZGF0ZShkcm0uZGVidWdmc19mZCkpOwor CQlpZ3RfYXNzZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfdXBkYXRlKGRybS0+ZGVidWdmc19mZCkp OwogCX0KIH0KIAotc3RhdGljIHZvaWQgc2V0dXBfZW52aXJvbm1lbnQodm9pZCkKK3N0YXRpYyB2 b2lkIHNldHVwX2Vudmlyb25tZW50KHN0cnVjdCBkcm1faW5mbyAqZHJtKQogewogCWludCBkcm1f ZmQ7CiAKQEAgLTMwMCwyNiArMzAzLDMyIEBAIHN0YXRpYyB2b2lkIHNldHVwX2Vudmlyb25tZW50 KHZvaWQpCiAJICovCiAJYmluZF9mYmNvbih0cnVlKTsKIAlmYmNvbl9ibGlua19lbmFibGUodHJ1 ZSk7CisKKwlkcm0tPmZkID0gLTE7CiB9CiAKLXN0YXRpYyB2b2lkIHRlYXJkb3duX2Vudmlyb25t ZW50KHZvaWQpCitzdGF0aWMgdm9pZCB0ZWFyZG93bl9lbnZpcm9ubWVudChzdHJ1Y3QgZHJtX2lu Zm8gKmRybSkKIHsKKwlpZiAoZHJtLT5mZCA+PSAwKQorCQl0ZWFyZG93bl9kcm0oZHJtKTsKIH0K IAogaWd0X21haW4KIHsKKwlzdHJ1Y3QgZHJtX2luZm8gZHJtID0ge307CisKIAlpZ3RfZml4dHVy ZQotCQlzZXR1cF9lbnZpcm9ubWVudCgpOworCQlzZXR1cF9lbnZpcm9ubWVudCgmZHJtKTsKIAog CWlndF9zdWJ0ZXN0KCJmYmMiKQotCQlzdWJ0ZXN0KCZmYmMsIGZhbHNlKTsKKwkJc3VidGVzdCgm ZHJtLCAmZmJjLCBmYWxzZSk7CiAJaWd0X3N1YnRlc3QoInBzciIpCi0JCXN1YnRlc3QoJnBzciwg ZmFsc2UpOworCQlzdWJ0ZXN0KCZkcm0sICZwc3IsIGZhbHNlKTsKIAlpZ3Rfc3VidGVzdCgiZmJj LXN1c3BlbmQiKQotCQlzdWJ0ZXN0KCZmYmMsIHRydWUpOworCQlzdWJ0ZXN0KCZkcm0sICZmYmMs IHRydWUpOwogCWlndF9zdWJ0ZXN0KCJwc3Itc3VzcGVuZCIpCi0JCXN1YnRlc3QoJnBzciwgdHJ1 ZSk7CisJCXN1YnRlc3QoJmRybSwgJnBzciwgdHJ1ZSk7CiAKIAlpZ3RfZml4dHVyZQotCQl0ZWFy ZG93bl9lbnZpcm9ubWVudCgpOworCQl0ZWFyZG93bl9lbnZpcm9ubWVudCgmZHJtKTsKIH0KLS0g CjIuMjEuMAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K aWd0LWRldiBtYWlsaW5nIGxpc3QKaWd0LWRldkBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pZ3QtZGV2