From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: [PATCH i-g-t rfc 09/29] tests/kms_cursor_legacy: Add support for dynamic number of planes Date: Wed, 11 Jan 2017 15:41:44 -0500 Message-ID: <20170111204204.7727-10-robert.foss@collabora.com> References: <20170111204204.7727-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 04DB36EA12 for ; Wed, 11 Jan 2017 20:42:28 +0000 (UTC) In-Reply-To: <20170111204204.7727-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 List-Id: intel-gfx@lists.freedesktop.org QWRkIGNoYW5nZXMgcmVmbGVjdGluZyB0aGUgbmV3IHN1cHBvcnQgZm9yIGR5bmFtaWMgbnVtYmVy IG9mIHBsYW5lcyBwZXIgcGlwZS4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQu Zm9zc0Bjb2xsYWJvcmEuY29tPgotLS0KIHRlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMgfCAzMCAr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRp b25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfY3Vyc29yX2xl Z2FjeS5jIGIvdGVzdHMva21zX2N1cnNvcl9sZWdhY3kuYwppbmRleCA0MDIyMDk3MC4uZGNlYzk4 MzQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMKKysrIGIvdGVzdHMva21z X2N1cnNvcl9sZWdhY3kuYwpAQCAtMTY2LDcgKzE2Niw3IEBAIHN0YXRpYyBpZ3Rfb3V0cHV0X3Qg KnNldF9mYl9vbl9jcnRjKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGludCBwaXBlLCBzdHJ1Y3Qg aWd0CiAJCQkgICAgICBtb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCiAJCQkgICAgICBE Uk1fRk9STUFUX1hSR0I4ODg4LCBJOTE1X1RJTElOR19OT05FLCBmYl9pbmZvKTsKIAotCQlwcmlt YXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0LCBJR1RfUExBTkVfUFJJTUFSWSk7CisJ CXByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZ UEVfUFJJTUFSWSk7CiAJCWlndF9wbGFuZV9zZXRfZmIocHJpbWFyeSwgZmJfaW5mbyk7CiAKIAkJ cmV0dXJuIG91dHB1dDsKQEAgLTE4MCw3ICsxODAsNyBAQCBzdGF0aWMgdm9pZCBzZXRfY3Vyc29y X29uX3BpcGUoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsIHN0cnVjdCBp ZwogCWlndF9wbGFuZV90ICpwbGFuZSwgKmN1cnNvciA9IE5VTEw7CiAKIAlmb3JfZWFjaF9wbGFu ZV9vbl9waXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKSB7Ci0JCWlmICghcGxhbmUtPmlzX2N1cnNv cikKKwkJaWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCWNvbnRp bnVlOwogCiAJCWN1cnNvciA9IHBsYW5lOwpAQCAtMjUwLDEzICsyNTAsMTQgQEAgc3RhdGljIGVu dW0gcGlwZSBmaW5kX2Nvbm5lY3RlZF9waXBlKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGJvb2wg c2Vjb25kKQogCXJldHVybiBwaXBlOwogfQogCi1zdGF0aWMgdm9pZCBmbGlwX25vbmJsb2NraW5n KGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLCBib29sIGF0b21pYywgc3Ry dWN0IGlndF9mYiAqZmIpCitzdGF0aWMgdm9pZCBmbGlwX25vbmJsb2NraW5nKGlndF9kaXNwbGF5 X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlX2lkLCBib29sIGF0b21pYywgc3RydWN0IGlndF9m YiAqZmIpCiB7Ci0JaWd0X3BsYW5lX3QgKnByaW1hcnkgPSAmZGlzcGxheS0+cGlwZXNbcGlwZV0u cGxhbmVzW0lHVF9QTEFORV9QUklNQVJZXTsKKwlpZ3RfcGlwZV90ICpwaXBlID0gJmRpc3BsYXkt PnBpcGVzW3BpcGVfaWRdOworCWlndF9wbGFuZV90ICpwcmltYXJ5ID0gaWd0X3BpcGVfZ2V0X3Bs YW5lX3R5cGUocGlwZSwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAKIAlpZiAoIWF0b21pYykg ewogCQkvKiBTY2hlZHVsZSBhIG5vbmJsb2NraW5nIGZsaXAgZm9yIHRoZSBuZXh0IHZibGFuayAq LwotCQlkb19vcl9kaWUoZHJtTW9kZVBhZ2VGbGlwKGRpc3BsYXktPmRybV9mZCwgZGlzcGxheS0+ cGlwZXNbcGlwZV0uY3J0Y19pZCwgZmItPmZiX2lkLAorCQlkb19vcl9kaWUoZHJtTW9kZVBhZ2VG bGlwKGRpc3BsYXktPmRybV9mZCwgcGlwZS0+Y3J0Y19pZCwgZmItPmZiX2lkLAogCQkJCQlEUk1f TU9ERV9QQUdFX0ZMSVBfRVZFTlQsIGZiKSk7CiAJfSBlbHNlIHsKIAkJaWd0X3BsYW5lX3NldF9m YihwcmltYXJ5LCBmYik7CkBAIC0yODMsMTIgKzI4NCwxMyBAQCBzdGF0aWMgYm9vbCBjdXJzb3Jf c2xvd3BhdGgoZW51bSBmbGlwX3Rlc3QgbW9kZSkKIAlyZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGlj IHZvaWQgdHJhbnNpdGlvbl9ub25ibG9ja2luZyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBlbnVt IHBpcGUgcGlwZSwKK3N0YXRpYyB2b2lkIHRyYW5zaXRpb25fbm9uYmxvY2tpbmcoaWd0X2Rpc3Bs YXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGVfaWQsCiAJCQkJICAgc3RydWN0IGlndF9mYiAq cHJpbV9mYiwgc3RydWN0IGlndF9mYiAqYXJnYl9mYiwKIAkJCQkgICBib29sIGhpZGVfc3ByaXRl KQogewotCWlndF9wbGFuZV90ICpwcmltYXJ5ID0gJmRpc3BsYXktPnBpcGVzW3BpcGVdLnBsYW5l c1tJR1RfUExBTkVfUFJJTUFSWV07Ci0JaWd0X3BsYW5lX3QgKnNwcml0ZSA9ICZkaXNwbGF5LT5w aXBlc1twaXBlXS5wbGFuZXNbSUdUX1BMQU5FXzJdOworCWlndF9waXBlX3QgKnBpcGUgPSAmZGlz cGxheS0+cGlwZXNbcGlwZV9pZF07CisJaWd0X3BsYW5lX3QgKnByaW1hcnkgPSBpZ3RfcGlwZV9n ZXRfcGxhbmVfdHlwZShwaXBlLCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwlpZ3RfcGxhbmVf dCAqc3ByaXRlID0gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUocGlwZSwgRFJNX1BMQU5FX1RZUEVf T1ZFUkxBWSk7CiAKIAlpZiAoaGlkZV9zcHJpdGUpIHsKIAkJaWd0X3BsYW5lX3NldF9mYihwcmlt YXJ5LCBwcmltX2ZiKTsKQEAgLTM0NSw3ICszNDcsNyBAQCBzdGF0aWMgdm9pZCBwcmVwYXJlX2Zs aXBfdGVzdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LAogCWlmIChtb2RlID09IGZsaXBfdGVzdF9h dG9taWNfdHJhbnNpdGlvbnMgfHwKIAkgICAgbW9kZSA9PSBmbGlwX3Rlc3RfYXRvbWljX3RyYW5z aXRpb25zX3Zhcnlpbmdfc2l6ZSkgewogCQlpZ3RfcmVxdWlyZShkaXNwbGF5LT5waXBlc1tmbGlw X3BpcGVdLm5fcGxhbmVzID4gMSAmJgotCQkJICAgICFkaXNwbGF5LT5waXBlc1tmbGlwX3BpcGVd LnBsYW5lc1tJR1RfUExBTkVfMl0uaXNfY3Vyc29yKTsKKwkJICAgICAgICAgICAgZGlzcGxheS0+ cGlwZXNbZmxpcF9waXBlXS5wbGFuZXNbMV0udHlwZSAhPSBEUk1fUExBTkVfVFlQRV9DVVJTT1Ip OwogCiAJCWlndF9jcmVhdGVfY29sb3JfcGF0dGVybl9mYihkaXNwbGF5LT5kcm1fZmQsIHByaW1f ZmItPndpZHRoLCBwcmltX2ZiLT5oZWlnaHQsCiAJCQkJCSAgICBEUk1fRk9STUFUX0FSR0I4ODg4 LCAwLCAuMSwgLjEsIC4xLCBhcmdiX2ZiKTsKQEAgLTc5NCw3ICs3OTYsNyBAQCBzdGF0aWMgdm9p ZCBub25ibG9ja2luZ19tb2Rlc2V0X3ZzX2N1cnNvcihpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBp bnQgbG9vcHMpCiAJYXJnWzBdLmZsYWdzIHw9IERSTV9NT0RFX0NVUlNPUl9CTzsKIAogCWZvcl9l YWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKLQkJaWYgKCFwbGFuZS0+ aXNfY3Vyc29yKQorCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SKQog CQkJY29udGludWU7CiAKIAkJY3Vyc29yID0gcGxhbmU7CkBAIC0xMjQwLDYgKzEyNDIsOCBAQCBz dGF0aWMgdm9pZCBmbGlwX3ZzX2N1cnNvcl9idXN5X2NyYyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5 LCBib29sIGF0b21pYykKIAl1bnNpZ25lZCB2Ymxhbmtfc3RhcnQ7CiAJZW51bSBwaXBlIHBpcGUg PSBmaW5kX2Nvbm5lY3RlZF9waXBlKGRpc3BsYXksIGZhbHNlKTsKIAlpZ3RfcGlwZV9jcmNfdCAq cGlwZV9jcmM7CisJaWd0X3BpcGVfdCAqcGlwZV9jb25uZWN0ZWQgPSAmZGlzcGxheS0+cGlwZXNb cGlwZV07CisJaWd0X3BsYW5lX3QgKnBsYW5lX3ByaW1hcnkgPSBpZ3RfcGlwZV9nZXRfcGxhbmVf dHlwZShwaXBlX2Nvbm5lY3RlZCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAJaWd0X2NyY190 IGNyY3NbM107CiAKIAlpZiAoYXRvbWljKQpAQCAtMTI3MSwxMCArMTI3NSwxMCBAQCBzdGF0aWMg dm9pZCBmbGlwX3ZzX2N1cnNvcl9idXN5X2NyYyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBib29s IGF0b21pYykKIAkgICogc2V0dGluZyB0aGUgY29ycmVjdCBjYWNoZSBsZXZlbCwgZWxzZSB3ZSBn ZXQgYSBzdGFsbCBpbiB0aGUKIAkgICogcGFnZSBmbGlwIGhhbmRsZXIuCiAJICAqLwotCWlndF9w bGFuZV9zZXRfZmIoJmRpc3BsYXktPnBpcGVzW3BpcGVdLnBsYW5lc1tJR1RfUExBTkVfUFJJTUFS WV0sICZmYl9pbmZvWzFdKTsKKwlpZ3RfcGxhbmVfc2V0X2ZiKHBsYW5lX3ByaW1hcnksICZmYl9p bmZvWzFdKTsKIAlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9VTklWRVJTQUwp OwogCi0JaWd0X3BsYW5lX3NldF9mYigmZGlzcGxheS0+cGlwZXNbcGlwZV0ucGxhbmVzW0lHVF9Q TEFORV9QUklNQVJZXSwgJmZiX2luZm9bMF0pOworCWlndF9wbGFuZV9zZXRfZmIocGxhbmVfcHJp bWFyeSwgJmZiX2luZm9bMF0pOwogCWlndF9kaXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlU X1VOSVZFUlNBTCk7CiAKIAkvKiBEaXNhYmxlIGN1cnNvciwgYW5kIGltbWVkaWF0ZWx5IHF1ZXVl IGEgZmxpcC4gQ2hlY2sgaWYgcmVzdWx0aW5nIGNyYyBpcyBjb3JyZWN0LiAqLwpAQCAtMTMwMCw3 ICsxMzA0LDcgQEAgc3RhdGljIHZvaWQgZmxpcF92c19jdXJzb3JfYnVzeV9jcmMoaWd0X2Rpc3Bs YXlfdCAqZGlzcGxheSwgYm9vbCBhdG9taWMpCiAKIAkJaWd0X2Fzc2VydF9sdGUodmJsYW5rX3N0 YXJ0ICsgMSwgZ2V0X3ZibGFuayhkaXNwbGF5LT5kcm1fZmQsIHBpcGUsIDApKTsKIAotCQlpZ3Rf cGxhbmVfc2V0X2ZiKCZkaXNwbGF5LT5waXBlc1twaXBlXS5wbGFuZXNbSUdUX1BMQU5FX1BSSU1B UlldLCAmZmJfaW5mb1swXSk7CisJCWlndF9wbGFuZV9zZXRfZmIocGxhbmVfcHJpbWFyeSwgJmZi X2luZm9bMF0pOwogCQlpZ3RfZGlzcGxheV9jb21taXQyKGRpc3BsYXksIENPTU1JVF9VTklWRVJT QUwpOwogCiAJCWlndF9hc3NlcnRfY3JjX2VxdWFsKCZjcmNzW2ldLCAmY3Jjc1syXSk7Ci0tIAoy LjExLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCklu dGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=