From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Foss Subject: [PATCH i-g-t v2 23/33] tests/kms_psr_sink_crc: Add support for dynamic number of planes Date: Tue, 24 Jan 2017 18:33:50 -0500 Message-ID: <20170124233400.5053-24-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 [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5A7B96E8D0 for ; Tue, 24 Jan 2017 23:34:59 +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 QWRkIGNoYW5nZXMgcmVmbGVjdGluZyB0aGUgbmV3IHN1cHBvcnQgZm9yIGR5bmFtaWMgbnVtYmVy IG9mIHBsYW5lcyBwZXIgcGlwZS4KClNpZ25lZC1vZmYtYnk6IFJvYmVydCBGb3NzIDxyb2JlcnQu Zm9zc0Bjb2xsYWJvcmEuY29tPgotLS0KIHRlc3RzL2ttc19wc3Jfc2lua19jcmMuYyB8IDUyICsr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNo YW5nZWQsIDIzIGluc2VydGlvbnMoKyksIDI5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rl c3RzL2ttc19wc3Jfc2lua19jcmMuYyBiL3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYwppbmRleCA5 MjZiODU3OC4uOGY2YmRjMGQgMTAwNjQ0Ci0tLSBhL3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYwor KysgYi90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKQEAgLTM0LDEyICszNCw2IEBAIGJvb2wgcnVu bmluZ193aXRoX3Bzcl9kaXNhYmxlZDsKIAogI2RlZmluZSBDUkNfQkxBQ0sgIjAwMDAwMDAwMDAw MCIKIAotZW51bSBwbGFuZXMgewotCVBSSU1BUlksCi0JU1BSSVRFLAotCUNVUlNPUiwKLX07Ci0K IGVudW0gb3BlcmF0aW9ucyB7CiAJUEFHRV9GTElQLAogCU1NQVBfR1RULApAQCAtNjksNyArNjMs NyBAQCBzdGF0aWMgY29uc3QgY2hhciAqb3Bfc3RyKGVudW0gb3BlcmF0aW9ucyBvcCkKIAogdHlw ZWRlZiBzdHJ1Y3QgewogCWludCBkcm1fZmQ7Ci0JZW51bSBwbGFuZXMgdGVzdF9wbGFuZTsKKwlp bnQgdGVzdF9wbGFuZTsKIAllbnVtIG9wZXJhdGlvbnMgb3A7CiAJdWludDMyX3QgZGV2aWQ7CiAJ dWludDMyX3QgY3J0Y19pZDsKQEAgLTMxMyw5ICszMDcsOSBAQCBzdGF0aWMgdm9pZCBydW5fdGVz dChkYXRhX3QgKmRhdGEpCiAKIAkvKiBTZXR0aW5nIGEgc2Vjb25kYXJ5IGZiL3BsYW5lICovCiAJ c3dpdGNoIChkYXRhLT50ZXN0X3BsYW5lKSB7Ci0JY2FzZSBQUklNQVJZOiBkZWZhdWx0OiB0ZXN0 X3BsYW5lID0gZGF0YS0+cHJpbWFyeTsgYnJlYWs7Ci0JY2FzZSBTUFJJVEU6IHRlc3RfcGxhbmUg PSBkYXRhLT5zcHJpdGU7IGJyZWFrOwotCWNhc2UgQ1VSU09SOiB0ZXN0X3BsYW5lID0gZGF0YS0+ Y3Vyc29yOyBicmVhazsKKwljYXNlIERSTV9QTEFORV9UWVBFX1BSSU1BUlk6IGRlZmF1bHQ6IHRl c3RfcGxhbmUgPSBkYXRhLT5wcmltYXJ5OyBicmVhazsKKwljYXNlIERSTV9QTEFORV9UWVBFX09W RVJMQVk6IHRlc3RfcGxhbmUgPSBkYXRhLT5zcHJpdGU7IGJyZWFrOworCWNhc2UgRFJNX1BMQU5F X1RZUEVfQ1VSU09SOiB0ZXN0X3BsYW5lID0gZGF0YS0+Y3Vyc29yOyBicmVhazsKIAl9CiAJaWd0 X3BsYW5lX3NldF9mYih0ZXN0X3BsYW5lLCAmZGF0YS0+ZmJfd2hpdGUpOwogCWlndF9kaXNwbGF5 X2NvbW1pdCgmZGF0YS0+ZGlzcGxheSk7CkBAIC0zMjMsNyArMzE3LDcgQEAgc3RhdGljIHZvaWQg cnVuX3Rlc3QoZGF0YV90ICpkYXRhKQogCS8qIENvbmZpcm0gaXQgaXMgbm90IEdyZWVuIGFueW1v cmUgKi8KIAlpZ3RfYXNzZXJ0KHdhaXRfcHNyX2VudHJ5KGRhdGEpKTsKIAlnZXRfc2lua19jcmMo ZGF0YSwgcmVmX2NyYyk7Ci0JaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gUFJJTUFSWSkKKwlpZiAo ZGF0YS0+dGVzdF9wbGFuZSA9PSBEUk1fUExBTkVfVFlQRV9QUklNQVJZKQogCQlhc3NlcnRfb3Jf bWFudWFsKCFpc19ncmVlbihyZWZfY3JjKSwgInNjcmVlbiBXSElURSIpOwogCWVsc2UKIAkJYXNz ZXJ0X29yX21hbnVhbCghaXNfZ3JlZW4ocmVmX2NyYyksICJHUkVFTiBiYWNrZ3JvdW5kIHdpdGgg V0hJVEUgYm94Iik7CkBAIC0zNTUsNyArMzQ5LDcgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoZGF0 YV90ICpkYXRhKQogCQkvKiBQcmludGluZyB3aGl0ZSBvbiB3aGl0ZSBzbyB0aGUgc2NyZWVuIHNo b3VsZG4ndCBjaGFuZ2UgKi8KIAkJbWVtc2V0KHB0ciwgMHhmZiwgZGF0YS0+bW9kX3NpemUpOwog CQlnZXRfc2lua19jcmMoZGF0YSwgY3JjKTsKLQkJaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gUFJJ TUFSWSkKKwkJaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWSkK IAkJCWFzc2VydF9vcl9tYW51YWwoc3RyY21wKHJlZl9jcmMsIGNyYykgPT0gMCwgInNjcmVlbiBX SElURSIpOwogCQllbHNlCiAJCQlhc3NlcnRfb3JfbWFudWFsKHN0cmNtcChyZWZfY3JjLCBjcmMp ID09IDAsCkBAIC00MDYsOSArNDAwLDkgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoZGF0YV90ICpk YXRhKQogCiBzdGF0aWMgdm9pZCB0ZXN0X2NsZWFudXAoZGF0YV90ICpkYXRhKSB7CiAJaWd0X3Bs YW5lX3NldF9mYihkYXRhLT5wcmltYXJ5LCBOVUxMKTsKLQlpZiAoZGF0YS0+dGVzdF9wbGFuZSA9 PSBTUFJJVEUpCisJaWYgKGRhdGEtPnRlc3RfcGxhbmUgPT0gRFJNX1BMQU5FX1RZUEVfT1ZFUkxB WSkKIAkJaWd0X3BsYW5lX3NldF9mYihkYXRhLT5zcHJpdGUsIE5VTEwpOwotCWlmIChkYXRhLT50 ZXN0X3BsYW5lID09IENVUlNPUikKKwlpZiAoZGF0YS0+dGVzdF9wbGFuZSA9PSBEUk1fUExBTkVf VFlQRV9DVVJTT1IpCiAJCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+Y3Vyc29yLCBOVUxMKTsKIAog CWlndF9kaXNwbGF5X2NvbW1pdCgmZGF0YS0+ZGlzcGxheSk7CkBAIC00MjgsNyArNDIyLDcgQEAg c3RhdGljIHZvaWQgc2V0dXBfdGVzdF9wbGFuZShkYXRhX3QgKmRhdGEpCiAJCQkgICAgMC4wLCAx LjAsIDAuMCwKIAkJCSAgICAmZGF0YS0+ZmJfZ3JlZW4pOwogCi0JZGF0YS0+cHJpbWFyeSA9IGln dF9vdXRwdXRfZ2V0X3BsYW5lKGRhdGEtPm91dHB1dCwgSUdUX1BMQU5FX1BSSU1BUlkpOworCWRh dGEtPnByaW1hcnkgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZV90eXBlKGRhdGEtPm91dHB1dCwgRFJN X1BMQU5FX1RZUEVfUFJJTUFSWSk7CiAJaWd0X3BsYW5lX3NldF9mYihkYXRhLT5wcmltYXJ5LCBO VUxMKTsKIAogCXdoaXRlX2ggPSBkYXRhLT5tb2RlLT5oZGlzcGxheTsKQEAgLTQzOSwxNiArNDMz LDE2IEBAIHN0YXRpYyB2b2lkIHNldHVwX3Rlc3RfcGxhbmUoZGF0YV90ICpkYXRhKQogCWRhdGEt Pm1vZF9zdHJpZGUgPSB3aGl0ZV9oICogNDsKIAogCXN3aXRjaCAoZGF0YS0+dGVzdF9wbGFuZSkg ewotCWNhc2UgU1BSSVRFOgotCQlkYXRhLT5zcHJpdGUgPSBpZ3Rfb3V0cHV0X2dldF9wbGFuZShk YXRhLT5vdXRwdXQsCi0JCQkJCQkgICAgSUdUX1BMQU5FXzIpOworCWNhc2UgRFJNX1BMQU5FX1RZ UEVfT1ZFUkxBWToKKwkJZGF0YS0+c3ByaXRlID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShk YXRhLT5vdXRwdXQsCisJCQkJCQkgICAgRFJNX1BMQU5FX1RZUEVfT1ZFUkxBWSk7CiAJCWlndF9w bGFuZV9zZXRfZmIoZGF0YS0+c3ByaXRlLCBOVUxMKTsKIAkJLyogVG8gbWFrZSBpdCBkaWZmZXJl bnQgZm9yIGh1bWFuIGV5ZXMgbGV0J3MgbWFrZQogCQkgKiBzcHJpdGUgdmlzaWJsZSBpbiBvbmx5 IG9uZSBxdWFydGVyIG9mIHRoZSBwcmltYXJ5CiAJCSAqLwogCQl3aGl0ZV9oID0gd2hpdGVfaC8y OwogCQl3aGl0ZV92ID0gd2hpdGVfdi8yOwotCWNhc2UgUFJJTUFSWToKKwljYXNlIERSTV9QTEFO RV9UWVBFX1BSSU1BUlk6CiAJCWlndF9jcmVhdGVfY29sb3JfZmIoZGF0YS0+ZHJtX2ZkLAogCQkJ CSAgICB3aGl0ZV9oLCB3aGl0ZV92LAogCQkJCSAgICBEUk1fRk9STUFUX1hSR0I4ODg4LApAQCAt NDU2LDkgKzQ1MCw5IEBAIHN0YXRpYyB2b2lkIHNldHVwX3Rlc3RfcGxhbmUoZGF0YV90ICpkYXRh KQogCQkJCSAgICAxLjAsIDEuMCwgMS4wLAogCQkJCSAgICAmZGF0YS0+ZmJfd2hpdGUpOwogCQli cmVhazsKLQljYXNlIENVUlNPUjoKLQkJZGF0YS0+Y3Vyc29yID0gaWd0X291dHB1dF9nZXRfcGxh bmUoZGF0YS0+b3V0cHV0LAotCQkJCQkJICAgIElHVF9QTEFORV9DVVJTT1IpOworCWNhc2UgRFJN X1BMQU5FX1RZUEVfQ1VSU09SOgorCQlkYXRhLT5jdXJzb3IgPSBpZ3Rfb3V0cHV0X2dldF9wbGFu ZV90eXBlKGRhdGEtPm91dHB1dCwKKwkJCQkJCSAgICBEUk1fUExBTkVfVFlQRV9DVVJTT1IpOwog CQlpZ3RfcGxhbmVfc2V0X2ZiKGRhdGEtPmN1cnNvciwgTlVMTCk7CiAJCWNyZWF0ZV9jdXJzb3Jf ZmIoZGF0YSk7CiAJCWlndF9wbGFuZV9zZXRfcG9zaXRpb24oZGF0YS0+Y3Vyc29yLCAwLCAwKTsK QEAgLTUzNSw3ICs1MjksNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAJ Zm9yIChvcCA9IFBBR0VfRkxJUDsgb3AgPD0gUkVOREVSOyBvcCsrKSB7CiAJCWlndF9zdWJ0ZXN0 X2YoInByaW1hcnlfJXMiLCBvcF9zdHIob3ApKSB7Ci0JCQlkYXRhLnRlc3RfcGxhbmUgPSBQUklN QVJZOworCQkJZGF0YS50ZXN0X3BsYW5lID0gRFJNX1BMQU5FX1RZUEVfUFJJTUFSWTsKIAkJCWRh dGEub3AgPSBvcDsKIAkJCXNldHVwX3Rlc3RfcGxhbmUoJmRhdGEpOwogCQkJaWd0X2Fzc2VydCh3 YWl0X3Bzcl9lbnRyeSgmZGF0YSkpOwpAQCAtNTQ2LDcgKzU0MCw3IEBAIGludCBtYWluKGludCBh cmdjLCBjaGFyICphcmd2W10pCiAKIAlmb3IgKG9wID0gTU1BUF9HVFQ7IG9wIDw9IFBMQU5FX09O T0ZGOyBvcCsrKSB7CiAJCWlndF9zdWJ0ZXN0X2YoInNwcml0ZV8lcyIsIG9wX3N0cihvcCkpIHsK LQkJCWRhdGEudGVzdF9wbGFuZSA9IFNQUklURTsKKwkJCWRhdGEudGVzdF9wbGFuZSA9IERSTV9Q TEFORV9UWVBFX09WRVJMQVk7CiAJCQlkYXRhLm9wID0gb3A7CiAJCQlzZXR1cF90ZXN0X3BsYW5l KCZkYXRhKTsKIAkJCWlndF9hc3NlcnQod2FpdF9wc3JfZW50cnkoJmRhdGEpKTsKQEAgLTU1Nyw3 ICs1NTEsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAJZm9yIChvcCA9 IE1NQVBfR1RUOyBvcCA8PSBQTEFORV9PTk9GRjsgb3ArKykgewogCQlpZ3Rfc3VidGVzdF9mKCJj dXJzb3JfJXMiLCBvcF9zdHIob3ApKSB7Ci0JCQlkYXRhLnRlc3RfcGxhbmUgPSBDVVJTT1I7CisJ CQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1fUExBTkVfVFlQRV9DVVJTT1I7CiAJCQlkYXRhLm9wID0g b3A7CiAJCQlzZXR1cF90ZXN0X3BsYW5lKCZkYXRhKTsKIAkJCWlndF9hc3NlcnQod2FpdF9wc3Jf ZW50cnkoJmRhdGEpKTsKQEAgLTU2Nyw3ICs1NjEsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hh ciAqYXJndltdKQogCX0KIAogCWlndF9zdWJ0ZXN0X2YoImRwbXNfb2ZmX3Bzcl9hY3RpdmUiKSB7 Ci0JCWRhdGEudGVzdF9wbGFuZSA9IFBSSU1BUlk7CisJCWRhdGEudGVzdF9wbGFuZSA9IERSTV9Q TEFORV9UWVBFX1BSSU1BUlk7CiAJCWRhdGEub3AgPSBSRU5ERVI7CiAJCXNldHVwX3Rlc3RfcGxh bmUoJmRhdGEpOwogCQlpZ3RfYXNzZXJ0KHdhaXRfcHNyX2VudHJ5KCZkYXRhKSk7CkBAIC01Nzks NyArNTczLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAl9CiAKIAlpZ3Rf c3VidGVzdF9mKCJkcG1zX29mZl9wc3JfZXhpdCIpIHsKLQkJZGF0YS50ZXN0X3BsYW5lID0gU1BS SVRFOworCQlkYXRhLnRlc3RfcGxhbmUgPSBEUk1fUExBTkVfVFlQRV9PVkVSTEFZOwogCQlkYXRh Lm9wID0gUExBTkVfT05PRkY7CiAJCXNldHVwX3Rlc3RfcGxhbmUoJmRhdGEpOwogCkBAIC01OTEs NyArNTg1LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAl9CiAKIAlpZ3Rf c3VidGVzdF9mKCJzdXNwZW5kX3Bzcl9hY3RpdmUiKSB7Ci0JCWRhdGEudGVzdF9wbGFuZSA9IFBS SU1BUlk7CisJCWRhdGEudGVzdF9wbGFuZSA9IERSTV9QTEFORV9UWVBFX1BSSU1BUlk7CiAJCWRh dGEub3AgPSBQQUdFX0ZMSVA7CiAJCXNldHVwX3Rlc3RfcGxhbmUoJmRhdGEpOwogCQlpZ3RfYXNz ZXJ0KHdhaXRfcHNyX2VudHJ5KCZkYXRhKSk7CkBAIC02MDQsNyArNTk4LDcgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAl9CiAKIAlpZ3Rfc3VidGVzdF9mKCJzdXNwZW5kX3Bz cl9leGl0IikgewotCQlkYXRhLnRlc3RfcGxhbmUgPSBDVVJTT1I7CisJCWRhdGEudGVzdF9wbGFu ZSA9IERSTV9QTEFORV9UWVBFX0NVUlNPUjsKIAkJZGF0YS5vcCA9IFBMQU5FX09OT0ZGOwogCQlz ZXR1cF90ZXN0X3BsYW5lKCZkYXRhKTsKIAotLSAKMi4xMS4wLjQ1My5nNzg3Zjc1ZjA1CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFp bGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK