From: Robert Foss Subject: [PATCH i-g-t v3 23/33] tests/kms_psr_sink_crc: Add support for dynamic number of planes Date: Mon, 30 Jan 2017 09:12:14 -0500 Message-ID: <20170130141224.25063-24-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 71D306E50F for ; Mon, 30 Jan 2017 14:13:04 +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 QGludGVsLmNvbT4KLS0tCiB0ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMgfCA1MiArKysrKysrKysr KysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAy MyBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS90ZXN0cy9rbXNf cHNyX3NpbmtfY3JjLmMgYi90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKaW5kZXggOTI2Yjg1Nzgu LjhmNmJkYzBkIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKKysrIGIvdGVz dHMva21zX3Bzcl9zaW5rX2NyYy5jCkBAIC0zNCwxMiArMzQsNiBAQCBib29sIHJ1bm5pbmdfd2l0 aF9wc3JfZGlzYWJsZWQ7CiAKICNkZWZpbmUgQ1JDX0JMQUNLICIwMDAwMDAwMDAwMDAiCiAKLWVu dW0gcGxhbmVzIHsKLQlQUklNQVJZLAotCVNQUklURSwKLQlDVVJTT1IsCi19OwotCiBlbnVtIG9w ZXJhdGlvbnMgewogCVBBR0VfRkxJUCwKIAlNTUFQX0dUVCwKQEAgLTY5LDcgKzYzLDcgQEAgc3Rh dGljIGNvbnN0IGNoYXIgKm9wX3N0cihlbnVtIG9wZXJhdGlvbnMgb3ApCiAKIHR5cGVkZWYgc3Ry dWN0IHsKIAlpbnQgZHJtX2ZkOwotCWVudW0gcGxhbmVzIHRlc3RfcGxhbmU7CisJaW50IHRlc3Rf cGxhbmU7CiAJZW51bSBvcGVyYXRpb25zIG9wOwogCXVpbnQzMl90IGRldmlkOwogCXVpbnQzMl90 IGNydGNfaWQ7CkBAIC0zMTMsOSArMzA3LDkgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoZGF0YV90 ICpkYXRhKQogCiAJLyogU2V0dGluZyBhIHNlY29uZGFyeSBmYi9wbGFuZSAqLwogCXN3aXRjaCAo ZGF0YS0+dGVzdF9wbGFuZSkgewotCWNhc2UgUFJJTUFSWTogZGVmYXVsdDogdGVzdF9wbGFuZSA9 IGRhdGEtPnByaW1hcnk7IGJyZWFrOwotCWNhc2UgU1BSSVRFOiB0ZXN0X3BsYW5lID0gZGF0YS0+ c3ByaXRlOyBicmVhazsKLQljYXNlIENVUlNPUjogdGVzdF9wbGFuZSA9IGRhdGEtPmN1cnNvcjsg YnJlYWs7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOiBkZWZhdWx0OiB0ZXN0X3BsYW5l ID0gZGF0YS0+cHJpbWFyeTsgYnJlYWs7CisJY2FzZSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOiB0 ZXN0X3BsYW5lID0gZGF0YS0+c3ByaXRlOyBicmVhazsKKwljYXNlIERSTV9QTEFORV9UWVBFX0NV UlNPUjogdGVzdF9wbGFuZSA9IGRhdGEtPmN1cnNvcjsgYnJlYWs7CiAJfQogCWlndF9wbGFuZV9z ZXRfZmIodGVzdF9wbGFuZSwgJmRhdGEtPmZiX3doaXRlKTsKIAlpZ3RfZGlzcGxheV9jb21taXQo JmRhdGEtPmRpc3BsYXkpOwpAQCAtMzIzLDcgKzMxNyw3IEBAIHN0YXRpYyB2b2lkIHJ1bl90ZXN0 KGRhdGFfdCAqZGF0YSkKIAkvKiBDb25maXJtIGl0IGlzIG5vdCBHcmVlbiBhbnltb3JlICovCiAJ aWd0X2Fzc2VydCh3YWl0X3Bzcl9lbnRyeShkYXRhKSk7CiAJZ2V0X3NpbmtfY3JjKGRhdGEsIHJl Zl9jcmMpOwotCWlmIChkYXRhLT50ZXN0X3BsYW5lID09IFBSSU1BUlkpCisJaWYgKGRhdGEtPnRl c3RfcGxhbmUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkKIAkJYXNzZXJ0X29yX21hbnVhbCgh aXNfZ3JlZW4ocmVmX2NyYyksICJzY3JlZW4gV0hJVEUiKTsKIAllbHNlCiAJCWFzc2VydF9vcl9t YW51YWwoIWlzX2dyZWVuKHJlZl9jcmMpLCAiR1JFRU4gYmFja2dyb3VuZCB3aXRoIFdISVRFIGJv eCIpOwpAQCAtMzU1LDcgKzM0OSw3IEBAIHN0YXRpYyB2b2lkIHJ1bl90ZXN0KGRhdGFfdCAqZGF0 YSkKIAkJLyogUHJpbnRpbmcgd2hpdGUgb24gd2hpdGUgc28gdGhlIHNjcmVlbiBzaG91bGRuJ3Qg Y2hhbmdlICovCiAJCW1lbXNldChwdHIsIDB4ZmYsIGRhdGEtPm1vZF9zaXplKTsKIAkJZ2V0X3Np bmtfY3JjKGRhdGEsIGNyYyk7Ci0JCWlmIChkYXRhLT50ZXN0X3BsYW5lID09IFBSSU1BUlkpCisJ CWlmIChkYXRhLT50ZXN0X3BsYW5lID09IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpCiAJCQlhc3Nl cnRfb3JfbWFudWFsKHN0cmNtcChyZWZfY3JjLCBjcmMpID09IDAsICJzY3JlZW4gV0hJVEUiKTsK IAkJZWxzZQogCQkJYXNzZXJ0X29yX21hbnVhbChzdHJjbXAocmVmX2NyYywgY3JjKSA9PSAwLApA QCAtNDA2LDkgKzQwMCw5IEBAIHN0YXRpYyB2b2lkIHJ1bl90ZXN0KGRhdGFfdCAqZGF0YSkKIAog c3RhdGljIHZvaWQgdGVzdF9jbGVhbnVwKGRhdGFfdCAqZGF0YSkgewogCWlndF9wbGFuZV9zZXRf ZmIoZGF0YS0+cHJpbWFyeSwgTlVMTCk7Ci0JaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gU1BSSVRF KQorCWlmIChkYXRhLT50ZXN0X3BsYW5lID09IERSTV9QTEFORV9UWVBFX09WRVJMQVkpCiAJCWln dF9wbGFuZV9zZXRfZmIoZGF0YS0+c3ByaXRlLCBOVUxMKTsKLQlpZiAoZGF0YS0+dGVzdF9wbGFu ZSA9PSBDVVJTT1IpCisJaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gRFJNX1BMQU5FX1RZUEVfQ1VS U09SKQogCQlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPmN1cnNvciwgTlVMTCk7CiAKIAlpZ3RfZGlz cGxheV9jb21taXQoJmRhdGEtPmRpc3BsYXkpOwpAQCAtNDI4LDcgKzQyMiw3IEBAIHN0YXRpYyB2 b2lkIHNldHVwX3Rlc3RfcGxhbmUoZGF0YV90ICpkYXRhKQogCQkJICAgIDAuMCwgMS4wLCAwLjAs CiAJCQkgICAgJmRhdGEtPmZiX2dyZWVuKTsKIAotCWRhdGEtPnByaW1hcnkgPSBpZ3Rfb3V0cHV0 X2dldF9wbGFuZShkYXRhLT5vdXRwdXQsIElHVF9QTEFORV9QUklNQVJZKTsKKwlkYXRhLT5wcmlt YXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShkYXRhLT5vdXRwdXQsIERSTV9QTEFORV9U WVBFX1BSSU1BUlkpOwogCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cHJpbWFyeSwgTlVMTCk7CiAK IAl3aGl0ZV9oID0gZGF0YS0+bW9kZS0+aGRpc3BsYXk7CkBAIC00MzksMTYgKzQzMywxNiBAQCBz dGF0aWMgdm9pZCBzZXR1cF90ZXN0X3BsYW5lKGRhdGFfdCAqZGF0YSkKIAlkYXRhLT5tb2Rfc3Ry aWRlID0gd2hpdGVfaCAqIDQ7CiAKIAlzd2l0Y2ggKGRhdGEtPnRlc3RfcGxhbmUpIHsKLQljYXNl IFNQUklURToKLQkJZGF0YS0+c3ByaXRlID0gaWd0X291dHB1dF9nZXRfcGxhbmUoZGF0YS0+b3V0 cHV0LAotCQkJCQkJICAgIElHVF9QTEFORV8yKTsKKwljYXNlIERSTV9QTEFORV9UWVBFX09WRVJM QVk6CisJCWRhdGEtPnNwcml0ZSA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lX3R5cGUoZGF0YS0+b3V0 cHV0LAorCQkJCQkJICAgIERSTV9QTEFORV9UWVBFX09WRVJMQVkpOwogCQlpZ3RfcGxhbmVfc2V0 X2ZiKGRhdGEtPnNwcml0ZSwgTlVMTCk7CiAJCS8qIFRvIG1ha2UgaXQgZGlmZmVyZW50IGZvciBo dW1hbiBleWVzIGxldCdzIG1ha2UKIAkJICogc3ByaXRlIHZpc2libGUgaW4gb25seSBvbmUgcXVh cnRlciBvZiB0aGUgcHJpbWFyeQogCQkgKi8KIAkJd2hpdGVfaCA9IHdoaXRlX2gvMjsKIAkJd2hp dGVfdiA9IHdoaXRlX3YvMjsKLQljYXNlIFBSSU1BUlk6CisJY2FzZSBEUk1fUExBTkVfVFlQRV9Q UklNQVJZOgogCQlpZ3RfY3JlYXRlX2NvbG9yX2ZiKGRhdGEtPmRybV9mZCwKIAkJCQkgICAgd2hp dGVfaCwgd2hpdGVfdiwKIAkJCQkgICAgRFJNX0ZPUk1BVF9YUkdCODg4OCwKQEAgLTQ1Niw5ICs0 NTAsOSBAQCBzdGF0aWMgdm9pZCBzZXR1cF90ZXN0X3BsYW5lKGRhdGFfdCAqZGF0YSkKIAkJCQkg ICAgMS4wLCAxLjAsIDEuMCwKIAkJCQkgICAgJmRhdGEtPmZiX3doaXRlKTsKIAkJYnJlYWs7Ci0J Y2FzZSBDVVJTT1I6Ci0JCWRhdGEtPmN1cnNvciA9IGlndF9vdXRwdXRfZ2V0X3BsYW5lKGRhdGEt Pm91dHB1dCwKLQkJCQkJCSAgICBJR1RfUExBTkVfQ1VSU09SKTsKKwljYXNlIERSTV9QTEFORV9U WVBFX0NVUlNPUjoKKwkJZGF0YS0+Y3Vyc29yID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShk YXRhLT5vdXRwdXQsCisJCQkJCQkgICAgRFJNX1BMQU5FX1RZUEVfQ1VSU09SKTsKIAkJaWd0X3Bs YW5lX3NldF9mYihkYXRhLT5jdXJzb3IsIE5VTEwpOwogCQljcmVhdGVfY3Vyc29yX2ZiKGRhdGEp OwogCQlpZ3RfcGxhbmVfc2V0X3Bvc2l0aW9uKGRhdGEtPmN1cnNvciwgMCwgMCk7CkBAIC01MzUs NyArNTI5LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogCWZvciAob3Ag PSBQQUdFX0ZMSVA7IG9wIDw9IFJFTkRFUjsgb3ArKykgewogCQlpZ3Rfc3VidGVzdF9mKCJwcmlt YXJ5XyVzIiwgb3Bfc3RyKG9wKSkgewotCQkJZGF0YS50ZXN0X3BsYW5lID0gUFJJTUFSWTsKKwkJ CWRhdGEudGVzdF9wbGFuZSA9IERSTV9QTEFORV9UWVBFX1BSSU1BUlk7CiAJCQlkYXRhLm9wID0g b3A7CiAJCQlzZXR1cF90ZXN0X3BsYW5lKCZkYXRhKTsKIAkJCWlndF9hc3NlcnQod2FpdF9wc3Jf ZW50cnkoJmRhdGEpKTsKQEAgLTU0Niw3ICs1NDAsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hh ciAqYXJndltdKQogCiAJZm9yIChvcCA9IE1NQVBfR1RUOyBvcCA8PSBQTEFORV9PTk9GRjsgb3Ar KykgewogCQlpZ3Rfc3VidGVzdF9mKCJzcHJpdGVfJXMiLCBvcF9zdHIob3ApKSB7Ci0JCQlkYXRh LnRlc3RfcGxhbmUgPSBTUFJJVEU7CisJCQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1fUExBTkVfVFlQ RV9PVkVSTEFZOwogCQkJZGF0YS5vcCA9IG9wOwogCQkJc2V0dXBfdGVzdF9wbGFuZSgmZGF0YSk7 CiAJCQlpZ3RfYXNzZXJ0KHdhaXRfcHNyX2VudHJ5KCZkYXRhKSk7CkBAIC01NTcsNyArNTUxLDcg QEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogCWZvciAob3AgPSBNTUFQX0dU VDsgb3AgPD0gUExBTkVfT05PRkY7IG9wKyspIHsKIAkJaWd0X3N1YnRlc3RfZigiY3Vyc29yXyVz Iiwgb3Bfc3RyKG9wKSkgewotCQkJZGF0YS50ZXN0X3BsYW5lID0gQ1VSU09SOworCQkJZGF0YS50 ZXN0X3BsYW5lID0gRFJNX1BMQU5FX1RZUEVfQ1VSU09SOwogCQkJZGF0YS5vcCA9IG9wOwogCQkJ c2V0dXBfdGVzdF9wbGFuZSgmZGF0YSk7CiAJCQlpZ3RfYXNzZXJ0KHdhaXRfcHNyX2VudHJ5KCZk YXRhKSk7CkBAIC01NjcsNyArNTYxLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3Zb XSkKIAl9CiAKIAlpZ3Rfc3VidGVzdF9mKCJkcG1zX29mZl9wc3JfYWN0aXZlIikgewotCQlkYXRh LnRlc3RfcGxhbmUgPSBQUklNQVJZOworCQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1fUExBTkVfVFlQ RV9QUklNQVJZOwogCQlkYXRhLm9wID0gUkVOREVSOwogCQlzZXR1cF90ZXN0X3BsYW5lKCZkYXRh KTsKIAkJaWd0X2Fzc2VydCh3YWl0X3Bzcl9lbnRyeSgmZGF0YSkpOwpAQCAtNTc5LDcgKzU3Myw3 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJfQogCiAJaWd0X3N1YnRlc3Rf ZigiZHBtc19vZmZfcHNyX2V4aXQiKSB7Ci0JCWRhdGEudGVzdF9wbGFuZSA9IFNQUklURTsKKwkJ ZGF0YS50ZXN0X3BsYW5lID0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWTsKIAkJZGF0YS5vcCA9IFBM QU5FX09OT0ZGOwogCQlzZXR1cF90ZXN0X3BsYW5lKCZkYXRhKTsKIApAQCAtNTkxLDcgKzU4NSw3 IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJfQogCiAJaWd0X3N1YnRlc3Rf Zigic3VzcGVuZF9wc3JfYWN0aXZlIikgewotCQlkYXRhLnRlc3RfcGxhbmUgPSBQUklNQVJZOwor CQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1fUExBTkVfVFlQRV9QUklNQVJZOwogCQlkYXRhLm9wID0g UEFHRV9GTElQOwogCQlzZXR1cF90ZXN0X3BsYW5lKCZkYXRhKTsKIAkJaWd0X2Fzc2VydCh3YWl0 X3Bzcl9lbnRyeSgmZGF0YSkpOwpAQCAtNjA0LDcgKzU5OCw3IEBAIGludCBtYWluKGludCBhcmdj LCBjaGFyICphcmd2W10pCiAJfQogCiAJaWd0X3N1YnRlc3RfZigic3VzcGVuZF9wc3JfZXhpdCIp IHsKLQkJZGF0YS50ZXN0X3BsYW5lID0gQ1VSU09SOworCQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1f UExBTkVfVFlQRV9DVVJTT1I7CiAJCWRhdGEub3AgPSBQTEFORV9PTk9GRjsKIAkJc2V0dXBfdGVz dF9wbGFuZSgmZGF0YSk7CiAKLS0gCjIuMTEuMC40NTMuZzc4N2Y3NWYwNQoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlz dApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg==