From: Chris Wilson Subject: [PATCH igt 21/24] lib/kms: Pass fd to igt_enable_connectors() Date: Mon, 14 Aug 2017 21:18:45 +0100 Message-ID: <20170814201848.28216-21-chris@chris-wilson.co.uk> References: <20170814201848.28216-1-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from fireflyinternet.com (mail.fireflyinternet.com [109.228.58.192]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CC026E23C for ; Mon, 14 Aug 2017 20:19:40 +0000 (UTC) In-Reply-To: <20170814201848.28216-1-chris@chris-wilson.co.uk> 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 UGFzcyB0aGUgZmQgYWxvbmcgdG8gaWd0X2VuYWJsZV9jb25uZWN0b3JzKCkgc28gdGhhdCBpdCBh Y3R1YWxseSBkdHJ0CndoZW4gdGhlcmUgYXJlIG11bHRpcGxlIGRybSBkZXZpY2VzIGluIHRoZSBz eXN0ZW0uCgpTaWduZWQtb2ZmLWJ5OiBDaHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5j by51az4KLS0tCiBsaWIvaWd0X2ttcy5jICAgICAgICAgICAgICAgIHwgMTMgKysrKy0tLS0tLS0t LQogbGliL2lndF9rbXMuaCAgICAgICAgICAgICAgICB8ICAyICstCiB0ZXN0cy9rbXNfZmxpcC5j ICAgICAgICAgICAgIHwgIDIgKy0KIHRlc3RzL2ttc19pbnZhbGlkX2RvdGNsb2NrLmMgfCAgMiAr LQogdGVzdHMva21zX3BpcGVfY3JjX2Jhc2ljLmMgICB8ICAyICstCiA1IGZpbGVzIGNoYW5nZWQs IDggaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9r bXMuYyBiL2xpYi9pZ3Rfa21zLmMKaW5kZXggOWJmNTMzNTkuLmQ3OGRlZTU4IDEwMDY0NAotLS0g YS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21zLmMKQEAgLTMxNjUsMjEgKzMxNjUsMTgg QEAgdm9pZCBpZ3Rfd2FpdF9mb3JfdmJsYW5rKGludCBkcm1fZmQsIGVudW0gcGlwZSBwaXBlKQog ICogQW4gZXhpdCBoYW5kbGVyIGlzIGluc3RhbGxlZCB0byBlbnN1cmUgY29ubmVjdG9ycyBhcmUg cmVzZXQgd2hlbiB0aGUgdGVzdAogICogZXhpdHMuCiAgKi8KLXZvaWQgaWd0X2VuYWJsZV9jb25u ZWN0b3JzKHZvaWQpCit2b2lkIGlndF9lbmFibGVfY29ubmVjdG9ycyhpbnQgZmQpCiB7CiAJZHJt TW9kZVJlcyAqcmVzOwotCWludCBkcm1fZmQ7CiAKLQlkcm1fZmQgPSBkcm1fb3Blbl9kcml2ZXIo RFJJVkVSX0FOWSk7Ci0KLQlyZXMgPSBkcm1Nb2RlR2V0UmVzb3VyY2VzKGRybV9mZCk7CisJcmVz ID0gZHJtTW9kZUdldFJlc291cmNlcyhmZCk7CiAJaWd0X2Fzc2VydChyZXMgIT0gTlVMTCk7CiAK IAlmb3IgKGludCBpID0gMDsgaSA8IHJlcy0+Y291bnRfY29ubmVjdG9yczsgaSsrKSB7CiAJCWRy bU1vZGVDb25uZWN0b3IgKmM7CiAKIAkJLyogRG8gYSBwcm9iZS4gVGhpcyBtYXkgYmUgdGhlIGZp cnN0IGFjdGlvbiBhZnRlciBib290aW5nICovCi0JCWMgPSBkcm1Nb2RlR2V0Q29ubmVjdG9yKGRy bV9mZCwgcmVzLT5jb25uZWN0b3JzW2ldKTsKKwkJYyA9IGRybU1vZGVHZXRDb25uZWN0b3IoZmQs IHJlcy0+Y29ubmVjdG9yc1tpXSk7CiAJCWlmICghYykgewogCQkJaWd0X3dhcm4oIkNvdWxkIG5v dCByZWFkIGNvbm5lY3RvciAldTogJW1cbiIsIHJlcy0+Y29ubmVjdG9yc1tpXSk7CiAJCQljb250 aW51ZTsKQEAgLTMxOTIsNyArMzE4OSw3IEBAIHZvaWQgaWd0X2VuYWJsZV9jb25uZWN0b3JzKHZv aWQpCiAKIAkJLyoganVzdCBlbmFibGUgVkdBIGZvciBub3cgKi8KIAkJaWYgKGMtPmNvbm5lY3Rv cl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9WR0EpIHsKLQkJCWlmICgha21zdGVzdF9mb3Jj ZV9jb25uZWN0b3IoZHJtX2ZkLCBjLCBGT1JDRV9DT05ORUNUT1JfT04pKQorCQkJaWYgKCFrbXN0 ZXN0X2ZvcmNlX2Nvbm5lY3RvcihmZCwgYywgRk9SQ0VfQ09OTkVDVE9SX09OKSkKIAkJCQlpZ3Rf aW5mbygiVW5hYmxlIHRvIGZvcmNlIHN0YXRlIG9uICVzLSVkXG4iLAogCQkJCQkga21zdGVzdF9j b25uZWN0b3JfdHlwZV9zdHIoYy0+Y29ubmVjdG9yX3R5cGUpLAogCQkJCQkgYy0+Y29ubmVjdG9y X3R5cGVfaWQpOwpAQCAtMzIwMCw4ICszMTk3LDYgQEAgdm9pZCBpZ3RfZW5hYmxlX2Nvbm5lY3Rv cnModm9pZCkKIAogCQlkcm1Nb2RlRnJlZUNvbm5lY3RvcihjKTsKIAl9Ci0KLQljbG9zZShkcm1f ZmQpOwogfQogCiAvKioKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmggYi9saWIvaWd0X2ttcy5o CmluZGV4IGU1ZGMzMjliLi5lYTE4NDZiYSAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuaAorKysg Yi9saWIvaWd0X2ttcy5oCkBAIC01NTUsNyArNTU1LDcgQEAgc3RhdGljIGlubGluZSBib29sIGln dF9vdXRwdXRfaXNfY29ubmVjdGVkKGlndF9vdXRwdXRfdCAqb3V0cHV0KQogCWlndF9hc3NlcnRf bHQoMCwgZHJtTW9kZUF0b21pY0FkZFByb3BlcnR5KHJlcSwgb3V0cHV0LT5jb25maWcuY29ubmVj dG9yLT5jb25uZWN0b3JfaWQsXAogCQkJCQkJICBvdXRwdXQtPmNvbmZpZy5hdG9taWNfcHJvcHNf Y29ubmVjdG9yW3Byb3BdLCB2YWx1ZSkpCiAKLXZvaWQgaWd0X2VuYWJsZV9jb25uZWN0b3JzKHZv aWQpOwordm9pZCBpZ3RfZW5hYmxlX2Nvbm5lY3RvcnMoaW50IGZkKTsKIHZvaWQgaWd0X3Jlc2V0 X2Nvbm5lY3RvcnModm9pZCk7CiAKIHVpbnQzMl90IGttc3Rlc3RfZ2V0X3ZibF9mbGFnKHVpbnQz Ml90IHBpcGVfaWQpOwpkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2ZsaXAuYyBiL3Rlc3RzL2ttc19m bGlwLmMKaW5kZXggNGVhNjhkNGIuLjg5OTYyNTgxIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfZmxp cC5jCisrKyBiL3Rlc3RzL2ttc19mbGlwLmMKQEAgLTE2NDEsNyArMTY0MSw3IEBAIGludCBtYWlu KGludCBhcmdjLCBjaGFyICoqYXJndikKIAlpZ3RfZml4dHVyZSB7CiAJCWRybV9mZCA9IGRybV9v cGVuX2RyaXZlcl9tYXN0ZXIoRFJJVkVSX0FOWSk7CiAKLQkJaWd0X2VuYWJsZV9jb25uZWN0b3Jz KCk7CisJCWlndF9lbmFibGVfY29ubmVjdG9ycyhkcm1fZmQpOwogCiAJCWttc3Rlc3Rfc2V0X3Z0 X2dyYXBoaWNzX21vZGUoKTsKIAkJaWd0X2luc3RhbGxfZXhpdF9oYW5kbGVyKGttc19mbGlwX2V4 aXRfaGFuZGxlcik7CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfaW52YWxpZF9kb3RjbG9jay5jIGIv dGVzdHMva21zX2ludmFsaWRfZG90Y2xvY2suYwppbmRleCBlNmU3MmY1Mi4uYjA5NDJlNTkgMTAw NjQ0Ci0tLSBhL3Rlc3RzL2ttc19pbnZhbGlkX2RvdGNsb2NrLmMKKysrIGIvdGVzdHMva21zX2lu dmFsaWRfZG90Y2xvY2suYwpAQCAtMTMxLDcgKzEzMSw3IEBAIGlndF9zaW1wbGVfbWFpbgogCWRh dGEuZHJtX2ZkID0gZHJtX29wZW5fZHJpdmVyX21hc3RlcihEUklWRVJfSU5URUwpOwogCWlndF9y ZXF1aXJlX2ludGVsKGRhdGEuZHJtX2ZkKTsKIAotCWlndF9lbmFibGVfY29ubmVjdG9ycygpOwor CWlndF9lbmFibGVfY29ubmVjdG9ycyhkYXRhLmRybV9mZCk7CiAJa21zdGVzdF9zZXRfdnRfZ3Jh cGhpY3NfbW9kZSgpOwogCWlndF9kaXNwbGF5X2luaXQoJmRhdGEuZGlzcGxheSwgZGF0YS5kcm1f ZmQpOwogCWRhdGEucmVzID0gZHJtTW9kZUdldFJlc291cmNlcyhkYXRhLmRybV9mZCk7CmRpZmYg LS1naXQgYS90ZXN0cy9rbXNfcGlwZV9jcmNfYmFzaWMuYyBiL3Rlc3RzL2ttc19waXBlX2NyY19i YXNpYy5jCmluZGV4IDM1YWRkZGJhLi5iZjUxYjRjYiAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3Bp cGVfY3JjX2Jhc2ljLmMKKysrIGIvdGVzdHMva21zX3BpcGVfY3JjX2Jhc2ljLmMKQEAgLTE4NSw3 ICsxODUsNyBAQCBpZ3RfbWFpbgogCWlndF9maXh0dXJlIHsKIAkJZGF0YS5kcm1fZmQgPSBkcm1f b3Blbl9kcml2ZXJfbWFzdGVyKERSSVZFUl9BTlkpOwogCi0JCWlndF9lbmFibGVfY29ubmVjdG9y cygpOworCQlpZ3RfZW5hYmxlX2Nvbm5lY3RvcnMoZGF0YS5kcm1fZmQpOwogCiAJCWttc3Rlc3Rf c2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsKIAotLSAKMi4xMy4zCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVs LWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK