From: Robert Foss Subject: [PATCH i-g-t v3 10/33] tests/kms_cursor_legacy: Add support for dynamic number of planes Date: Mon, 30 Jan 2017 09:12:01 -0500 Message-ID: <20170130141224.25063-11-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 [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id C5A976E4BB for ; Mon, 30 Jan 2017 14:12:48 +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 QWRkIGNoYW5nZXMgcmVmbGVjdGluZyB0aGUgbmV3IHN1cHBvcnQgZm9yIGR5bmFtaWMgbnVtYmVy IG9mIHBsYW5lcyBwZXIgcGlwZS4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQu Zm9zc0Bjb2xsYWJvcmEuY29tPgpSZXZpZXdlZC1ieTogTWlrYSBLYWhvbGEgPG1pa2Eua2Fob2xh QGludGVsLmNvbT4KLS0tCiB0ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5jIHwgMzIgKysrKysrKysr KysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCsp LCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfY3Vyc29yX2xlZ2FjeS5j IGIvdGVzdHMva21zX2N1cnNvcl9sZWdhY3kuYwppbmRleCA3MDc1NDZjZC4uYzcwODNhMDcgMTAw NjQ0Ci0tLSBhL3Rlc3RzL2ttc19jdXJzb3JfbGVnYWN5LmMKKysrIGIvdGVzdHMva21zX2N1cnNv cl9sZWdhY3kuYwpAQCAtMTY2LDcgKzE2Niw3IEBAIHN0YXRpYyBpZ3Rfb3V0cHV0X3QgKnNldF9m Yl9vbl9jcnRjKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGludCBwaXBlLCBzdHJ1Y3QgaWd0CiAJ CQkgICAgICBtb2RlLT5oZGlzcGxheSwgbW9kZS0+dmRpc3BsYXksCiAJCQkgICAgICBEUk1fRk9S TUFUX1hSR0I4ODg4LCBJOTE1X1RJTElOR19OT05FLCBmYl9pbmZvKTsKIAotCQlwcmltYXJ5ID0g aWd0X291dHB1dF9nZXRfcGxhbmUob3V0cHV0LCBJR1RfUExBTkVfUFJJTUFSWSk7CisJCXByaW1h cnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJ TUFSWSk7CiAJCWlndF9wbGFuZV9zZXRfZmIocHJpbWFyeSwgZmJfaW5mbyk7CiAKIAkJcmV0dXJu IG91dHB1dDsKQEAgLTE4MCw3ICsxODAsNyBAQCBzdGF0aWMgdm9pZCBzZXRfY3Vyc29yX29uX3Bp cGUoaWd0X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGUsIHN0cnVjdCBpZwogCWln dF9wbGFuZV90ICpwbGFuZSwgKmN1cnNvciA9IE5VTEw7CiAKIAlmb3JfZWFjaF9wbGFuZV9vbl9w aXBlKGRpc3BsYXksIHBpcGUsIHBsYW5lKSB7Ci0JCWlmICghcGxhbmUtPmlzX2N1cnNvcikKKwkJ aWYgKHBsYW5lLT50eXBlICE9IERSTV9QTEFORV9UWVBFX0NVUlNPUikKIAkJCWNvbnRpbnVlOwog CiAJCWN1cnNvciA9IHBsYW5lOwpAQCAtMjUwLDEzICsyNTAsMTQgQEAgc3RhdGljIGVudW0gcGlw ZSBmaW5kX2Nvbm5lY3RlZF9waXBlKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGJvb2wgc2Vjb25k KQogCXJldHVybiBwaXBlOwogfQogCi1zdGF0aWMgdm9pZCBmbGlwX25vbmJsb2NraW5nKGlndF9k aXNwbGF5X3QgKmRpc3BsYXksIGVudW0gcGlwZSBwaXBlLCBib29sIGF0b21pYywgc3RydWN0IGln dF9mYiAqZmIpCitzdGF0aWMgdm9pZCBmbGlwX25vbmJsb2NraW5nKGlndF9kaXNwbGF5X3QgKmRp c3BsYXksIGVudW0gcGlwZSBwaXBlX2lkLCBib29sIGF0b21pYywgc3RydWN0IGlndF9mYiAqZmIp CiB7Ci0JaWd0X3BsYW5lX3QgKnByaW1hcnkgPSAmZGlzcGxheS0+cGlwZXNbcGlwZV0ucGxhbmVz W0lHVF9QTEFORV9QUklNQVJZXTsKKwlpZ3RfcGlwZV90ICpwaXBlID0gJmRpc3BsYXktPnBpcGVz W3BpcGVfaWRdOworCWlndF9wbGFuZV90ICpwcmltYXJ5ID0gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5 cGUocGlwZSwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAKIAlpZiAoIWF0b21pYykgewogCQkv KiBTY2hlZHVsZSBhIG5vbmJsb2NraW5nIGZsaXAgZm9yIHRoZSBuZXh0IHZibGFuayAqLwotCQlk b19vcl9kaWUoZHJtTW9kZVBhZ2VGbGlwKGRpc3BsYXktPmRybV9mZCwgZGlzcGxheS0+cGlwZXNb cGlwZV0uY3J0Y19pZCwgZmItPmZiX2lkLAorCQlkb19vcl9kaWUoZHJtTW9kZVBhZ2VGbGlwKGRp c3BsYXktPmRybV9mZCwgcGlwZS0+Y3J0Y19pZCwgZmItPmZiX2lkLAogCQkJCQlEUk1fTU9ERV9Q QUdFX0ZMSVBfRVZFTlQsIGZiKSk7CiAJfSBlbHNlIHsKIAkJaWd0X3BsYW5lX3NldF9mYihwcmlt YXJ5LCBmYik7CkBAIC0yOTgsMTIgKzI5OSwxMyBAQCBzdGF0aWMgYm9vbCBtb2RlX3JlcXVpcmVz X2V4dHJhX3ZibGFuayhlbnVtIGZsaXBfdGVzdCBtb2RlKQogCXJldHVybiBmYWxzZTsKIH0KIAot c3RhdGljIHZvaWQgdHJhbnNpdGlvbl9ub25ibG9ja2luZyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5 LCBlbnVtIHBpcGUgcGlwZSwKK3N0YXRpYyB2b2lkIHRyYW5zaXRpb25fbm9uYmxvY2tpbmcoaWd0 X2Rpc3BsYXlfdCAqZGlzcGxheSwgZW51bSBwaXBlIHBpcGVfaWQsCiAJCQkJICAgc3RydWN0IGln dF9mYiAqcHJpbV9mYiwgc3RydWN0IGlndF9mYiAqYXJnYl9mYiwKIAkJCQkgICBib29sIGhpZGVf c3ByaXRlKQogewotCWlndF9wbGFuZV90ICpwcmltYXJ5ID0gJmRpc3BsYXktPnBpcGVzW3BpcGVd LnBsYW5lc1tJR1RfUExBTkVfUFJJTUFSWV07Ci0JaWd0X3BsYW5lX3QgKnNwcml0ZSA9ICZkaXNw bGF5LT5waXBlc1twaXBlXS5wbGFuZXNbSUdUX1BMQU5FXzJdOworCWlndF9waXBlX3QgKnBpcGUg PSAmZGlzcGxheS0+cGlwZXNbcGlwZV9pZF07CisJaWd0X3BsYW5lX3QgKnByaW1hcnkgPSBpZ3Rf cGlwZV9nZXRfcGxhbmVfdHlwZShwaXBlLCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKKwlpZ3Rf cGxhbmVfdCAqc3ByaXRlID0gaWd0X3BpcGVfZ2V0X3BsYW5lX3R5cGUocGlwZSwgRFJNX1BMQU5F X1RZUEVfT1ZFUkxBWSk7CiAKIAlpZiAoaGlkZV9zcHJpdGUpIHsKIAkJaWd0X3BsYW5lX3NldF9m YihwcmltYXJ5LCBwcmltX2ZiKTsKQEAgLTM2OSw3ICszNzEsNyBAQCBzdGF0aWMgdm9pZCBwcmVw YXJlX2ZsaXBfdGVzdChpZ3RfZGlzcGxheV90ICpkaXNwbGF5LAogCWlmIChtb2RlID09IGZsaXBf dGVzdF9hdG9taWNfdHJhbnNpdGlvbnMgfHwKIAkgICAgbW9kZSA9PSBmbGlwX3Rlc3RfYXRvbWlj X3RyYW5zaXRpb25zX3Zhcnlpbmdfc2l6ZSkgewogCQlpZ3RfcmVxdWlyZShkaXNwbGF5LT5waXBl c1tmbGlwX3BpcGVdLm5fcGxhbmVzID4gMSAmJgotCQkJICAgICFkaXNwbGF5LT5waXBlc1tmbGlw X3BpcGVdLnBsYW5lc1tJR1RfUExBTkVfMl0uaXNfY3Vyc29yKTsKKwkJICAgICAgICAgICAgZGlz cGxheS0+cGlwZXNbZmxpcF9waXBlXS5wbGFuZXNbMV0udHlwZSAhPSBEUk1fUExBTkVfVFlQRV9D VVJTT1IpOwogCiAJCWlndF9jcmVhdGVfY29sb3JfcGF0dGVybl9mYihkaXNwbGF5LT5kcm1fZmQs IHByaW1fZmItPndpZHRoLCBwcmltX2ZiLT5oZWlnaHQsCiAJCQkJCSAgICBEUk1fRk9STUFUX0FS R0I4ODg4LCAwLCAuMSwgLjEsIC4xLCBhcmdiX2ZiKTsKQEAgLTg2OCw3ICs4NzAsNyBAQCBzdGF0 aWMgdm9pZCBub25ibG9ja2luZ19tb2Rlc2V0X3ZzX2N1cnNvcihpZ3RfZGlzcGxheV90ICpkaXNw bGF5LCBpbnQgbG9vcHMpCiAJYXJnWzBdLmZsYWdzIHw9IERSTV9NT0RFX0NVUlNPUl9CTzsKIAog CWZvcl9lYWNoX3BsYW5lX29uX3BpcGUoZGlzcGxheSwgcGlwZSwgcGxhbmUpIHsKLQkJaWYgKCFw bGFuZS0+aXNfY3Vyc29yKQorCQlpZiAocGxhbmUtPnR5cGUgIT0gRFJNX1BMQU5FX1RZUEVfQ1VS U09SKQogCQkJY29udGludWU7CiAKIAkJY3Vyc29yID0gcGxhbmU7CkBAIC0xMDA4LDcgKzEwMTAs NyBAQCBzdGF0aWMgdm9pZCB0d29fc2NyZWVuc19mbGlwX3ZzX2N1cnNvcihpZ3RfZGlzcGxheV90 ICpkaXNwbGF5LCBpbnQgbmxvb3BzLCBib29sCiAJCQkgKiBpbiB0aGUgc2FtZSBjb21taXQuCiAJ CQkgKi8KIAotCQkJaWd0X3BsYW5lX3NldF9mYihpZ3Rfb3V0cHV0X2dldF9wbGFuZShvdXRwdXQs IElHVF9QTEFORV9QUklNQVJZKSwgJmZiX2luZm8pOworCQkJaWd0X3BsYW5lX3NldF9mYihpZ3Rf b3V0cHV0X2dldF9wbGFuZV90eXBlKG91dHB1dCwgRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSksICZm Yl9pbmZvKTsKIAkJCWlndF9vdXRwdXRfc2V0X3BpcGUob3V0cHV0MiwgKG5sb29wcyAmIDEpID8g UElQRV9OT05FIDogcGlwZTIpOwogCQkJaWd0X2Rpc3BsYXlfY29tbWl0X2F0b21pYyhkaXNwbGF5 LCBEUk1fTU9ERV9BVE9NSUNfQUxMT1dfTU9ERVNFVCB8IERSTV9NT0RFX0FUT01JQ19OT05CTE9D SywgTlVMTCk7CiAJCX0KQEAgLTEzMDgsNiArMTMxMCw4IEBAIHN0YXRpYyB2b2lkIGZsaXBfdnNf Y3Vyc29yX2J1c3lfY3JjKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGJvb2wgYXRvbWljKQogCXVu c2lnbmVkIHZibGFua19zdGFydDsKIAllbnVtIHBpcGUgcGlwZSA9IGZpbmRfY29ubmVjdGVkX3Bp cGUoZGlzcGxheSwgZmFsc2UpOwogCWlndF9waXBlX2NyY190ICpwaXBlX2NyYzsKKwlpZ3RfcGlw ZV90ICpwaXBlX2Nvbm5lY3RlZCA9ICZkaXNwbGF5LT5waXBlc1twaXBlXTsKKwlpZ3RfcGxhbmVf dCAqcGxhbmVfcHJpbWFyeSA9IGlndF9waXBlX2dldF9wbGFuZV90eXBlKHBpcGVfY29ubmVjdGVk LCBEUk1fUExBTkVfVFlQRV9QUklNQVJZKTsKIAlpZ3RfY3JjX3QgY3Jjc1szXTsKIAogCWlmIChh dG9taWMpCkBAIC0xMzM5LDEwICsxMzQzLDEwIEBAIHN0YXRpYyB2b2lkIGZsaXBfdnNfY3Vyc29y X2J1c3lfY3JjKGlndF9kaXNwbGF5X3QgKmRpc3BsYXksIGJvb2wgYXRvbWljKQogCSAgKiBzZXR0 aW5nIHRoZSBjb3JyZWN0IGNhY2hlIGxldmVsLCBlbHNlIHdlIGdldCBhIHN0YWxsIGluIHRoZQog CSAgKiBwYWdlIGZsaXAgaGFuZGxlci4KIAkgICovCi0JaWd0X3BsYW5lX3NldF9mYigmZGlzcGxh eS0+cGlwZXNbcGlwZV0ucGxhbmVzW0lHVF9QTEFORV9QUklNQVJZXSwgJmZiX2luZm9bMV0pOwor CWlndF9wbGFuZV9zZXRfZmIocGxhbmVfcHJpbWFyeSwgJmZiX2luZm9bMV0pOwogCWlndF9kaXNw bGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX1VOSVZFUlNBTCk7CiAKLQlpZ3RfcGxhbmVfc2V0 X2ZiKCZkaXNwbGF5LT5waXBlc1twaXBlXS5wbGFuZXNbSUdUX1BMQU5FX1BSSU1BUlldLCAmZmJf aW5mb1swXSk7CisJaWd0X3BsYW5lX3NldF9mYihwbGFuZV9wcmltYXJ5LCAmZmJfaW5mb1swXSk7 CiAJaWd0X2Rpc3BsYXlfY29tbWl0MihkaXNwbGF5LCBDT01NSVRfVU5JVkVSU0FMKTsKIAogCS8q IERpc2FibGUgY3Vyc29yLCBhbmQgaW1tZWRpYXRlbHkgcXVldWUgYSBmbGlwLiBDaGVjayBpZiBy ZXN1bHRpbmcgY3JjIGlzIGNvcnJlY3QuICovCkBAIC0xMzY4LDcgKzEzNzIsNyBAQCBzdGF0aWMg dm9pZCBmbGlwX3ZzX2N1cnNvcl9idXN5X2NyYyhpZ3RfZGlzcGxheV90ICpkaXNwbGF5LCBib29s IGF0b21pYykKIAogCQlpZ3RfYXNzZXJ0X2x0ZSh2Ymxhbmtfc3RhcnQgKyAxLCBnZXRfdmJsYW5r KGRpc3BsYXktPmRybV9mZCwgcGlwZSwgMCkpOwogCi0JCWlndF9wbGFuZV9zZXRfZmIoJmRpc3Bs YXktPnBpcGVzW3BpcGVdLnBsYW5lc1tJR1RfUExBTkVfUFJJTUFSWV0sICZmYl9pbmZvWzBdKTsK KwkJaWd0X3BsYW5lX3NldF9mYihwbGFuZV9wcmltYXJ5LCAmZmJfaW5mb1swXSk7CiAJCWlndF9k aXNwbGF5X2NvbW1pdDIoZGlzcGxheSwgQ09NTUlUX1VOSVZFUlNBTCk7CiAKIAkJaWd0X2Fzc2Vy dF9jcmNfZXF1YWwoJmNyY3NbaV0sICZjcmNzWzJdKTsKLS0gCjIuMTEuMC40NTMuZzc4N2Y3NWYw NQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwt Z2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8v bGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==