From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Bride Subject: [PATCH IGT v2 3/6] tests/kms_psr_sink_crc: Refactor to use new PSR library primitives Date: Fri, 30 Jun 2017 12:12:21 -0700 Message-ID: <1498849944-26404-4-git-send-email-jim.bride@linux.intel.com> References: <1498849944-26404-1-git-send-email-jim.bride@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id ECB7F6E85E for ; Fri, 30 Jun 2017 19:14:53 +0000 (UTC) In-Reply-To: <1498849944-26404-1-git-send-email-jim.bride@linux.intel.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 Cc: Paulo Zanoni , Rodrigo Vivi List-Id: intel-gfx@lists.freedesktop.org djI6ICogTWlub3IgZnVuY3Rpb25hbCB0d2Vha3MgJiBidWcgZml4ZXMKICAgICogUmViYXNlCgpD YzogUm9kcmlnbyBWaXZpIDxyb2RyaWdvLnZpdmlAaW50ZWwuY29tPgpDYzogUGF1bG8gWmFub25p IDxwYXVsby5yLnphbm9uaUBpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEppbSBCcmlkZSA8amlt LmJyaWRlQGxpbnV4LmludGVsLmNvbT4KLS0tCiB0ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMgfCAx MzQgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCA2OCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMgYi90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKaW5k ZXggMWEwMzcxOS4uNTBkMDAyZCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3Bzcl9zaW5rX2NyYy5j CisrKyBiL3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYwpAQCAtMzMsOCArMzMsNiBAQAogCiBib29s IHJ1bm5pbmdfd2l0aF9wc3JfZGlzYWJsZWQ7CiAKLSNkZWZpbmUgQ1JDX0JMQUNLICIwMDAwMDAw MDAwMDAiCi0KIGVudW0gb3BlcmF0aW9ucyB7CiAJUEFHRV9GTElQLAogCU1NQVBfR1RULApAQCAt NjQsMTMgKzYyLDE1IEBAIHN0YXRpYyBjb25zdCBjaGFyICpvcF9zdHIoZW51bSBvcGVyYXRpb25z IG9wKQogCiB0eXBlZGVmIHN0cnVjdCB7CiAJaW50IGRybV9mZDsKKwlpbnQgZGVidWdmc19mZDsK KwlpbnQgY3JjX2ZkOwogCWludCB0ZXN0X3BsYW5lOwogCWVudW0gb3BlcmF0aW9ucyBvcDsKIAl1 aW50MzJfdCBkZXZpZDsKIAl1aW50MzJfdCBjcnRjX2lkOwogCWlndF9kaXNwbGF5X3QgZGlzcGxh eTsKIAlkcm1faW50ZWxfYnVmbWdyICpidWZtZ3I7Ci0Jc3RydWN0IGlndF9mYiBmYl9ncmVlbiwg ZmJfd2hpdGU7CisJc3RydWN0IGlndF9mYiBmYl9ncmVlbiwgZmJfd2hpdGUsIGZiX2JsdWU7CiAJ aWd0X3BsYW5lX3QgKnByaW1hcnksICpzcHJpdGUsICpjdXJzb3I7CiAJaW50IG1vZF9zaXplOwog CWludCBtb2Rfc3RyaWRlOwpAQCAtOTgsNiArOTgsNyBAQCBzdGF0aWMgdm9pZCBzZXR1cF9vdXRw dXQoZGF0YV90ICpkYXRhKQogewogCWlndF9kaXNwbGF5X3QgKmRpc3BsYXkgPSAmZGF0YS0+ZGlz cGxheTsKIAlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKKwlkcm1Nb2RlTW9kZUluZm9QdHIgbW9kZSA9 IE5VTEw7CiAJZW51bSBwaXBlIHBpcGU7CiAKIAlmb3JfZWFjaF9waXBlX3dpdGhfdmFsaWRfb3V0 cHV0KGRpc3BsYXksIHBpcGUsIG91dHB1dCkgewpAQCAtMTA2LDEwICsxMDcsMTUgQEAgc3RhdGlj IHZvaWQgc2V0dXBfb3V0cHV0KGRhdGFfdCAqZGF0YSkKIAkJaWYgKGMtPmNvbm5lY3Rvcl90eXBl ICE9IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFApCiAJCQljb250aW51ZTsKIAorCQlpZiAoIWlndF9w c3JfZmluZF9nb29kX21vZGUoYywgJm1vZGUpKQorCQkJY29udGludWU7CisKKwkJaWd0X2Fzc2Vy dChtb2RlICE9IE5VTEwpOworCQlpZ3Rfb3V0cHV0X292ZXJyaWRlX21vZGUob3V0cHV0LCBtb2Rl KTsKIAkJaWd0X291dHB1dF9zZXRfcGlwZShvdXRwdXQsIHBpcGUpOwogCQlkYXRhLT5jcnRjX2lk ID0gb3V0cHV0LT5jb25maWcuY3J0Yy0+Y3J0Y19pZDsKIAkJZGF0YS0+b3V0cHV0ID0gb3V0cHV0 OwotCQlkYXRhLT5tb2RlID0gaWd0X291dHB1dF9nZXRfbW9kZShvdXRwdXQpOworCQlkYXRhLT5t b2RlID0gJm91dHB1dC0+b3ZlcnJpZGVfbW9kZTsKIAogCQlyZXR1cm47CiAJfQpAQCAtMTE5LDEw ICsxMjUsMzMgQEAgc3RhdGljIHZvaWQgZGlzcGxheV9pbml0KGRhdGFfdCAqZGF0YSkKIHsKIAlp Z3RfZGlzcGxheV9pbml0KCZkYXRhLT5kaXNwbGF5LCBkYXRhLT5kcm1fZmQpOwogCXNldHVwX291 dHB1dChkYXRhKTsKKworCS8qIFdlIG5lZWQgdG8gYmUgYWJsZSB0byBkbyBhIG1vZGVzZXQgYmVm b3JlIHdlIGVuYWJsZSBQU1IgdG8KKwkgKiBlbnN1cmUgdGhhdCB3ZSBhcmUgcnVubmluZyBhdCBh IG1vZGUgc3VjaCB0aGF0IFBTUiBzZXR1cCBjYW4KKwkgKiBjb21wbGV0ZSB3aXRoaW4gYSBzaW5n bGUgdmJsYW5rIGludGVydmFsLgorCSAqLworCWlndF9kZWJ1ZygiU2VsZWN0ZWQgbW9kZTpcbiIp OworCWttc3Rlc3RfZHVtcF9tb2RlKGRhdGEtPm1vZGUpOworCWlndF9jcmVhdGVfY29sb3JfZmIo ZGF0YS0+ZHJtX2ZkLAorCQkJICAgIGRhdGEtPm1vZGUtPmhkaXNwbGF5LCBkYXRhLT5tb2RlLT52 ZGlzcGxheSwKKwkJCSAgICBEUk1fRk9STUFUX1hSR0I4ODg4LAorCQkJICAgIExPQ0FMX0k5MTVf Rk9STUFUX01PRF9YX1RJTEVELAorCQkJICAgIDAuMCwgLjAsIDEuMCwKKwkJCSAgICAmZGF0YS0+ ZmJfYmx1ZSk7CisKKwlkYXRhLT5wcmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShk YXRhLT5vdXRwdXQsCisJCQkJCQkgIERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOworCWlndF9wbGFu ZV9zZXRfZmIoZGF0YS0+cHJpbWFyeSwgJmRhdGEtPmZiX2JsdWUpOworCWlndF9kaXNwbGF5X2Nv bW1pdCgmZGF0YS0+ZGlzcGxheSk7CisJaWd0X3NldF9tb2R1bGVfcGFyYW1faW50KCJlbmFibGVf cHNyIiwgcnVubmluZ193aXRoX3Bzcl9kaXNhYmxlZCA/CisJCQkJIDAgOiAxKTsKIH0KIAogc3Rh dGljIHZvaWQgZGlzcGxheV9maW5pKGRhdGFfdCAqZGF0YSkKIHsKKwljbG9zZShkYXRhLT5jcmNf ZmQpOworCWNsb3NlKGRhdGEtPmRlYnVnZnNfZmQpOworCWlndF9vdXRwdXRfb3ZlcnJpZGVfbW9k ZShkYXRhLT5vdXRwdXQsIE5VTEwpOwogCWlndF9kaXNwbGF5X2ZpbmkoJmRhdGEtPmRpc3BsYXkp OwogfQogCkBAIC0xOTIsOTAgKzIyMSw1OSBAQCBzdGF0aWMgdm9pZCBmaWxsX3JlbmRlcihkYXRh X3QgKmRhdGEsIHVpbnQzMl90IGhhbmRsZSwgdW5zaWduZWQgY2hhciBjb2xvcikKIAlnZW1fYm9f YnVzeShkYXRhLT5kcm1fZmQsIGhhbmRsZSk7CiB9CiAKLXN0YXRpYyBib29sIHBzcl9wb3NzaWJs ZShkYXRhX3QgKmRhdGEpCitzdGF0aWMgaW5saW5lIGJvb2wgcHNyX3Bvc3NpYmxlKGRhdGFfdCAq ZGF0YSkKIHsKLQljaGFyIGJ1Zls1MTJdOwotCi0JaWd0X2RlYnVnZnNfcmVhZChkYXRhLT5kcm1f ZmQsICJpOTE1X2VkcF9wc3Jfc3RhdHVzIiwgYnVmKTsKLQogCXJldHVybiBydW5uaW5nX3dpdGhf cHNyX2Rpc2FibGVkIHx8Ci0JCXN0cnN0cihidWYsICJTaW5rX1N1cHBvcnQ6IHllc1xuIik7CisJ CWlndF9wc3Jfc2lua19zdXBwb3J0KGRhdGEtPmRybV9mZCk7CiB9CiAKLXN0YXRpYyBib29sIHBz cl9hY3RpdmUoZGF0YV90ICpkYXRhKQorc3RhdGljIGlubGluZSBib29sIHBzcl9hY3RpdmUoZGF0 YV90ICpkYXRhKQogewotCWNoYXIgYnVmWzUxMl07Ci0KLQlpZ3RfZGVidWdmc19yZWFkKGRhdGEt PmRybV9mZCwgImk5MTVfZWRwX3Bzcl9zdGF0dXMiLCBidWYpOwotCiAJcmV0dXJuIHJ1bm5pbmdf d2l0aF9wc3JfZGlzYWJsZWQgfHwKLQkJc3Ryc3RyKGJ1ZiwgIkhXIEVuYWJsZWQgJiBBY3RpdmUg Yml0OiB5ZXNcbiIpOworCQlpZ3RfcHNyX2FjdGl2ZShkYXRhLT5kcm1fZmQpOwogfQogCi1zdGF0 aWMgYm9vbCB3YWl0X3Bzcl9lbnRyeShkYXRhX3QgKmRhdGEpCitzdGF0aWMgaW5saW5lIGJvb2wg d2FpdF9wc3JfZW50cnkoZGF0YV90ICpkYXRhKQogewotCWludCB0aW1lb3V0ID0gNTsKLQl3aGls ZSAodGltZW91dC0tKSB7Ci0JCWlmIChwc3JfYWN0aXZlKGRhdGEpKQotCQkJcmV0dXJuIHRydWU7 Ci0JCXNsZWVwKDEpOwotCX0KLQlyZXR1cm4gZmFsc2U7CisJcmV0dXJuIHJ1bm5pbmdfd2l0aF9w c3JfZGlzYWJsZWQgfHwKKwkJaWd0X3Bzcl9hd2FpdF9zdGF0dXMoZGF0YS0+ZHJtX2ZkLCB0cnVl KTsKIH0KIAogc3RhdGljIHZvaWQgZ2V0X3NpbmtfY3JjKGRhdGFfdCAqZGF0YSwgY2hhciAqY3Jj KSB7Ci0JaW50IGRpcjsKKwlpbnQgcmMsIHRyaWVzID0gMTA7CiAKKwltZW1zZXQoY3JjLCAwLCA2 KTsKIAlpZiAoaWd0X2ludGVyYWN0aXZlX2RlYnVnKQogCQlyZXR1cm47CiAKLQlkaXIgPSBpZ3Rf ZGVidWdmc19kaXIoZGF0YS0+ZHJtX2ZkKTsKLQlpZ3RfcmVxdWlyZV9mKGlndF9zeXNmc19zY2Fu ZihkaXIsICJpOTE1X3NpbmtfY3JjX2VEUDEiLCAiJXNcbiIsIGNyYyksCi0JCSAgICAgICJTaW5r IENSQyBpcyB1bnJlbGlhYmxlIG9uIHRoaXMgbWFjaGluZS4gVHJ5IG1hbnVhbCBkZWJ1ZyB3aXRo IC0taW50ZXJhY3RpdmUtZGVidWc9bm8tY3JjXG4iKTsKLQljbG9zZShkaXIpOwotCi0JaWd0X2Rl YnVnKCIlc1xuIiwgY3JjKTsKKwlkbyB7CisJCXJjID0gaWd0X3Bzcl9nZXRfc2lua19jcmMoZGF0 YS0+Y3JjX2ZkLCBjcmMpOworCQlpZiAocmMpCisJCQl1c2xlZXAoNTAwMDApOworCX0gd2hpbGUg KHJjICYmIC0tdHJpZXMpOworCisJaWYgKHJjKQorCQlpZ3Rfc2tpcCgiQ291bGQgbm90IGdldCBz aW5rIENSQyBhZnRlciB0ZW4gdHJpZXMuXG4iKTsKKwkKKwlpZ3RfZGVidWcoIkNSQzogJWhoeCAl aGh4ICVoaHggJWhoeCAlaGh4ICVoaHhcbiIsCisJCSAgY3JjWzBdLCBjcmNbMV0sIGNyY1syXSwg Y3JjWzNdLCBjcmNbNF0sIGNyY1s1XSk7CiAJaWd0X2RlYnVnX3dhaXRfZm9yX2tleXByZXNzKCJj cmMiKTsKIAogCS8qIFRoZSBpbXBvcnRhbnQgdmFsdWUgd2FzIGFscmVhZHkgdGFrZW4uCiAJICog Tm93IGdpdmUgYSB0aW1lIGZvciBodW1hbiBleWVzCiAJICovCiAJdXNsZWVwKDMwMDAwMCk7Ci0K LQkvKiBCbGFjayBzY3JlZW4gaXMgYWx3YXlzIGludmFsaWQgKi8KLQlpZ3RfYXNzZXJ0KHN0cmNt cChjcmMsIENSQ19CTEFDSykgIT0gMCk7CiB9CiAKIHN0YXRpYyBib29sIGlzX2dyZWVuKGNoYXIg KmNyYykKIHsKLQljaGFyIGNvbG9yX21hc2tbNV0gPSAiRkZGRlwwIjsKLQljaGFyIHJzWzVdLCBn c1s1XSwgYnNbNV07Ci0JdW5zaWduZWQgaW50IHJoLCBnaCwgYmgsIG1hc2s7Ci0JaW50IHJldDsK Kwl1bnNpZ25lZCBpbnQgcmgsIGdoLCBiaDsKIAotCWlmIChpZ3RfaW50ZXJhY3RpdmVfZGVidWcp Ci0JCXJldHVybiBmYWxzZTsKKwlyaCA9IChjcmNbMV0gPDwgOCkgfCBjcmNbMF07CisJZ2ggPSAo Y3JjWzNdIDw8IDgpIHwgY3JjWzJdOworCWJoID0gKGNyY1s1XSA8PCA4KSB8IGNyY1s0XTsKIAot CXNzY2FuZihjb2xvcl9tYXNrLCAiJTR4IiwgJm1hc2spOwotCi0JbWVtY3B5KHJzLCAmY3JjWzBd LCA0KTsKLQlyc1s0XSA9ICdcMCc7Ci0JcmV0ID0gc3NjYW5mKHJzLCAiJTR4IiwgJnJoKTsKLQlp Z3RfcmVxdWlyZShyZXQgPiAwKTsKLQotCW1lbWNweShncywgJmNyY1s0XSwgNCk7Ci0JZ3NbNF0g PSAnXDAnOwotCXJldCA9IHNzY2FuZihncywgIiU0eCIsICZnaCk7Ci0JaWd0X3JlcXVpcmUocmV0 ID4gMCk7Ci0KLQltZW1jcHkoYnMsICZjcmNbOF0sIDQpOwotCWJzWzRdID0gJ1wwJzsKLQlyZXQg PSBzc2NhbmYoYnMsICIlNHgiLCAmYmgpOwotCWlndF9yZXF1aXJlKHJldCA+IDApOwotCi0JcmV0 dXJuICgocmggJiBtYXNrKSA9PSAwICYmCi0JCShnaCAmIG1hc2spICE9IDAgJiYKLQkJKGJoICYg bWFzaykgPT0gMCk7CisJcmV0dXJuICgocmggPT0gMCkgJiYgKGdoICE9IDApICYmIChiaCA9PSAw KSk7CiB9CiAKICNkZWZpbmUgYXNzZXJ0X29yX21hbnVhbChjb25kaXRpb24sIGV4cGVjdGVkKSAg ICAgICAgICAgICBcCkBAIC0yODksOCArMjg3LDggQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoZGF0 YV90ICpkYXRhKQogCXVpbnQzMl90IGhhbmRsZSA9IGRhdGEtPmZiX3doaXRlLmdlbV9oYW5kbGU7 CiAJaWd0X3BsYW5lX3QgKnRlc3RfcGxhbmU7CiAJdm9pZCAqcHRyOwotCWNoYXIgcmVmX2NyY1sx Ml07Ci0JY2hhciBjcmNbMTJdOworCWNoYXIgcmVmX2NyY1s2XTsKKwljaGFyIGNyY1s2XTsKIAlj b25zdCBjaGFyICpleHBlY3RlZCA9ICIiOwogCiAJLyogQ29uZmlybSB0aGF0IHNjcmVlbiBiZWNh bWUgR3JlZW4gKi8KQEAgLTM0Nyw5ICszNDUsOSBAQCBzdGF0aWMgdm9pZCBydW5fdGVzdChkYXRh X3QgKmRhdGEpCiAJCW1lbXNldChwdHIsIDB4ZmYsIGRhdGEtPm1vZF9zaXplKTsKIAkJZ2V0X3Np bmtfY3JjKGRhdGEsIGNyYyk7CiAJCWlmIChkYXRhLT50ZXN0X3BsYW5lID09IERSTV9QTEFORV9U WVBFX1BSSU1BUlkpCi0JCQlhc3NlcnRfb3JfbWFudWFsKHN0cmNtcChyZWZfY3JjLCBjcmMpID09 IDAsICJzY3JlZW4gV0hJVEUiKTsKKwkJCWFzc2VydF9vcl9tYW51YWwobWVtY21wKHJlZl9jcmMs IGNyYywgc2l6ZW9mKGNyYykpID09IDAsICJzY3JlZW4gV0hJVEUiKTsKIAkJZWxzZQotCQkJYXNz ZXJ0X29yX21hbnVhbChzdHJjbXAocmVmX2NyYywgY3JjKSA9PSAwLAorCQkJYXNzZXJ0X29yX21h bnVhbChtZW1jbXAocmVmX2NyYywgY3JjLCBzaXplb2YoY3JjKSkgPT0gMCwKIAkJCSAgICAgICAi R1JFRU4gYmFja2dyb3VuZCB3aXRoIFdISVRFIGJveCIpOwogCiAJCWlndF9pbmZvKCJXYWl0aW5n IDEwcy4uLlxuIik7CkBAIC0zOTIsNyArMzkwLDcgQEAgc3RhdGljIHZvaWQgcnVuX3Rlc3QoZGF0 YV90ICpkYXRhKQogCQlicmVhazsKIAl9CiAJZ2V0X3NpbmtfY3JjKGRhdGEsIGNyYyk7Ci0JYXNz ZXJ0X29yX21hbnVhbChzdHJjbXAocmVmX2NyYywgY3JjKSAhPSAwLCBleHBlY3RlZCk7CisJYXNz ZXJ0X29yX21hbnVhbChtZW1jbXAocmVmX2NyYywgY3JjLCBzaXplb2YoY3JjKSkgIT0gMCwgZXhw ZWN0ZWQpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0X2NsZWFudXAoZGF0YV90ICpkYXRhKSB7CkBA IC01MDQsMTIgKzUwMiwxMSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCiAJ aWd0X2ZpeHR1cmUgewogCQlkYXRhLmRybV9mZCA9IGRybV9vcGVuX2RyaXZlcl9tYXN0ZXIoRFJJ VkVSX0lOVEVMKTsKKwkJZGF0YS5kZWJ1Z2ZzX2ZkID0gaWd0X2RlYnVnZnNfZGlyKGRhdGEuZHJt X2ZkKTsKKwkJZGF0YS5jcmNfZmQgPSBpZ3RfcHNyX29wZW5fc2lua19jcmMoZGF0YS5kZWJ1Z2Zz X2ZkKTsKIAkJa21zdGVzdF9zZXRfdnRfZ3JhcGhpY3NfbW9kZSgpOwogCQlkYXRhLmRldmlkID0g aW50ZWxfZ2V0X2RybV9kZXZpZChkYXRhLmRybV9mZCk7CiAKLQkJaWd0X3NldF9tb2R1bGVfcGFy YW1faW50KCJlbmFibGVfcHNyIiwgcnVubmluZ193aXRoX3Bzcl9kaXNhYmxlZCA/Ci0JCQkJCSAw IDogMSk7Ci0KIAkJaWd0X3NraXBfb24oIXBzcl9wb3NzaWJsZSgmZGF0YSkpOwogCiAJCWRhdGEu YnVmbWdyID0gZHJtX2ludGVsX2J1Zm1ncl9nZW1faW5pdChkYXRhLmRybV9mZCwgNDA5Nik7CkBA IC01MTcsNiArNTE0LDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAkJZHJt X2ludGVsX2J1Zm1ncl9nZW1fZW5hYmxlX3JldXNlKGRhdGEuYnVmbWdyKTsKIAogCQlkaXNwbGF5 X2luaXQoJmRhdGEpOworCQlpZ3Rfc2tpcF9vbighcHNyX3Bvc3NpYmxlKCZkYXRhKSk7CiAJfQog CiAJaWd0X3N1YnRlc3QoInBzcl9iYXNpYyIpIHsKLS0gCjIuNy40CgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK