From: Robert Foss Subject: [PATCH i-g-t v3 02/33] lib/igt_kms: Avoid depencency on static plane count Date: Mon, 30 Jan 2017 09:11:53 -0500 Message-ID: <20170130141224.25063-3-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 921626E1A9 for ; Mon, 30 Jan 2017 14:12:37 +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 UmV3b3JrIGttc3Rlc3RfY3J0YyBhbmQga21zdGVzdF9wbGFuZSBzdHJ1Y3RzIGFuZCB0aGVpciB1 c2FnZQp0byBub3QgZGVwZW5kIG9uIGEgc3RhdGljIHBsYW5lIGNvdW50LgoKU2lnbmVkLW9mZi1i eTogUm9iZXJ0IEZvc3MgPHJvYmVydC5mb3NzQGNvbGxhYm9yYS5jb20+ClJldmlld2VkLWJ5OiBN aWthIEthaG9sYSA8bWlrYS5rYWhvbGFAaW50ZWwuY29tPgotLS0KIGxpYi9pZ3Rfa21zLmMgfCA0 NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLQogbGliL2ln dF9rbXMuaCB8ICA0ICsrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgMTkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9rbXMuYyBiL2xpYi9pZ3Rfa21zLmMK aW5kZXggMTg4YjBjZWIuLjM4MmIwODY0IDEwMDY0NAotLS0gYS9saWIvaWd0X2ttcy5jCisrKyBi L2xpYi9pZ3Rfa21zLmMKQEAgLTEyNjUsNyArMTI2NSw3IEBAIHN0YXRpYyB2b2lkIGdldF9wbGFu ZShjaGFyICpzdHIsIGludCB0eXBlLCBzdHJ1Y3Qga21zdGVzdF9wbGFuZSAqcGxhbmUpCiAJaW50 IHJldDsKIAljaGFyIGJ1ZlsyNTZdOwogCi0JcGxhbmUtPnBsYW5lID0gdHlwZTsKKwlwbGFuZS0+ dHlwZSA9IHR5cGU7CiAJcmV0ID0gc3NjYW5mKHN0ciArIDEyLCAiJWQlKmMgJSpzICVbXm5dcyIs CiAJCSAgICAgJnBsYW5lLT5pZCwKIAkJICAgICBidWYpOwpAQCAtMTI3OCwzMSArMTI3OCwzNiBA QCBzdGF0aWMgdm9pZCBnZXRfcGxhbmUoY2hhciAqc3RyLCBpbnQgdHlwZSwgc3RydWN0IGttc3Rl c3RfcGxhbmUgKnBsYW5lKQogCWlndF9hc3NlcnRfZXEocmV0LCAyKTsKIH0KIAotc3RhdGljIGlu dCBwYXJzZV9wbGFuZXMoRklMRSAqZmlkLCBzdHJ1Y3Qga21zdGVzdF9wbGFuZSAqcGxhbmUpCitz dGF0aWMgaW50IHBhcnNlX3BsYW5lcyhGSUxFICpmaWQsIHN0cnVjdCBrbXN0ZXN0X3BsYW5lICpw bGFuZXMpCiB7CiAJY2hhciB0bXBbMjU2XTsKLQlpbnQgbnBsYW5lczsKKwlpbnQgbl9wbGFuZXM7 CiAKLQlucGxhbmVzID0gMDsKKwluX3BsYW5lcyA9IDA7CiAJd2hpbGUgKGZnZXRzKHRtcCwgMjU2 LCBmaWQpICE9IE5VTEwpIHsKLQkJaWd0X2Fzc2VydF9uZXEobnBsYW5lcywgSUdUX01BWF9QTEFO RVMpOwogCQlpZiAoc3Ryc3RyKHRtcCwgInR5cGU9UFJJIikgIT0gTlVMTCkgewotCQkJZ2V0X3Bs YW5lKHRtcCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSwgJnBsYW5lW25wbGFuZXNdKTsKLQkJCXBs YW5lW25wbGFuZXNdLmluZGV4ID0gbnBsYW5lczsKLQkJCW5wbGFuZXMrKzsKKwkJCWlmIChwbGFu ZXMpIHsKKwkJCQlnZXRfcGxhbmUodG1wLCBEUk1fUExBTkVfVFlQRV9QUklNQVJZLCAmcGxhbmVz W25fcGxhbmVzXSk7CisJCQkJcGxhbmVzW25fcGxhbmVzXS5pbmRleCA9IG5fcGxhbmVzOworCQkJ fQorCQkJbl9wbGFuZXMrKzsKIAkJfSBlbHNlIGlmIChzdHJzdHIodG1wLCAidHlwZT1PVkwiKSAh PSBOVUxMKSB7Ci0JCQlnZXRfcGxhbmUodG1wLCBEUk1fUExBTkVfVFlQRV9PVkVSTEFZLCAmcGxh bmVbbnBsYW5lc10pOwotCQkJcGxhbmVbbnBsYW5lc10uaW5kZXggPSBucGxhbmVzOwotCQkJbnBs YW5lcysrOworCQkJaWYgKHBsYW5lcykgeworCQkJCWdldF9wbGFuZSh0bXAsIERSTV9QTEFORV9U WVBFX09WRVJMQVksICZwbGFuZXNbbl9wbGFuZXNdKTsKKwkJCQlwbGFuZXNbbl9wbGFuZXNdLmlu ZGV4ID0gbl9wbGFuZXM7CisJCQl9CisJCQluX3BsYW5lcysrOwogCQl9IGVsc2UgaWYgKHN0cnN0 cih0bXAsICJ0eXBlPUNVUiIpICE9IE5VTEwpIHsKLQkJCWdldF9wbGFuZSh0bXAsIERSTV9QTEFO RV9UWVBFX0NVUlNPUiwgJnBsYW5lW25wbGFuZXNdKTsKLQkJCXBsYW5lW25wbGFuZXNdLmluZGV4 ID0gbnBsYW5lczsKLQkJCW5wbGFuZXMrKzsKKwkJCWlmIChwbGFuZXMpIHsKKwkJCQlnZXRfcGxh bmUodG1wLCBEUk1fUExBTkVfVFlQRV9DVVJTT1IsICZwbGFuZXNbbl9wbGFuZXNdKTsKKwkJCQlw bGFuZXNbbl9wbGFuZXNdLmluZGV4ID0gbl9wbGFuZXM7CisJCQl9CisJCQluX3BsYW5lcysrOwog CQkJYnJlYWs7CiAJCX0KIAl9CiAKLQlyZXR1cm4gbnBsYW5lczsKKwlyZXR1cm4gbl9wbGFuZXM7 CiB9CiAKIHN0YXRpYyB2b2lkIHBhcnNlX2NydGMoY2hhciAqaW5mbywgc3RydWN0IGttc3Rlc3Rf Y3J0YyAqY3J0YykKQEAgLTEzNDIsNyArMTM0NywxMiBAQCB2b2lkIGttc3Rlc3RfZ2V0X2NydGMo ZW51bSBwaXBlIHBpcGUsIHN0cnVjdCBrbXN0ZXN0X2NydGMgKmNydGMpCiAJCQlpZiAoc3Ryc3Ry KHRtcCwgImFjdGl2ZT15ZXMiKSAhPSBOVUxMKSB7CiAJCQkJY3J0Yy0+YWN0aXZlID0gdHJ1ZTsK IAkJCQlwYXJzZV9jcnRjKHRtcCwgY3J0Yyk7Ci0JCQkJY3J0Yy0+bnBsYW5lcyA9IHBhcnNlX3Bs YW5lcyhmaWQsIGNydGMtPnBsYW5lKTsKKworCQkJCWNydGMtPm5wbGFuZXMgPSBwYXJzZV9wbGFu ZXMoZmlkLCBOVUxMKTsKKwkJCQljcnRjLT5wbGFuZSA9IGNhbGxvYyhjcnRjLT5ucGxhbmVzLCBz aXplb2YoKmNydGMtPnBsYW5lKSk7CisJCQkJZnNlZWsoZmlkLCAwLCBTRUVLX0VORCk7CisJCQkJ ZnNlZWsoZmlkLCAwLCBTRUVLX1NFVCk7CisJCQkJcGFyc2VfcGxhbmVzKGZpZCwgY3J0Yy0+cGxh bmUpOwogCiAJCQkJaWYgKGNydGMtPnBpcGUgIT0gcGlwZSkKIAkJCQkJY3J0YyA9IE5VTEw7CkBA IC0xMzY4LDcgKzEzNzgsMTAgQEAgdm9pZCBpZ3RfYXNzZXJ0X3BsYW5lX3Zpc2libGUoZW51bSBw aXBlIHBpcGUsIGJvb2wgdmlzaWJpbGl0eSkKIAlrbXN0ZXN0X2dldF9jcnRjKHBpcGUsICZjcnRj KTsKIAogCXZpc2libGUgPSB0cnVlOwotCWZvciAoaSA9IElHVF9QTEFORV8yOyBpIDwgY3J0Yy5u cGxhbmVzOyBpKyspIHsKKwlmb3IgKGkgPSAwOyBpIDwgY3J0Yy5ucGxhbmVzOyBpKyspIHsKKwkJ aWYgKGNydGMucGxhbmVbaV0udHlwZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQorCQkJY29u dGludWU7CisKIAkJaWYgKGNydGMucGxhbmVbaV0ucG9zX3ggPiBjcnRjLndpZHRoKSB7CiAJCQl2 aXNpYmxlID0gZmFsc2U7CiAJCQlicmVhazsKZGlmZiAtLWdpdCBhL2xpYi9pZ3Rfa21zLmggYi9s aWIvaWd0X2ttcy5oCmluZGV4IGE2YTBkMGM0Li42MzU3MDJiNiAxMDA2NDQKLS0tIGEvbGliL2ln dF9rbXMuaAorKysgYi9saWIvaWd0X2ttcy5oCkBAIC0xMzUsOCArMTM1LDggQEAgc3RydWN0IGtt c3Rlc3RfY29ubmVjdG9yX2NvbmZpZyB7CiAKIHN0cnVjdCBrbXN0ZXN0X3BsYW5lIHsKIAlpbnQg aWQ7Ci0JaW50IHBsYW5lOwogCWludCBpbmRleDsKKwlpbnQgdHlwZTsKIAlpbnQgcG9zX3g7CiAJ aW50IHBvc195OwogCWludCB3aWR0aDsKQEAgLTE1MCw3ICsxNTAsNyBAQCBzdHJ1Y3Qga21zdGVz dF9jcnRjIHsKIAlpbnQgd2lkdGg7CiAJaW50IGhlaWdodDsKIAlpbnQgbnBsYW5lczsKLQlzdHJ1 Y3Qga21zdGVzdF9wbGFuZSBwbGFuZVtJR1RfTUFYX1BMQU5FU107CisJc3RydWN0IGttc3Rlc3Rf cGxhbmUgKnBsYW5lOwogfTsKIAogLyoqCi0tIAoyLjExLjAuNDUzLmc3ODdmNzVmMDUKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWls aW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=