From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: [PATCH i-g-t v2 03/33] lib/igt_kms: Rename kmstest properties nplanes and plane Date: Tue, 24 Jan 2017 18:33:30 -0500 Message-ID: <20170124233400.5053-4-robert.foss@collabora.com> References: <20170124233400.5053-1-robert.foss@collabora.com> 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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6BCE86E889 for ; Tue, 24 Jan 2017 23:34:34 +0000 (UTC) In-Reply-To: <20170124233400.5053-1-robert.foss@collabora.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, Tomeu Vizoso , Maarten Lankhorst , Gustavo Padovan , Daniel Stone , Mika Kahola , Petri Latvala List-Id: intel-gfx@lists.freedesktop.org UmVuYW1lIHRoZXNlIHByb3BlcnRpZXMgdG8gaGF2ZSB0aGVtIHVzZSB0aGUgc2FtZSBuYW1pbmcg Y29udmVudGlvbgphcyB0aGUgaWd0XypfdCBzdHJ1Y3RzLgoKU2lnbmVkLW9mZi1ieTogUm9iZXJ0 IEZvc3MgPHJvYmVydC5mb3NzQGNvbGxhYm9yYS5jb20+Ci0tLQogbGliL2lndF9rbXMuYyAgICAg ICAgICAgIHwgMTYgKysrKysrKysrLS0tLS0tLQogbGliL2lndF9rbXMuaCAgICAgICAgICAgIHwg IDQgKystLQogdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jIHwgMTAgKysrKystLS0tLQogMyBmaWxl cyBjaGFuZ2VkLCAxNiBpbnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9saWIvaWd0X2ttcy5jIGIvbGliL2lndF9rbXMuYwppbmRleCA5MjJiYmE2My4uOGZhNDBjMjgg MTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21zLmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTMxMCwx MSArMTMxMCwxMyBAQCB2b2lkIGttc3Rlc3RfZ2V0X2NydGMoZW51bSBwaXBlIHBpcGUsIHN0cnVj dCBrbXN0ZXN0X2NydGMgKmNydGMpCiAJCQkJY3J0Yy0+YWN0aXZlID0gdHJ1ZTsKIAkJCQlwYXJz ZV9jcnRjKHRtcCwgY3J0Yyk7CiAKLQkJCQljcnRjLT5ucGxhbmVzID0gcGFyc2VfcGxhbmVzKGZp ZCwgTlVMTCk7Ci0JCQkJY3J0Yy0+cGxhbmUgPSBjYWxsb2MoY3J0Yy0+bnBsYW5lcywgc2l6ZW9m KCpjcnRjLT5wbGFuZSkpOworCQkJCWNydGMtPm5fcGxhbmVzID0gcGFyc2VfcGxhbmVzKGZpZCwg TlVMTCk7CisJCQkJY3J0Yy0+cGxhbmVzID0gY2FsbG9jKGNydGMtPm5fcGxhbmVzLCBzaXplb2Yo KmNydGMtPnBsYW5lcykpOworCQkJCWlndF9hc3NlcnRfZihjcnRjLT5wbGFuZXMsICJGYWlsZWQg dG8gYWxsb2NhdGUgbWVtb3J5IGZvciAlZCBwbGFuZXNcbiIsIGNydGMtPm5fcGxhbmVzKTsKKwog CQkJCWZzZWVrKGZpZCwgMCwgU0VFS19FTkQpOwogCQkJCWZzZWVrKGZpZCwgMCwgU0VFS19TRVQp OwotCQkJCXBhcnNlX3BsYW5lcyhmaWQsIGNydGMtPnBsYW5lKTsKKwkJCQlwYXJzZV9wbGFuZXMo ZmlkLCBjcnRjLT5wbGFuZXMpOwogCiAJCQkJaWYgKGNydGMtPnBpcGUgIT0gcGlwZSkKIAkJCQkJ Y3J0YyA9IE5VTEw7CkBAIC0xMzQwLDE0ICsxMzQyLDE0IEBAIHZvaWQgaWd0X2Fzc2VydF9wbGFu ZV92aXNpYmxlKGVudW0gcGlwZSBwaXBlLCBib29sIHZpc2liaWxpdHkpCiAJa21zdGVzdF9nZXRf Y3J0YyhwaXBlLCAmY3J0Yyk7CiAKIAl2aXNpYmxlID0gdHJ1ZTsKLQlmb3IgKGkgPSAwOyBpIDwg Y3J0Yy5ucGxhbmVzOyBpKyspIHsKLQkJaWYgKGNydGMucGxhbmVbaV0udHlwZSA9PSBEUk1fUExB TkVfVFlQRV9QUklNQVJZKQorCWZvciAoaSA9IDA7IGkgPCBjcnRjLm5fcGxhbmVzOyBpKyspIHsK KwkJaWYgKGNydGMucGxhbmVzW2ldLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKIAkJ CWNvbnRpbnVlOwogCi0JCWlmIChjcnRjLnBsYW5lW2ldLnBvc194ID4gY3J0Yy53aWR0aCkgewor CQlpZiAoY3J0Yy5wbGFuZXNbaV0ucG9zX3ggPiBjcnRjLndpZHRoKSB7CiAJCQl2aXNpYmxlID0g ZmFsc2U7CiAJCQlicmVhazsKLQkJfSBlbHNlIGlmIChjcnRjLnBsYW5lW2ldLnBvc195ID4gY3J0 Yy5oZWlnaHQpIHsKKwkJfSBlbHNlIGlmIChjcnRjLnBsYW5lc1tpXS5wb3NfeSA+IGNydGMuaGVp Z2h0KSB7CiAJCQl2aXNpYmxlID0gZmFsc2U7CiAJCQlicmVhazsKIAkJfQpkaWZmIC0tZ2l0IGEv bGliL2lndF9rbXMuaCBiL2xpYi9pZ3Rfa21zLmgKaW5kZXggNWViNDlhYjMuLjNiYzY5Yjg0IDEw MDY0NAotLS0gYS9saWIvaWd0X2ttcy5oCisrKyBiL2xpYi9pZ3Rfa21zLmgKQEAgLTE0OSw4ICsx NDksOCBAQCBzdHJ1Y3Qga21zdGVzdF9jcnRjIHsKIAlib29sIGFjdGl2ZTsKIAlpbnQgd2lkdGg7 CiAJaW50IGhlaWdodDsKLQlpbnQgbnBsYW5lczsKLQlzdHJ1Y3Qga21zdGVzdF9wbGFuZSAqcGxh bmU7CisJaW50IG5fcGxhbmVzOworCXN0cnVjdCBrbXN0ZXN0X3BsYW5lICpwbGFuZXM7CiB9Owog CiAvKioKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19wbGFuZV9sb3dyZXMuYyBiL3Rlc3RzL2ttc19w bGFuZV9sb3dyZXMuYwppbmRleCA4NThjYzQ4Mi4uNDI0ZWNiOTcgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L2ttc19wbGFuZV9sb3dyZXMuYworKysgYi90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMKQEAgLTE4 MSwxMSArMTgxLDExIEBAIHRlc3Rfc2V0dXAoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwg dWludDY0X3QgbW9kaWZpZXIsIGludCBmbGFncywKIAlpZ3Rfb3V0cHV0X3NldF9waXBlKG91dHB1 dCwgcGlwZSk7CiAKIAlrbXN0ZXN0X2dldF9jcnRjKHBpcGUsICZjcnRjKTsKLQlpZ3Rfc2tpcF9v bihjcnRjLm5wbGFuZXMgPiBkYXRhLT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzKTsKLQlp Z3Rfc2tpcF9vbihjcnRjLm5wbGFuZXMgPT0gMCk7CisJaWd0X3NraXBfb24oY3J0Yy5uX3BsYW5l cyA+IGRhdGEtPmRpc3BsYXkucGlwZXNbcGlwZV0ubl9wbGFuZXMpOworCWlndF9za2lwX29uKGNy dGMubl9wbGFuZXMgPT0gMCk7CiAKLQlmb3IgKGkgPSAwOyBpIDwgY3J0Yy5ucGxhbmVzOyBpKysp Ci0JCWRhdGEtPnBsYW5lW2ldID0gaWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0LCBjcnRjLnBs YW5lW2ldLmluZGV4KTsKKwlmb3IgKGkgPSAwOyBpIDwgY3J0Yy5uX3BsYW5lczsgaSsrKQorCQlk YXRhLT5wbGFuZVtpXSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgY3J0Yy5wbGFuZXNb aV0uaW5kZXgpOwogCiAJbW9kZSA9IGlndF9vdXRwdXRfZ2V0X21vZGUob3V0cHV0KTsKIApAQCAt MTk4LDcgKzE5OCw3IEBAIHRlc3Rfc2V0dXAoZGF0YV90ICpkYXRhLCBlbnVtIHBpcGUgcGlwZSwg dWludDY0X3QgbW9kaWZpZXIsIGludCBmbGFncywKIAlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPnBs YW5lWzBdLCAmZGF0YS0+ZmJbMF0pOwogCiAJLyogeWVsbG93IHNwcml0ZSBwbGFuZSBpbiBsb3dl ciBsZWZ0IGNvcm5lciAqLwotCWZvciAoaSA9IElHVF9QTEFORV8yOyBpIDwgY3J0Yy5ucGxhbmVz OyBpKyspIHsKKwlmb3IgKGkgPSBJR1RfUExBTkVfMjsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykg ewogCQlpZiAoZGF0YS0+cGxhbmVbaV0tPmlzX2N1cnNvcikKIAkJCXNpemUgPSA2NDsKIAkJZWxz ZQotLSAKMi4xMS4wLjQ1My5nNzg3Zjc1ZjA1CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9pbnRlbC1nZngK