From mboxrd@z Thu Jan 1 00:00:00 1970 From: Micah Fedke Subject: [PATCH v2 4/5] lib/tests: make kmstest_get_pipe_from_crtc_id and igt_enable_connectors generic to prepare for platform agnostic tests Date: Tue, 11 Aug 2015 11:57:43 -0400 Message-ID: <55CA1B77.3080401@collabora.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [93.93.135.160]) by gabe.freedesktop.org (Postfix) with ESMTPS id 90A5E6E77C for ; Tue, 11 Aug 2015 08:57:48 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx , Daniel Vetter , chris@chris-wilson.co.uk, Daniel Stone List-Id: intel-gfx@lists.freedesktop.org ClRoZXJlIGlzIHNvbWUgbWlzY2VsbGFuZW91cyBwbHVtYmluZyB0byBkbyBpZiB3ZSBhcmUgZ29p bmcgdG8gaGF2ZSBhIHRlc3QgdGhhdApydW5zIG9uIGFsbCBwbGF0Zm9ybXMuICBpbnRlbCBhbmQg ZXh5bm9zIGFyZSB0aGUgY3VycmVudCB0YXJnZXRzLiAgVGhlIHRlc3Qgd2UKYXJlIGFpbWluZyB0 byBzdXBwb3J0IGlzIGRybV9yZWFkLiAgVGhlcmUgaXMgbXVjaCBpbnRlbC1zcGVjaWZpYyBjb2Rl CnRocm91Z2hvdXQgdGhlIHN1cHBvcnQgbGlicmFyeSwgc28gYW55b25lIGF0dGVtcHRpbmcgdG8g bWFrZSBvdGhlciB0ZXN0cwpwbGF0Zm9ybSBhZ25vc3RpYyB3aWxsIHJ1biBpbnRvIG1vcmUgb2Yg dGhpcyB0eXBlIG9mIHRoaW5nLgoKa21zdGVzdF9nZXRfY29ubmVjdG9yX2NvbmZpZygpIGlzc3Vl cyBhbiBpbnRlbC1zcGVjaWZpYyBpb2N0bCB2aWEKa21zdGVzdF9nZXRfcGlwZV9mcm9tX2NydGNf aWQoKSBhbmQgYXNzZXJ0cyBvbiB0aGUgcmV0dXJuLiAgVGhpcyBwYXRjaCByZW1vdmVzCnRoZSBj YWxsIHRvIGttc3Rlc3RfZ2V0X3BpcGVfZnJvbV9jcnRjX2lkIGFsdG9nZXRoZXIgYW5kIGluc3Rl YWQgYXNzaWducyB0aGUKY3JjdCBpZCBhY2NvcmRpbmcgdG8gaXRzIGFycmF5IGluZGV4IGluIHRo ZSBkcm1Nb2RlUmVzIHN0cnVjdC4gIFRoaXMgc2VlbXMgdG8KYmUgdGhlIGRlZmF1bHQgYmVoYXZp b3IgZm9yIHRoZSBkcm0gYW55d2F5LgoKaWd0X2VuYWJsZV9jb25uZWN0b3JzKCkgcmVvcGVucyB0 aGUgZHJtIGRldiBub2RlIHRvIHBlcmZvcm0gaXRzIHdvcmssIGJ1dCBpdApjYW4ndCBrbm93IHdo aWNoIGNoaXBzZXQgdG8gc3BlY2lmeSB0byB0aGUgbmV3IGRybV9vcGVuX2RyaXZlciooKSBBUEku ICBUaGlzCnBhdGNoIG1vZGlmaWVzIGlndF9lbmFibGVfY29ubmVjdG9ycygpIHRvIHRha2UgYW4g YWxyZWFkeSBvcGVuIGRybSBmZCB0byB3b3JrCm9uLCBzbyB0aGF0IHRoZSBjaGlwc2V0IGlzIGlt cGxpZWQuICBpZ3RfZW5hYmxlX2Nvbm5lY3RvcnMoKSBwZXJmb3JtcyBnZW5lcmljCmRybSB3b3Jr IG9ubHksIHNvIGl0IHNob3VsZCBub3QgbmVlZCB0byBkbyBhbnl0aGluZyBjaGlwc2V0LXNwZWNp ZmljLiAgVGhlcmUKY291bGQgYmUgYW4gYXJndW1lbnQgaGVyZSBmb3IgaXNvbGF0aW5nIHRoaXMg d29yayBvbiBhIHNlcGFyYXRlIGZkLCBidXQgSSBjYW4ndApzZWUgaG93IGl0IHdvdWxkIG1ha2Ug YSBkaWZmZXJlbmNlIHRvIHRoZSBkcm0uCgpTaWduZWQtb2ZmLWJ5OiBNaWNhaCBGZWRrZSA8bWlj YWguZmVka2VAY29sbGFib3JhLmNvLnVrPgotLS0KIGxpYi9pZ3Rfa21zLmMgICAgICAgICAgICAg IHwgOSArKy0tLS0tLS0KIGxpYi9pZ3Rfa21zLmggICAgICAgICAgICAgIHwgMiArLQogdGVzdHMv a21zX2ZsaXAuYyAgICAgICAgICAgfCAyICstCiB0ZXN0cy9rbXNfcGlwZV9jcmNfYmFzaWMuYyB8 IDIgKy0KIDQgZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAxMCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5jIGIvbGliL2lndF9rbXMuYwppbmRleCA3ZTk1NmI0 Li43OGM5OGQyIDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21zLmMK QEAgLTYyOSw4ICs2MjksNyBAQCBmb3VuZDoKIAljb25maWctPmVuY29kZXIgPSBlbmNvZGVyOwog CWNvbmZpZy0+Y3J0YyA9IGRybU1vZGVHZXRDcnRjKGRybV9mZCwgcmVzb3VyY2VzLT5jcnRjc1tp XSk7CiAJY29uZmlnLT5jcnRjX2lkeCA9IGk7Ci0JY29uZmlnLT5waXBlID0ga21zdGVzdF9nZXRf cGlwZV9mcm9tX2NydGNfaWQoZHJtX2ZkLAotCQkJCQkJICAgICBjb25maWctPmNydGMtPmNydGNf aWQpOworCWNvbmZpZy0+cGlwZSA9IGk7CiAKIAlkcm1Nb2RlRnJlZVJlc291cmNlcyhyZXNvdXJj ZXMpOwogCkBAIC0xODAxLDEzICsxODAwLDEwIEBAIHZvaWQgaWd0X3dhaXRfZm9yX3ZibGFuayhp bnQgZHJtX2ZkLCBlbnVtIHBpcGUgcGlwZSkKICAqIEFuIGV4aXQgaGFuZGxlciBpcyBpbnN0YWxs ZWQgdG8gZW5zdXJlIGNvbm5lY3RvcnMgYXJlIHJlc2V0IHdoZW4gdGhlIHRlc3QKICAqIGV4aXRz LgogICovCi12b2lkIGlndF9lbmFibGVfY29ubmVjdG9ycyh2b2lkKQordm9pZCBpZ3RfZW5hYmxl X2Nvbm5lY3RvcnMoaW50IGRybV9mZCkKIHsKIAlkcm1Nb2RlUmVzICpyZXM7CiAJZHJtTW9kZUNv bm5lY3RvciAqYzsKLQlpbnQgZHJtX2ZkOwotCi0JZHJtX2ZkID0gZHJtX29wZW5fZHJpdmVyKERS SVZFUl9JTlRFTCk7CiAKIAlyZXMgPSBkcm1Nb2RlR2V0UmVzb3VyY2VzKGRybV9mZCk7CiAKQEAg LTE4MzAsNyArMTgyNiw2IEBAIHZvaWQgaWd0X2VuYWJsZV9jb25uZWN0b3JzKHZvaWQpCiAKIAkJ ZHJtTW9kZUZyZWVDb25uZWN0b3IoYyk7CiAJfQotCWNsb3NlKGRybV9mZCk7CiB9CiAKIC8qKgpk aWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuaCBiL2xpYi9pZ3Rfa21zLmgKaW5kZXggNTY1ZGYxNC4u YjVmMDA3ZCAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuaAorKysgYi9saWIvaWd0X2ttcy5oCkBA IC0yNzAsNyArMjcwLDcgQEAgdm9pZCBpZ3Rfd2FpdF9mb3JfdmJsYW5rKGludCBkcm1fZmQsIGVu dW0gcGlwZSBwaXBlKTsKIAogI2RlZmluZSBJR1RfRklYRUQoaSxmKQkoKGkpIDw8IDE2IHwgKGYp KQogCi12b2lkIGlndF9lbmFibGVfY29ubmVjdG9ycyh2b2lkKTsKK3ZvaWQgaWd0X2VuYWJsZV9j b25uZWN0b3JzKGludCBkcm1fZmQpOwogdm9pZCBpZ3RfcmVzZXRfY29ubmVjdG9ycyh2b2lkKTsK IAogI2RlZmluZSBFRElEX0xFTkdUSCAxMjgKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19mbGlwLmMg Yi90ZXN0cy9rbXNfZmxpcC5jCmluZGV4IDRkOGQwYzAuLmE4OGU3MDcgMTAwNjQ0Ci0tLSBhL3Rl c3RzL2ttc19mbGlwLmMKKysrIGIvdGVzdHMva21zX2ZsaXAuYwpAQCAtMTcwMiw3ICsxNzAyLDcg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCWlndF9maXh0dXJlIHsKIAkJZHJt X2ZkID0gZHJtX29wZW5fZHJpdmVyX21hc3RlcihEUklWRVJfSU5URUwpOwogCi0JCWlndF9lbmFi bGVfY29ubmVjdG9ycygpOworCQlpZ3RfZW5hYmxlX2Nvbm5lY3RvcnMoZHJtX2ZkKTsKIAogCQlr bXN0ZXN0X3NldF92dF9ncmFwaGljc19tb2RlKCk7CiAJCWlndF9pbnN0YWxsX2V4aXRfaGFuZGxl cihrbXNfZmxpcF9leGl0X2hhbmRsZXIpOwpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX3BpcGVfY3Jj X2Jhc2ljLmMgYi90ZXN0cy9rbXNfcGlwZV9jcmNfYmFzaWMuYwppbmRleCBmYzRhZDQ2Li4xMGVm MDk3IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfcGlwZV9jcmNfYmFzaWMuYworKysgYi90ZXN0cy9r bXNfcGlwZV9jcmNfYmFzaWMuYwpAQCAtMjI4LDcgKzIyOCw3IEBAIGlndF9tYWluCiAJaWd0X2Zp eHR1cmUgewogCQlkYXRhLmRybV9mZCA9IGRybV9vcGVuX2RyaXZlcl9tYXN0ZXIoRFJJVkVSX0lO VEVMKTsKIAotCQlpZ3RfZW5hYmxlX2Nvbm5lY3RvcnMoKTsKKwkJaWd0X2VuYWJsZV9jb25uZWN0 b3JzKGRhdGEuZHJtX2ZkKTsKIAogCQlrbXN0ZXN0X3NldF92dF9ncmFwaGljc19tb2RlKCk7CiAK LS0gCjIuNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=