From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t 2/3] igt_kms: Allow kmstest_get_connector_config to take provided drmModeGetResources Date: Wed, 27 Apr 2016 16:12:35 +0100 Message-ID: <1461769956-33188-2-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1461769956-33188-1-git-send-email-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 9B6116EB15 for ; Wed, 27 Apr 2016 15:12:41 +0000 (UTC) In-Reply-To: <1461769956-33188-1-git-send-email-tvrtko.ursulin@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 List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClRoaXMgd2ls bCBlbmFibGUgdGhlIGZvbGxvd2luZyBwYXRjaCB0byBnZW5lcmF0ZSBsZXNzIGRtZXNnIHNwYW0u CgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28gVXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29t PgotLS0KIGxpYi9pZ3Rfa21zLmMgICAgICAgfCAzMyArKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0KIGxpYi9pZ3Rfa21zLmggICAgICAgfCAgMyArKy0KIHRlc3RzL2ttc18zZC5jICAg ICAgfCAgMiArLQogdGVzdHMva21zX2ZsaXAuYyAgICB8ICA3ICsrKystLS0KIHRlc3RzL2ttc19y ZW5kZXIuYyAgfCAgNSArKystLQogdGVzdHMvdGVzdGRpc3BsYXkuYyB8ICAyICstCiA2IGZpbGVz IGNoYW5nZWQsIDM0IGluc2VydGlvbnMoKyksIDE4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2xpYi9pZ3Rfa21zLmMgYi9saWIvaWd0X2ttcy5jCmluZGV4IDc1NTdiZGMyMGZhNC4uMDdmNTIz ZTJjMzliIDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21zLmMKQEAg LTc0OSw2ICs3NDksNyBAQCBib29sIGttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9kZWZhdWx0X21vZGUo aW50IGRybV9mZCwgZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yLAogLyoqCiAgKiBfa21zdGVz dF9jb25uZWN0b3JfY29uZmlnOgogICogQGRybV9mZDogRFJNIGZkCisgKiBAcmVzb3VyY2VzOiBw b2ludGVyIHRvIGRybU1vZGVSZXMgb3IgTlVMTAogICogQGNvbm5lY3Rvcl9pZDogRFJNIGNvbm5l Y3RvciBpZAogICogQGNydGNfaWR4X21hc2s6IG1hc2sgb2YgYWxsb3dlZCBEUk0gQ1JUQyBpbmRp Y2VzCiAgKiBAY29uZmlnOiBzdHJ1Y3R1cmUgZmlsbGVkIHdpdGggdGhlIHBvc3NpYmxlIGNvbmZp Z3VyYXRpb24KQEAgLTc1NywxNyArNzU4LDI0IEBAIGJvb2wga21zdGVzdF9nZXRfY29ubmVjdG9y X2RlZmF1bHRfbW9kZShpbnQgZHJtX2ZkLCBkcm1Nb2RlQ29ubmVjdG9yICpjb25uZWN0b3IsCiAg KiBUaGlzIHRyaWVzIHRvIGZpbmQgYSBzdWl0YWJsZSBjb25maWd1cmF0aW9uIGZvciB0aGUgZ2l2 ZW4gY29ubmVjdG9yIGFuZCBDUlRDCiAgKiBjb25zdHJhaW50IGFuZCBmaWxscyBpdCBpbnRvIEBj b25maWcuCiAgKi8KLXN0YXRpYyBib29sIF9rbXN0ZXN0X2Nvbm5lY3Rvcl9jb25maWcoaW50IGRy bV9mZCwgdWludDMyX3QgY29ubmVjdG9yX2lkLAorc3RhdGljIGJvb2wgX2ttc3Rlc3RfY29ubmVj dG9yX2NvbmZpZyhpbnQgZHJtX2ZkLCBkcm1Nb2RlUmVzICpyZXNvdXJjZXMsCisJCQkJICAgICAg dWludDMyX3QgY29ubmVjdG9yX2lkLAogCQkJCSAgICAgIHVuc2lnbmVkIGxvbmcgY3J0Y19pZHhf bWFzaywKIAkJCQkgICAgICBzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnICpjb25maWcs CiAJCQkJICAgICAgYm9vbCBwcm9iZSkKIHsKLQlkcm1Nb2RlUmVzICpyZXNvdXJjZXM7CiAJZHJt TW9kZUNvbm5lY3RvciAqY29ubmVjdG9yOwogCWRybU1vZGVFbmNvZGVyICplbmNvZGVyOworCWJv b2wgZnJlZV9yZXNvdXJjZXM7CiAJaW50IGksIGo7CiAKLQlyZXNvdXJjZXMgPSBkcm1Nb2RlR2V0 UmVzb3VyY2VzKGRybV9mZCk7CisJaWYgKHJlc291cmNlcyA9PSBOVUxMKSB7CisJCXJlc291cmNl cyA9IGRybU1vZGVHZXRSZXNvdXJjZXMoZHJtX2ZkKTsKKwkJZnJlZV9yZXNvdXJjZXMgPSB0cnVl OworCX0gZWxzZSB7CisJCWZyZWVfcmVzb3VyY2VzID0gZmFsc2U7CisJfQorCiAJaWYgKCFyZXNv dXJjZXMpIHsKIAkJaWd0X3dhcm4oImRybU1vZGVHZXRSZXNvdXJjZXMgZmFpbGVkIik7CiAJCWdv dG8gZXJyMTsKQEAgLTg0MCw3ICs4NDgsOCBAQCBmb3VuZDoKIAljb25maWctPnBpcGUgPSBrbXN0 ZXN0X2dldF9waXBlX2Zyb21fY3J0Y19pZChkcm1fZmQsCiAJCQkJCQkgICAgIGNvbmZpZy0+Y3J0 Yy0+Y3J0Y19pZCk7CiAKLQlkcm1Nb2RlRnJlZVJlc291cmNlcyhyZXNvdXJjZXMpOworCWlmIChm cmVlX3Jlc291cmNlcykKKwkJZHJtTW9kZUZyZWVSZXNvdXJjZXMocmVzb3VyY2VzKTsKIAogCXJl dHVybiB0cnVlOwogZXJyNDoKQEAgLTg0OCw3ICs4NTcsOCBAQCBlcnI0OgogZXJyMzoKIAlkcm1N b2RlRnJlZUNvbm5lY3Rvcihjb25uZWN0b3IpOwogZXJyMjoKLQlkcm1Nb2RlRnJlZVJlc291cmNl cyhyZXNvdXJjZXMpOworCWlmIChmcmVlX3Jlc291cmNlcykKKwkJZHJtTW9kZUZyZWVSZXNvdXJj ZXMocmVzb3VyY2VzKTsKIGVycjE6CiAJcmV0dXJuIGZhbHNlOwogfQpAQCAtODU2LDYgKzg2Niw3 IEBAIGVycjE6CiAvKioKICAqIGttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWc6CiAgKiBAZHJt X2ZkOiBEUk0gZmQKKyAqIEByZXNvdXJjZXM6IHBvaW50ZXIgdG8gZHJtTW9kZVJlcyBvciBOVUxM CiAgKiBAY29ubmVjdG9yX2lkOiBEUk0gY29ubmVjdG9yIGlkCiAgKiBAY3J0Y19pZHhfbWFzazog bWFzayBvZiBhbGxvd2VkIERSTSBDUlRDIGluZGljZXMKICAqIEBjb25maWc6IHN0cnVjdHVyZSBm aWxsZWQgd2l0aCB0aGUgcG9zc2libGUgY29uZmlndXJhdGlvbgpAQCAtODYzLDEyICs4NzQsMTMg QEAgZXJyMToKICAqIFRoaXMgdHJpZXMgdG8gZmluZCBhIHN1aXRhYmxlIGNvbmZpZ3VyYXRpb24g Zm9yIHRoZSBnaXZlbiBjb25uZWN0b3IgYW5kIENSVEMKICAqIGNvbnN0cmFpbnQgYW5kIGZpbGxz IGl0IGludG8gQGNvbmZpZy4KICAqLwotYm9vbCBrbXN0ZXN0X2dldF9jb25uZWN0b3JfY29uZmln KGludCBkcm1fZmQsIHVpbnQzMl90IGNvbm5lY3Rvcl9pZCwKK2Jvb2wga21zdGVzdF9nZXRfY29u bmVjdG9yX2NvbmZpZyhpbnQgZHJtX2ZkLCBkcm1Nb2RlUmVzICpyZXNvdXJjZXMsCisJCQkJICB1 aW50MzJfdCBjb25uZWN0b3JfaWQsCiAJCQkJICB1bnNpZ25lZCBsb25nIGNydGNfaWR4X21hc2ss CiAJCQkJICBzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnICpjb25maWcpCiB7Ci0JcmV0 dXJuIF9rbXN0ZXN0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2ZkLCBjb25uZWN0b3JfaWQsIGNydGNf aWR4X21hc2ssCi0JCQkJCSBjb25maWcsIDApOworCXJldHVybiBfa21zdGVzdF9jb25uZWN0b3Jf Y29uZmlnKGRybV9mZCwgcmVzb3VyY2VzLCBjb25uZWN0b3JfaWQsCisJCQkJCSBjcnRjX2lkeF9t YXNrLCBjb25maWcsIDApOwogfQogCiAvKioKQEAgLTg4Niw4ICs4OTgsOCBAQCBib29sIGttc3Rl c3RfcHJvYmVfY29ubmVjdG9yX2NvbmZpZyhpbnQgZHJtX2ZkLCB1aW50MzJfdCBjb25uZWN0b3Jf aWQsCiAJCQkJICAgIHVuc2lnbmVkIGxvbmcgY3J0Y19pZHhfbWFzaywKIAkJCQkgICAgc3RydWN0 IGttc3Rlc3RfY29ubmVjdG9yX2NvbmZpZyAqY29uZmlnKQogewotCXJldHVybiBfa21zdGVzdF9j b25uZWN0b3JfY29uZmlnKGRybV9mZCwgY29ubmVjdG9yX2lkLCBjcnRjX2lkeF9tYXNrLAotCQkJ CQkgY29uZmlnLCAxKTsKKwlyZXR1cm4gX2ttc3Rlc3RfY29ubmVjdG9yX2NvbmZpZyhkcm1fZmQs IE5VTEwsIGNvbm5lY3Rvcl9pZCwKKwkJCQkJIGNydGNfaWR4X21hc2ssIGNvbmZpZywgMSk7CiB9 CiAKIC8qKgpAQCAtMTE2MCw2ICsxMTcyLDcgQEAgc3RhdGljIHZvaWQgaWd0X291dHB1dF9yZWZy ZXNoKGlndF9vdXRwdXRfdCAqb3V0cHV0KQogCQlrbXN0ZXN0X2ZyZWVfY29ubmVjdG9yX2NvbmZp Zygmb3V0cHV0LT5jb25maWcpOwogCiAJcmV0ID0ga21zdGVzdF9nZXRfY29ubmVjdG9yX2NvbmZp ZyhkaXNwbGF5LT5kcm1fZmQsCisJCQkJCSAgIE5VTEwsCiAJCQkJCSAgIG91dHB1dC0+aWQsCiAJ CQkJCSAgIGNydGNfaWR4X21hc2ssCiAJCQkJCSAgICZvdXRwdXQtPmNvbmZpZyk7CmRpZmYgLS1n aXQgYS9saWIvaWd0X2ttcy5oIGIvbGliL2lndF9rbXMuaAppbmRleCA1YzgzNDAxNzFhYjYuLjhj YmJhMTY3M2QyOCAxMDA2NDQKLS0tIGEvbGliL2lndF9rbXMuaAorKysgYi9saWIvaWd0X2ttcy5o CkBAIC0xNTgsNyArMTU4LDggQEAgdm9pZCBrbXN0ZXN0X2ZvcmNlX2VkaWQoaW50IGRybV9mZCwg ZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yLAogCiBib29sIGttc3Rlc3RfZ2V0X2Nvbm5lY3Rv cl9kZWZhdWx0X21vZGUoaW50IGRybV9mZCwgZHJtTW9kZUNvbm5lY3RvciAqY29ubmVjdG9yLAog CQkJCQlkcm1Nb2RlTW9kZUluZm8gKm1vZGUpOwotYm9vbCBrbXN0ZXN0X2dldF9jb25uZWN0b3Jf Y29uZmlnKGludCBkcm1fZmQsIHVpbnQzMl90IGNvbm5lY3Rvcl9pZCwKK2Jvb2wga21zdGVzdF9n ZXRfY29ubmVjdG9yX2NvbmZpZyhpbnQgZHJtX2ZkLCBkcm1Nb2RlUmVzICpyZXNvdXJjZXMsCisJ CQkJICB1aW50MzJfdCBjb25uZWN0b3JfaWQsCiAJCQkJICB1bnNpZ25lZCBsb25nIGNydGNfaWR4 X21hc2ssCiAJCQkJICBzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnICpjb25maWcpOwog Ym9vbCBrbXN0ZXN0X3Byb2JlX2Nvbm5lY3Rvcl9jb25maWcoaW50IGRybV9mZCwgdWludDMyX3Qg Y29ubmVjdG9yX2lkLApkaWZmIC0tZ2l0IGEvdGVzdHMva21zXzNkLmMgYi90ZXN0cy9rbXNfM2Qu YwppbmRleCBiZmM5ODFlZTI3OWQuLmU4YmM0YTQyZDhhYSAxMDA2NDQKLS0tIGEvdGVzdHMva21z XzNkLmMKKysrIGIvdGVzdHMva21zXzNkLmMKQEAgLTg2LDcgKzg2LDcgQEAgaWd0X3NpbXBsZV9t YWluCiAJCQljb250aW51ZTsKIAogCQkvKiBjcmVhdGUgYSBjb25maWd1cmF0aW9uICovCi0JCXJl dCA9IGttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2ZkLCBjb25uZWN0b3JfaWQsCisJ CXJldCA9IGttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2ZkLCBOVUxMLCBjb25uZWN0 b3JfaWQsCiAJCQkJCQkgICBjcnRjX21hc2ssICZjb25maWcpOwogCQlpZiAocmV0ICE9IHRydWUp IHsKIAkJCWlndF9pbmZvKCJFcnJvciBjcmVhdGluZyBjb25maWd1cmF0aW9uIGZvcjpcbiAgIik7 CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfZmxpcC5jIGIvdGVzdHMva21zX2ZsaXAuYwppbmRleCBl ZGEyZmNjOTIxMmQuLmZlYzY5MjU0ZTRkYSAxMDA2NDQKLS0tIGEvdGVzdHMva21zX2ZsaXAuYwor KysgYi90ZXN0cy9rbXNfZmxpcC5jCkBAIC0xMDQyLDcgKzEwNDIsOCBAQCBzdGF0aWMgdm9pZCBj b25uZWN0b3JfZmluZF9wcmVmZXJyZWRfbW9kZSh1aW50MzJfdCBjb25uZWN0b3JfaWQsIGludCBj cnRjX2lkeCwKIHsKIAlzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnIGNvbmZpZzsKIAot CWlmICgha21zdGVzdF9nZXRfY29ubmVjdG9yX2NvbmZpZyhkcm1fZmQsIGNvbm5lY3Rvcl9pZCwg MSA8PCBjcnRjX2lkeCwKKwlpZiAoIWttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2Zk LCBOVUxMLAorCQkJCQkgIGNvbm5lY3Rvcl9pZCwgMSA8PCBjcnRjX2lkeCwKIAkJCQkJICAmY29u ZmlnKSkgewogCQlvLT5tb2RlX3ZhbGlkID0gMDsKIAkJcmV0dXJuOwpAQCAtMTA4NiwxMSArMTA4 NywxMSBAQCBzdGF0aWMgdm9pZCBjb25uZWN0b3JfZmluZF9jb21wYXRpYmxlX21vZGUoaW50IGNy dGNfaWR4MCwgaW50IGNydGNfaWR4MSwKIAlkcm1Nb2RlTW9kZUluZm8gKm1vZGVbMl07CiAJaW50 IG4sIG07CiAKLQlpZiAoIWttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2ZkLCBvLT5f Y29ubmVjdG9yWzBdLAorCWlmICgha21zdGVzdF9nZXRfY29ubmVjdG9yX2NvbmZpZyhkcm1fZmQs IE5VTEwsIG8tPl9jb25uZWN0b3JbMF0sCiAJCQkJCSAgMSA8PCBjcnRjX2lkeDAsICZjb25maWdb MF0pKQogCQlyZXR1cm47CiAKLQlpZiAoIWttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJt X2ZkLCBvLT5fY29ubmVjdG9yWzFdLAorCWlmICgha21zdGVzdF9nZXRfY29ubmVjdG9yX2NvbmZp Zyhkcm1fZmQsIE5VTEwsIG8tPl9jb25uZWN0b3JbMV0sCiAJCQkJCSAgMSA8PCBjcnRjX2lkeDEs ICZjb25maWdbMV0pKSB7CiAJCWttc3Rlc3RfZnJlZV9jb25uZWN0b3JfY29uZmlnKCZjb25maWdb MF0pOwogCQlyZXR1cm47CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfcmVuZGVyLmMgYi90ZXN0cy9r bXNfcmVuZGVyLmMKaW5kZXggNzJkYTg3ZjE5YWYzLi43MzVhMWUxMTczNDkgMTAwNjQ0Ci0tLSBh L3Rlc3RzL2ttc19yZW5kZXIuYworKysgYi90ZXN0cy9rbXNfcmVuZGVyLmMKQEAgLTIxMCw4ICsy MTAsOSBAQCBzdGF0aWMgaW50IHJ1bl90ZXN0KGNvbnN0IGNoYXIgKnRlc3RfbmFtZSwgZW51bSB0 ZXN0X2ZsYWdzIGZsYWdzKQogCQlmb3IgKGogPSAwOyBqIDwgcmVzb3VyY2VzLT5jb3VudF9jcnRj czsgaisrKSB7CiAJCQlzdHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnIGNjb25mOwogCi0J CQlpZiAoIWttc3Rlc3RfZ2V0X2Nvbm5lY3Rvcl9jb25maWcoZHJtX2ZkLCBjb25uZWN0b3JfaWQs Ci0JCQkJCQkJICAgMSA8PCBqLCAmY2NvbmYpKQorCQkJaWYgKCFrbXN0ZXN0X2dldF9jb25uZWN0 b3JfY29uZmlnKGRybV9mZCwgTlVMTCwKKwkJCQkJCQkgIGNvbm5lY3Rvcl9pZCwKKwkJCQkJCQkg IDEgPDwgaiwgJmNjb25mKSkKIAkJCQljb250aW51ZTsKIAogCQkJdGVzdF9jb25uZWN0b3IodGVz dF9uYW1lLCAmY2NvbmYsIGZsYWdzKTsKZGlmZiAtLWdpdCBhL3Rlc3RzL3Rlc3RkaXNwbGF5LmMg Yi90ZXN0cy90ZXN0ZGlzcGxheS5jCmluZGV4IDAwYjQ3YmQwNjI4MC4uOWQ4NGQ4Y2Q0MDAwIDEw MDY0NAotLS0gYS90ZXN0cy90ZXN0ZGlzcGxheS5jCisrKyBiL3Rlc3RzL3Rlc3RkaXNwbGF5LmMK QEAgLTIwMSw3ICsyMDEsNyBAQCBzdGF0aWMgdm9pZCBjb25uZWN0b3JfZmluZF9wcmVmZXJyZWRf bW9kZSh1aW50MzJfdCBjb25uZWN0b3JfaWQsCiAJCXJldCA9IGttc3Rlc3RfcHJvYmVfY29ubmVj dG9yX2NvbmZpZyhkcm1fZmQsIGNvbm5lY3Rvcl9pZCwKIAkJCQkJCSAgICAgY3J0Y19pZHhfbWFz aywgJmNvbmZpZyk7CiAJZWxzZQotCQlyZXQgPSBrbXN0ZXN0X2dldF9jb25uZWN0b3JfY29uZmln KGRybV9mZCwgY29ubmVjdG9yX2lkLAorCQlyZXQgPSBrbXN0ZXN0X2dldF9jb25uZWN0b3JfY29u ZmlnKGRybV9mZCwgTlVMTCwgY29ubmVjdG9yX2lkLAogCQkJCQkJICAgY3J0Y19pZHhfbWFzaywg JmNvbmZpZyk7CiAJaWYgKCFyZXQpIHsKIAkJYy0+bW9kZV92YWxpZCA9IDA7Ci0tIAoxLjkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==