From: Robert Foss Subject: [PATCH i-g-t v3 03/33] lib/igt_kms: Rename kmstest properties nplanes and plane Date: Mon, 30 Jan 2017 09:11:54 -0500 Message-ID: <20170130141224.25063-4-robert.foss@collabora.com> References: <20170130141224.25063-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 [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id C21DA6E1A9 for ; Mon, 30 Jan 2017 14:12:38 +0000 (UTC) In-Reply-To: <20170130141224.25063-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+ClJldmlld2VkLWJ5OiBNaWthIEthaG9s YSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgotLS0KIGxpYi9pZ3Rfa21zLmMgICAgICAgICAgICB8 IDE2ICsrKysrKysrKy0tLS0tLS0KIGxpYi9pZ3Rfa21zLmggICAgICAgICAgICB8ICA0ICsrLS0K IHRlc3RzL2ttc19wbGFuZV9sb3dyZXMuYyB8IDEwICsrKysrLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgMTYgaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2ln dF9rbXMuYyBiL2xpYi9pZ3Rfa21zLmMKaW5kZXggMzgyYjA4NjQuLmEwNzNjOGMzIDEwMDY0NAot LS0gYS9saWIvaWd0X2ttcy5jCisrKyBiL2xpYi9pZ3Rfa21zLmMKQEAgLTEzNDgsMTEgKzEzNDgs MTMgQEAgdm9pZCBrbXN0ZXN0X2dldF9jcnRjKGVudW0gcGlwZSBwaXBlLCBzdHJ1Y3Qga21zdGVz dF9jcnRjICpjcnRjKQogCQkJCWNydGMtPmFjdGl2ZSA9IHRydWU7CiAJCQkJcGFyc2VfY3J0Yyh0 bXAsIGNydGMpOwogCi0JCQkJY3J0Yy0+bnBsYW5lcyA9IHBhcnNlX3BsYW5lcyhmaWQsIE5VTEwp OwotCQkJCWNydGMtPnBsYW5lID0gY2FsbG9jKGNydGMtPm5wbGFuZXMsIHNpemVvZigqY3J0Yy0+ cGxhbmUpKTsKKwkJCQljcnRjLT5uX3BsYW5lcyA9IHBhcnNlX3BsYW5lcyhmaWQsIE5VTEwpOwor CQkJCWNydGMtPnBsYW5lcyA9IGNhbGxvYyhjcnRjLT5uX3BsYW5lcywgc2l6ZW9mKCpjcnRjLT5w bGFuZXMpKTsKKwkJCQlpZ3RfYXNzZXJ0X2YoY3J0Yy0+cGxhbmVzLCAiRmFpbGVkIHRvIGFsbG9j YXRlIG1lbW9yeSBmb3IgJWQgcGxhbmVzXG4iLCBjcnRjLT5uX3BsYW5lcyk7CisKIAkJCQlmc2Vl ayhmaWQsIDAsIFNFRUtfRU5EKTsKIAkJCQlmc2VlayhmaWQsIDAsIFNFRUtfU0VUKTsKLQkJCQlw YXJzZV9wbGFuZXMoZmlkLCBjcnRjLT5wbGFuZSk7CisJCQkJcGFyc2VfcGxhbmVzKGZpZCwgY3J0 Yy0+cGxhbmVzKTsKIAogCQkJCWlmIChjcnRjLT5waXBlICE9IHBpcGUpCiAJCQkJCWNydGMgPSBO VUxMOwpAQCAtMTM3OCwxNCArMTM4MCwxNCBAQCB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJs ZShlbnVtIHBpcGUgcGlwZSwgYm9vbCB2aXNpYmlsaXR5KQogCWttc3Rlc3RfZ2V0X2NydGMocGlw ZSwgJmNydGMpOwogCiAJdmlzaWJsZSA9IHRydWU7Ci0JZm9yIChpID0gMDsgaSA8IGNydGMubnBs YW5lczsgaSsrKSB7Ci0JCWlmIChjcnRjLnBsYW5lW2ldLnR5cGUgPT0gRFJNX1BMQU5FX1RZUEVf UFJJTUFSWSkKKwlmb3IgKGkgPSAwOyBpIDwgY3J0Yy5uX3BsYW5lczsgaSsrKSB7CisJCWlmIChj cnRjLnBsYW5lc1tpXS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCiAJCQljb250aW51 ZTsKIAotCQlpZiAoY3J0Yy5wbGFuZVtpXS5wb3NfeCA+IGNydGMud2lkdGgpIHsKKwkJaWYgKGNy dGMucGxhbmVzW2ldLnBvc194ID4gY3J0Yy53aWR0aCkgewogCQkJdmlzaWJsZSA9IGZhbHNlOwog CQkJYnJlYWs7Ci0JCX0gZWxzZSBpZiAoY3J0Yy5wbGFuZVtpXS5wb3NfeSA+IGNydGMuaGVpZ2h0 KSB7CisJCX0gZWxzZSBpZiAoY3J0Yy5wbGFuZXNbaV0ucG9zX3kgPiBjcnRjLmhlaWdodCkgewog CQkJdmlzaWJsZSA9IGZhbHNlOwogCQkJYnJlYWs7CiAJCX0KZGlmZiAtLWdpdCBhL2xpYi9pZ3Rf a21zLmggYi9saWIvaWd0X2ttcy5oCmluZGV4IDYzNTcwMmI2Li40ZTI5OGY4OSAxMDA2NDQKLS0t IGEvbGliL2lndF9rbXMuaAorKysgYi9saWIvaWd0X2ttcy5oCkBAIC0xNDksOCArMTQ5LDggQEAg c3RydWN0IGttc3Rlc3RfY3J0YyB7CiAJYm9vbCBhY3RpdmU7CiAJaW50IHdpZHRoOwogCWludCBo ZWlnaHQ7Ci0JaW50IG5wbGFuZXM7Ci0Jc3RydWN0IGttc3Rlc3RfcGxhbmUgKnBsYW5lOworCWlu dCBuX3BsYW5lczsKKwlzdHJ1Y3Qga21zdGVzdF9wbGFuZSAqcGxhbmVzOwogfTsKIAogLyoqCmRp ZmYgLS1naXQgYS90ZXN0cy9rbXNfcGxhbmVfbG93cmVzLmMgYi90ZXN0cy9rbXNfcGxhbmVfbG93 cmVzLmMKaW5kZXggODU4Y2M0ODIuLjQyNGVjYjk3IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfcGxh bmVfbG93cmVzLmMKKysrIGIvdGVzdHMva21zX3BsYW5lX2xvd3Jlcy5jCkBAIC0xODEsMTEgKzE4 MSwxMSBAQCB0ZXN0X3NldHVwKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90 IG1vZGlmaWVyLCBpbnQgZmxhZ3MsCiAJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUp OwogCiAJa21zdGVzdF9nZXRfY3J0YyhwaXBlLCAmY3J0Yyk7Ci0JaWd0X3NraXBfb24oY3J0Yy5u cGxhbmVzID4gZGF0YS0+ZGlzcGxheS5waXBlc1twaXBlXS5uX3BsYW5lcyk7Ci0JaWd0X3NraXBf b24oY3J0Yy5ucGxhbmVzID09IDApOworCWlndF9za2lwX29uKGNydGMubl9wbGFuZXMgPiBkYXRh LT5kaXNwbGF5LnBpcGVzW3BpcGVdLm5fcGxhbmVzKTsKKwlpZ3Rfc2tpcF9vbihjcnRjLm5fcGxh bmVzID09IDApOwogCi0JZm9yIChpID0gMDsgaSA8IGNydGMubnBsYW5lczsgaSsrKQotCQlkYXRh LT5wbGFuZVtpXSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKG91dHB1dCwgY3J0Yy5wbGFuZVtpXS5p bmRleCk7CisJZm9yIChpID0gMDsgaSA8IGNydGMubl9wbGFuZXM7IGkrKykKKwkJZGF0YS0+cGxh bmVbaV0gPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZShvdXRwdXQsIGNydGMucGxhbmVzW2ldLmluZGV4 KTsKIAogCW1vZGUgPSBpZ3Rfb3V0cHV0X2dldF9tb2RlKG91dHB1dCk7CiAKQEAgLTE5OCw3ICsx OTgsNyBAQCB0ZXN0X3NldHVwKGRhdGFfdCAqZGF0YSwgZW51bSBwaXBlIHBpcGUsIHVpbnQ2NF90 IG1vZGlmaWVyLCBpbnQgZmxhZ3MsCiAJaWd0X3BsYW5lX3NldF9mYihkYXRhLT5wbGFuZVswXSwg JmRhdGEtPmZiWzBdKTsKIAogCS8qIHllbGxvdyBzcHJpdGUgcGxhbmUgaW4gbG93ZXIgbGVmdCBj b3JuZXIgKi8KLQlmb3IgKGkgPSBJR1RfUExBTkVfMjsgaSA8IGNydGMubnBsYW5lczsgaSsrKSB7 CisJZm9yIChpID0gSUdUX1BMQU5FXzI7IGkgPCBjcnRjLm5fcGxhbmVzOyBpKyspIHsKIAkJaWYg KGRhdGEtPnBsYW5lW2ldLT5pc19jdXJzb3IpCiAJCQlzaXplID0gNjQ7CiAJCWVsc2UKLS0gCjIu MTEuMC40NTMuZzc4N2Y3NWYwNQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aW50ZWwtZ2Z4Cg==