From: Paul Kocialkowski Subject: [PATCH i-g-t v2] tests/chamelium: Detect analogue bridges and handle EDID accordingly Date: Wed, 12 Jul 2017 18:00:14 +0300 Message-ID: <20170712150014.3977-2-paul.kocialkowski@linux.intel.com> References: <20170706132753.4241-1-paul.kocialkowski@linux.intel.com> <20170712150014.3977-1-paul.kocialkowski@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id C615B6E015 for ; Wed, 12 Jul 2017 15:00:45 +0000 (UTC) In-Reply-To: <20170712150014.3977-1-paul.kocialkowski@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 Cc: Lyude List-Id: intel-gfx@lists.freedesktop.org Tm93YWRheXMsIG1hbnkgVkdBIGNvbm5lY3RvcnMgYXJlIG5vdCBhY3R1YWxseSBuYXRpdmUgVkdB IGJ1dCB1c2UgYQpkaXNjcmV0ZSBicmlkZ2UgdG8gYSBkaWdpdGFsIGNvbm5lY3Rvci4gVGhlc2Ug YnJpZGdlcyB1c3VhbGx5IGVuZm9yY2UKdGhlaXIgb3duIEVESUQgaW5zdGVhZCBvZiB0aGUgb25l IHN1cHBsaWVkIGJ5IHRoZSBjaGFtZWxpdW0uCgpUaHVzLCB0aGUgRURJRCByZWFkIHRlc3QgZm9y IFZHQSBpcyBub3QgcmVsZXZhbnQgaW4gdGhhdCBjYXNlIGFuZApzaG91bGQgYmUgc2tpcHBlZC4g UmVwb3J0ZWQgbW9kZXMgbWF5IGFsc28gZ28gYmV5b25kIHdoYXQgdGhlIGNoYW1lbGl1bQpjYW4g c3VwcG9ydC4gVGh1cywgb25seSBzdXBwb3J0ZWQgcmVzb2x1dGlvbnMgc2hvdWxkIGJlIHRlc3Rl ZCBmb3IgdGhlCmZyYW1lIGR1bXAgdGVzdCBhbmQgb3RoZXJzIHNob3VsZCBiZSBwcnVuZWQuCgpT aWduZWQtb2ZmLWJ5OiBQYXVsIEtvY2lhbGtvd3NraSA8cGF1bC5rb2NpYWxrb3dza2lAbGludXgu aW50ZWwuY29tPgotLS0KIHRlc3RzL2NoYW1lbGl1bS5jIHwgNzggKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDc4 IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS90ZXN0cy9jaGFtZWxpdW0uYyBiL3Rlc3RzL2No YW1lbGl1bS5jCmluZGV4IGJhYWE0MjRiLi40OTk2NzJlYiAxMDA2NDQKLS0tIGEvdGVzdHMvY2hh bWVsaXVtLmMKKysrIGIvdGVzdHMvY2hhbWVsaXVtLmMKQEAgLTEwNSw2ICsxMDUsNzYgQEAgd2Fp dF9mb3JfY29ubmVjdG9yKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0 LAogCWlndF9hc3NlcnQoZmluaXNoZWQpOwogfQogCitzdGF0aWMgaW50IGNoYW1lbGl1bV92Z2Ff bW9kZXNbXVsyXSA9IHsKKwl7IDE2MDAsIDEyMDAgfSwKKwl7IDE5MjAsIDEyMDAgfSwKKwl7IDE5 MjAsIDEwODAgfSwKKwl7IDE2ODAsIDEwNTAgfSwKKwl7IDEyODAsIDEwMjQgfSwKKwl7IDEyODAs IDk2MCB9LAorCXsgMTQ0MCwgOTAwIH0sCisJeyAxMjgwLCA4MDAgfSwKKwl7IDEwMjQsIDc2OCB9 LAorCXsgMTM2MCwgNzY4IH0sCisJeyAxMjgwLCA3MjAgfSwKKwl7IDgwMCwgNjAwIH0sCisJeyA2 NDAsIDQ4MCB9LAorCXsgLTEsIC0xIH0sCit9OworCitzdGF0aWMgYm9vbAorcHJ1bmVfdmdhX21v ZGUoZGF0YV90ICpkYXRhLCBkcm1Nb2RlTW9kZUluZm8gKm1vZGUpCit7CisJaW50IGkgPSAwOwor CisJd2hpbGUgKGNoYW1lbGl1bV92Z2FfbW9kZXNbaV1bMF0gIT0gLTEpIHsKKwkJaWYgKG1vZGUt PmhkaXNwbGF5ID09IGNoYW1lbGl1bV92Z2FfbW9kZXNbaV1bMF0gJiYKKwkJICAgIG1vZGUtPnZk aXNwbGF5ID09IGNoYW1lbGl1bV92Z2FfbW9kZXNbaV1bMV0pCisJCQlyZXR1cm4gZmFsc2U7CisK KwkJaSsrOworCX0KKworCXJldHVybiB0cnVlOworfQorCitzdGF0aWMgYm9vbAorY2hlY2tfYW5h bG9ndWVfYnJpZGdlKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQor eworCWRybU1vZGVQcm9wZXJ0eUJsb2JQdHIgZWRpZF9ibG9iID0gTlVMTDsKKwlkcm1Nb2RlQ29u bmVjdG9yICpjb25uZWN0b3IgPSBjaGFtZWxpdW1fcG9ydF9nZXRfY29ubmVjdG9yKAorCSAgICBk YXRhLT5jaGFtZWxpdW0sIHBvcnQsIGZhbHNlKTsKKwl1aW50NjRfdCBlZGlkX2Jsb2JfaWQ7CisJ dW5zaWduZWQgY2hhciAqZWRpZDsKKwljaGFyIGVkaWRfdmVuZG9yWzNdOworCisJaWYgKGNoYW1l bGl1bV9wb3J0X2dldF90eXBlKHBvcnQpICE9IERSTV9NT0RFX0NPTk5FQ1RPUl9WR0EpCisJCXJl dHVybiBmYWxzZTsKKworCWlndF9hc3NlcnQoa21zdGVzdF9nZXRfcHJvcGVydHkoZGF0YS0+ZHJt X2ZkLCBjb25uZWN0b3ItPmNvbm5lY3Rvcl9pZCwKKwkJCQkJRFJNX01PREVfT0JKRUNUX0NPTk5F Q1RPUiwgIkVESUQiLCBOVUxMLAorCQkJCQkmZWRpZF9ibG9iX2lkLCBOVUxMKSk7CisJaWd0X2Fz c2VydChlZGlkX2Jsb2IgPSBkcm1Nb2RlR2V0UHJvcGVydHlCbG9iKGRhdGEtPmRybV9mZCwKKwkJ CQkJCSAgICAgIGVkaWRfYmxvYl9pZCkpOworCisJZWRpZCA9ICh1bnNpZ25lZCBjaGFyICopIGVk aWRfYmxvYi0+ZGF0YTsKKworCWVkaWRfdmVuZG9yWzBdID0gKChlZGlkWzhdICYgMHg3YykgPj4g MikgKyAnQCc7CisJZWRpZF92ZW5kb3JbMV0gPSAoKChlZGlkWzhdICYgMHgwMykgPDwgMykgfAor CQkJICAoKGVkaWRbOV0gJiAweGUwKSA+PiA1KSkgKyAnQCc7CisJZWRpZF92ZW5kb3JbMl0gPSAo ZWRpZFs5XSAmIDB4MWYpICsgJ0AnOworCisJLyogQW5hbG9ndWUgYnJpZGdlcyBwcm92aWRlIHRo ZWlyIG93biBFRElEICovCisJaWYgKGVkaWRfdmVuZG9yWzBdICE9ICdJJyB8fCBlZGlkX3ZlbmRv clsxXSAhPSAnRycgfHwKKwkgICAgZWRpZF92ZW5kb3JbMF0gIT0gJ1QnKQorCQlyZXR1cm4gdHJ1 ZTsKKworCWRybU1vZGVGcmVlUHJvcGVydHlCbG9iKGVkaWRfYmxvYik7CisJZHJtTW9kZUZyZWVD b25uZWN0b3IoY29ubmVjdG9yKTsKKworCXJldHVybiBmYWxzZTsKK30KKwogc3RhdGljIHZvaWQK IHJlc2V0X3N0YXRlKGRhdGFfdCAqZGF0YSwgc3RydWN0IGNoYW1lbGl1bV9wb3J0ICpwb3J0KQog ewpAQCAtMTY4LDYgKzIzOCw4IEBAIHRlc3RfZWRpZF9yZWFkKGRhdGFfdCAqZGF0YSwgc3RydWN0 IGNoYW1lbGl1bV9wb3J0ICpwb3J0LAogCWNoYW1lbGl1bV9wbHVnKGRhdGEtPmNoYW1lbGl1bSwg cG9ydCk7CiAJd2FpdF9mb3JfY29ubmVjdG9yKGRhdGEsIHBvcnQsIERSTV9NT0RFX0NPTk5FQ1RF RCk7CiAKKwlpZ3Rfc2tpcF9vbihjaGVja19hbmFsb2d1ZV9icmlkZ2UoZGF0YSwgcG9ydCkpOwor CiAJaWd0X2Fzc2VydChrbXN0ZXN0X2dldF9wcm9wZXJ0eShkYXRhLT5kcm1fZmQsIGNvbm5lY3Rv ci0+Y29ubmVjdG9yX2lkLAogCQkJCQlEUk1fTU9ERV9PQkpFQ1RfQ09OTkVDVE9SLCAiRURJRCIs IE5VTEwsCiAJCQkJCSZlZGlkX2Jsb2JfaWQsIE5VTEwpKTsKQEAgLTUwNiwxNSArNTc4LDIxIEBA IHRlc3RfYW5hbG9ndWVfZnJhbWVfZHVtcChkYXRhX3QgKmRhdGEsIHN0cnVjdCBjaGFtZWxpdW1f cG9ydCAqcG9ydCkKIAlkcm1Nb2RlTW9kZUluZm8gKm1vZGU7CiAJZHJtTW9kZUNvbm5lY3RvciAq Y29ubmVjdG9yOwogCWludCBmYl9pZCwgaTsKKwlib29sIGJyaWRnZTsKIAogCW91dHB1dCA9IHBy ZXBhcmVfb3V0cHV0KGRhdGEsICZkaXNwbGF5LCBwb3J0KTsKIAljb25uZWN0b3IgPSBjaGFtZWxp dW1fcG9ydF9nZXRfY29ubmVjdG9yKGRhdGEtPmNoYW1lbGl1bSwgcG9ydCwgZmFsc2UpOwogCXBy aW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSk7CiAJaWd0X2Fzc2VydChwcmltYXJ5KTsKIAorCWJyaWRnZSA9IGNoZWNrX2FuYWxv Z3VlX2JyaWRnZShkYXRhLCBwb3J0KTsKKwogCWZvciAoaSA9IDA7IGkgPCBjb25uZWN0b3ItPmNv dW50X21vZGVzOyBpKyspIHsKIAkJbW9kZSA9ICZjb25uZWN0b3ItPm1vZGVzW2ldOwogCisJCWlm IChicmlkZ2UgJiYgcHJ1bmVfdmdhX21vZGUoZGF0YSwgbW9kZSkpCisJCQljb250aW51ZTsKKwog CQlmYl9pZCA9IGlndF9jcmVhdGVfY29sb3JfcGF0dGVybl9mYihkYXRhLT5kcm1fZmQsCiAJCQkJ CQkgICAgbW9kZS0+aGRpc3BsYXksIG1vZGUtPnZkaXNwbGF5LAogCQkJCQkJICAgIERSTV9GT1JN QVRfWFJHQjg4ODgsCi0tIAoyLjEzLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=