From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: [PATCH i-g-t v2 02/33] lib/igt_kms: Avoid depencency on static plane count Date: Tue, 24 Jan 2017 18:33:29 -0500 Message-ID: <20170124233400.5053-3-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 6B04F6E88D for ; Tue, 24 Jan 2017 23:34:33 +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 UmV3b3JrIGttc3Rlc3RfY3J0YyBhbmQga21zdGVzdF9wbGFuZSBzdHJ1Y3RzIGFuZCB0aGVpciB1 c2FnZQp0byBub3QgZGVwZW5kIG9uIGEgc3RhdGljIHBsYW5lIGNvdW50LgoKU2lnbmVkLW9mZi1i eTogUm9iZXJ0IEZvc3MgPHJvYmVydC5mb3NzQGNvbGxhYm9yYS5jb20+Ci0tLQogbGliL2lndF9r bXMuYyB8IDQ3ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0t CiBsaWIvaWd0X2ttcy5oIHwgIDQgKystLQogMiBmaWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25z KCspLCAxOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWIvaWd0X2ttcy5jIGIvbGliL2ln dF9rbXMuYwppbmRleCBlMWFiY2YwZC4uOTIyYmJhNjMgMTAwNjQ0Ci0tLSBhL2xpYi9pZ3Rfa21z LmMKKysrIGIvbGliL2lndF9rbXMuYwpAQCAtMTIyNyw3ICsxMjI3LDcgQEAgc3RhdGljIHZvaWQg Z2V0X3BsYW5lKGNoYXIgKnN0ciwgaW50IHR5cGUsIHN0cnVjdCBrbXN0ZXN0X3BsYW5lICpwbGFu ZSkKIAlpbnQgcmV0OwogCWNoYXIgYnVmWzI1Nl07CiAKLQlwbGFuZS0+cGxhbmUgPSB0eXBlOwor CXBsYW5lLT50eXBlID0gdHlwZTsKIAlyZXQgPSBzc2NhbmYoc3RyICsgMTIsICIlZCUqYyAlKnMg JVtebl1zIiwKIAkJICAgICAmcGxhbmUtPmlkLAogCQkgICAgIGJ1Zik7CkBAIC0xMjQwLDMxICsx MjQwLDM2IEBAIHN0YXRpYyB2b2lkIGdldF9wbGFuZShjaGFyICpzdHIsIGludCB0eXBlLCBzdHJ1 Y3Qga21zdGVzdF9wbGFuZSAqcGxhbmUpCiAJaWd0X2Fzc2VydF9lcShyZXQsIDIpOwogfQogCi1z dGF0aWMgaW50IHBhcnNlX3BsYW5lcyhGSUxFICpmaWQsIHN0cnVjdCBrbXN0ZXN0X3BsYW5lICpw bGFuZSkKK3N0YXRpYyBpbnQgcGFyc2VfcGxhbmVzKEZJTEUgKmZpZCwgc3RydWN0IGttc3Rlc3Rf cGxhbmUgKnBsYW5lcykKIHsKIAljaGFyIHRtcFsyNTZdOwotCWludCBucGxhbmVzOworCWludCBu X3BsYW5lczsKIAotCW5wbGFuZXMgPSAwOworCW5fcGxhbmVzID0gMDsKIAl3aGlsZSAoZmdldHMo dG1wLCAyNTYsIGZpZCkgIT0gTlVMTCkgewotCQlpZ3RfYXNzZXJ0X25lcShucGxhbmVzLCBJR1Rf TUFYX1BMQU5FUyk7CiAJCWlmIChzdHJzdHIodG1wLCAidHlwZT1QUkkiKSAhPSBOVUxMKSB7Ci0J CQlnZXRfcGxhbmUodG1wLCBEUk1fUExBTkVfVFlQRV9QUklNQVJZLCAmcGxhbmVbbnBsYW5lc10p OwotCQkJcGxhbmVbbnBsYW5lc10uaW5kZXggPSBucGxhbmVzOwotCQkJbnBsYW5lcysrOworCQkJ aWYgKHBsYW5lcykgeworCQkJCWdldF9wbGFuZSh0bXAsIERSTV9QTEFORV9UWVBFX1BSSU1BUlks ICZwbGFuZXNbbl9wbGFuZXNdKTsKKwkJCQlwbGFuZXNbbl9wbGFuZXNdLmluZGV4ID0gbl9wbGFu ZXM7CisJCQl9CisJCQluX3BsYW5lcysrOwogCQl9IGVsc2UgaWYgKHN0cnN0cih0bXAsICJ0eXBl PU9WTCIpICE9IE5VTEwpIHsKLQkJCWdldF9wbGFuZSh0bXAsIERSTV9QTEFORV9UWVBFX09WRVJM QVksICZwbGFuZVtucGxhbmVzXSk7Ci0JCQlwbGFuZVtucGxhbmVzXS5pbmRleCA9IG5wbGFuZXM7 Ci0JCQlucGxhbmVzKys7CisJCQlpZiAocGxhbmVzKSB7CisJCQkJZ2V0X3BsYW5lKHRtcCwgRFJN X1BMQU5FX1RZUEVfT1ZFUkxBWSwgJnBsYW5lc1tuX3BsYW5lc10pOworCQkJCXBsYW5lc1tuX3Bs YW5lc10uaW5kZXggPSBuX3BsYW5lczsKKwkJCX0KKwkJCW5fcGxhbmVzKys7CiAJCX0gZWxzZSBp ZiAoc3Ryc3RyKHRtcCwgInR5cGU9Q1VSIikgIT0gTlVMTCkgewotCQkJZ2V0X3BsYW5lKHRtcCwg RFJNX1BMQU5FX1RZUEVfQ1VSU09SLCAmcGxhbmVbbnBsYW5lc10pOwotCQkJcGxhbmVbbnBsYW5l c10uaW5kZXggPSBucGxhbmVzOwotCQkJbnBsYW5lcysrOworCQkJaWYgKHBsYW5lcykgeworCQkJ CWdldF9wbGFuZSh0bXAsIERSTV9QTEFORV9UWVBFX0NVUlNPUiwgJnBsYW5lc1tuX3BsYW5lc10p OworCQkJCXBsYW5lc1tuX3BsYW5lc10uaW5kZXggPSBuX3BsYW5lczsKKwkJCX0KKwkJCW5fcGxh bmVzKys7CiAJCQlicmVhazsKIAkJfQogCX0KIAotCXJldHVybiBucGxhbmVzOworCXJldHVybiBu X3BsYW5lczsKIH0KIAogc3RhdGljIHZvaWQgcGFyc2VfY3J0YyhjaGFyICppbmZvLCBzdHJ1Y3Qg a21zdGVzdF9jcnRjICpjcnRjKQpAQCAtMTMwNCw3ICsxMzA5LDEyIEBAIHZvaWQga21zdGVzdF9n ZXRfY3J0YyhlbnVtIHBpcGUgcGlwZSwgc3RydWN0IGttc3Rlc3RfY3J0YyAqY3J0YykKIAkJCWlm IChzdHJzdHIodG1wLCAiYWN0aXZlPXllcyIpICE9IE5VTEwpIHsKIAkJCQljcnRjLT5hY3RpdmUg PSB0cnVlOwogCQkJCXBhcnNlX2NydGModG1wLCBjcnRjKTsKLQkJCQljcnRjLT5ucGxhbmVzID0g cGFyc2VfcGxhbmVzKGZpZCwgY3J0Yy0+cGxhbmUpOworCisJCQkJY3J0Yy0+bnBsYW5lcyA9IHBh cnNlX3BsYW5lcyhmaWQsIE5VTEwpOworCQkJCWNydGMtPnBsYW5lID0gY2FsbG9jKGNydGMtPm5w bGFuZXMsIHNpemVvZigqY3J0Yy0+cGxhbmUpKTsKKwkJCQlmc2VlayhmaWQsIDAsIFNFRUtfRU5E KTsKKwkJCQlmc2VlayhmaWQsIDAsIFNFRUtfU0VUKTsKKwkJCQlwYXJzZV9wbGFuZXMoZmlkLCBj cnRjLT5wbGFuZSk7CiAKIAkJCQlpZiAoY3J0Yy0+cGlwZSAhPSBwaXBlKQogCQkJCQljcnRjID0g TlVMTDsKQEAgLTEzMzAsNyArMTM0MCwxMCBAQCB2b2lkIGlndF9hc3NlcnRfcGxhbmVfdmlzaWJs ZShlbnVtIHBpcGUgcGlwZSwgYm9vbCB2aXNpYmlsaXR5KQogCWttc3Rlc3RfZ2V0X2NydGMocGlw ZSwgJmNydGMpOwogCiAJdmlzaWJsZSA9IHRydWU7Ci0JZm9yIChpID0gSUdUX1BMQU5FXzI7IGkg PCBjcnRjLm5wbGFuZXM7IGkrKykgeworCWZvciAoaSA9IDA7IGkgPCBjcnRjLm5wbGFuZXM7IGkr KykgeworCQlpZiAoY3J0Yy5wbGFuZVtpXS50eXBlID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkp CisJCQljb250aW51ZTsKKwogCQlpZiAoY3J0Yy5wbGFuZVtpXS5wb3NfeCA+IGNydGMud2lkdGgp IHsKIAkJCXZpc2libGUgPSBmYWxzZTsKIAkJCWJyZWFrOwpkaWZmIC0tZ2l0IGEvbGliL2lndF9r bXMuaCBiL2xpYi9pZ3Rfa21zLmgKaW5kZXggMTk4MTc0YzIuLjVlYjQ5YWIzIDEwMDY0NAotLS0g YS9saWIvaWd0X2ttcy5oCisrKyBiL2xpYi9pZ3Rfa21zLmgKQEAgLTEzNSw4ICsxMzUsOCBAQCBz dHJ1Y3Qga21zdGVzdF9jb25uZWN0b3JfY29uZmlnIHsKIAogc3RydWN0IGttc3Rlc3RfcGxhbmUg ewogCWludCBpZDsKLQlpbnQgcGxhbmU7CiAJaW50IGluZGV4OworCWludCB0eXBlOwogCWludCBw b3NfeDsKIAlpbnQgcG9zX3k7CiAJaW50IHdpZHRoOwpAQCAtMTUwLDcgKzE1MCw3IEBAIHN0cnVj dCBrbXN0ZXN0X2NydGMgewogCWludCB3aWR0aDsKIAlpbnQgaGVpZ2h0OwogCWludCBucGxhbmVz OwotCXN0cnVjdCBrbXN0ZXN0X3BsYW5lIHBsYW5lW0lHVF9NQVhfUExBTkVTXTsKKwlzdHJ1Y3Qg a21zdGVzdF9wbGFuZSAqcGxhbmU7CiB9OwogCiAvKioKLS0gCjIuMTEuMC40NTMuZzc4N2Y3NWYw NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==