From: Jim Bride Subject: [PATCH IGT 5/5] tests/kms_fbcon_fbt: Refactor to use IGT PSR library functions Date: Fri, 5 May 2017 14:04:49 -0700 Message-ID: <1494018289-30259-6-git-send-email-jim.bride@linux.intel.com> References: <1494018289-30259-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 mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 19FF66E6D0 for ; Fri, 5 May 2017 21:06:55 +0000 (UTC) In-Reply-To: <1494018289-30259-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 Q2M6IFJvZHJpZ28gVml2aSA8cm9kcmlnby52aXZpQGludGVsLmNvbT4KQ2M6IFBhdWxvIFphbm9u aSA8cGF1bG8uci56YW5vbmlAaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBKaW0gQnJpZGUgPGpp bS5icmlkZUBsaW51eC5pbnRlbC5jb20+Ci0tLQogdGVzdHMva21zX2ZiY29uX2ZidC5jICAgIHwg NTYgKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiB0ZXN0 cy9rbXNfcHNyX3NpbmtfY3JjLmMgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t CiAyIGZpbGVzIGNoYW5nZWQsIDQ5IGluc2VydGlvbnMoKyksIDQzIGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL3Rlc3RzL2ttc19mYmNvbl9mYnQuYyBiL3Rlc3RzL2ttc19mYmNvbl9mYnQuYwpp bmRleCBkMDA5MDkxLi5hNDVhNTI4IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfZmJjb25fZmJ0LmMK KysrIGIvdGVzdHMva21zX2ZiY29uX2ZidC5jCkBAIC0xMDMsOCArMTAzLDkgQEAgc3RhdGljIGJv b2wgZmJjX2lzX2VuYWJsZWQoaW50IGZkKQogCXJldHVybiBzdHJzdHIoYnVmLCAiRkJDIGVuYWJs ZWRcbiIpOwogfQogCi1zdGF0aWMgYm9vbCBmYmNfd2FpdF91bnRpbF9lbmFibGVkKGludCBmZCkK K3N0YXRpYyBib29sIGZiY193YWl0X3VudGlsX2VuYWJsZWQoaW50IGZkLCBib29sIGVuYWJsZWQp CiB7CisJZW5hYmxlZCA9IGVuYWJsZWQ7CiAJcmV0dXJuIGlndF93YWl0KGZiY19pc19lbmFibGVk KGZkKSwgNTAwMCwgMSk7CiB9CiAKQEAgLTEyNCw2ICsxMjUsMTMgQEAgc3RhdGljIHZvaWQgc2V0 X21vZGVfZm9yX29uZV9zY3JlZW4oc3RydWN0IGRybV9pbmZvICpkcm0sIHN0cnVjdCBpZ3RfZmIg KmZiLAogCiAJCWlmIChjLT5jb25uZWN0aW9uID09IERSTV9NT0RFX0NPTk5FQ1RFRCAmJiBjLT5j b3VudF9tb2RlcyAmJgogCQkgICAgY29ubmVjdG9yX3Bvc3NpYmxlKGMpKSB7CisJCQlpZiAoYy0+ Y29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCkgeworCQkJCWJvb2wgYnJl dDsKKworCQkJCWJyZXQgPSBpZ3RfcHNyX2ZpbmRfZ29vZF9tb2RlKGMsICZtb2RlKTsKKwkJCQlp ZiAoYnJldCkKKwkJCQkJYnJlYWs7CisJCQl9CiAJCQltb2RlID0gJmMtPm1vZGVzWzBdOwogCQkJ YnJlYWs7CiAJCX0KQEAgLTE0NywzNSArMTU1LDkgQEAgc3RhdGljIHZvaWQgc2V0X21vZGVfZm9y X29uZV9zY3JlZW4oc3RydWN0IGRybV9pbmZvICpkcm0sIHN0cnVjdCBpZ3RfZmIgKmZiLAogCWln dF9hc3NlcnRfZXEocmMsIDApOwogfQogCi1zdGF0aWMgYm9vbCBwc3Jfc3VwcG9ydGVkX29uX2No aXBzZXQoaW50IGZkKQotewotCWNoYXIgYnVmWzI1Nl07Ci0KLQlpZ3RfZGVidWdmc19yZWFkKGZk LCAiaTkxNV9lZHBfcHNyX3N0YXR1cyIsIGJ1Zik7Ci0JcmV0dXJuIHN0cnN0cihidWYsICJTaW5r X1N1cHBvcnQ6IHllc1xuIik7Ci19Ci0KLXN0YXRpYyBib29sIGNvbm5lY3Rvcl9jYW5fcHNyKGRy bU1vZGVDb25uZWN0b3JQdHIgY29ubmVjdG9yKQotewotCXJldHVybiAoY29ubmVjdG9yLT5jb25u ZWN0b3JfdHlwZSA9PSBEUk1fTU9ERV9DT05ORUNUT1JfZURQKTsKLX0KLQotc3RhdGljIGJvb2wg cHNyX2lzX2VuYWJsZWQoaW50IGZkKQotewotCWNoYXIgYnVmWzI1Nl07Ci0KLQlpZ3RfZGVidWdm c19yZWFkKGZkLCAiaTkxNV9lZHBfcHNyX3N0YXR1cyIsIGJ1Zik7Ci0JcmV0dXJuIHN0cnN0cihi dWYsICJcbkFjdGl2ZTogeWVzXG4iKTsKLX0KLQotc3RhdGljIGJvb2wgcHNyX3dhaXRfdW50aWxf ZW5hYmxlZChpbnQgZmQpCi17Ci0JcmV0dXJuIGlndF93YWl0KHBzcl9pc19lbmFibGVkKGZkKSwg NTAwMCwgMSk7Ci19Ci0KIHN0cnVjdCBmZWF0dXJlIHsKIAlib29sICgqc3VwcG9ydGVkX29uX2No aXBzZXQpKGludCBmZCk7Ci0JYm9vbCAoKndhaXRfdW50aWxfZW5hYmxlZCkoaW50IGZkKTsKKwli b29sICgqd2FpdF91bnRpbF9lbmFibGVkKShpbnQgZmQsIGJvb2wgc3RhdHVzKTsKIAlib29sICgq Y29ubmVjdG9yX3Bvc3NpYmxlX2ZuKShkcm1Nb2RlQ29ubmVjdG9yUHRyIGNvbm5lY3Rvcik7CiAJ Y29uc3QgY2hhciAqcGFyYW1fbmFtZTsKIH0gZmJjID0gewpAQCAtMTg0LDkgKzE2Niw5IEBAIHN0 cnVjdCBmZWF0dXJlIHsKIAkuY29ubmVjdG9yX3Bvc3NpYmxlX2ZuID0gY29ubmVjdG9yX2Nhbl9m YmMsCiAJLnBhcmFtX25hbWUgPSAiZW5hYmxlX2ZiYyIsCiB9LCBwc3IgPSB7Ci0JLnN1cHBvcnRl ZF9vbl9jaGlwc2V0ID0gcHNyX3N1cHBvcnRlZF9vbl9jaGlwc2V0LAotCS53YWl0X3VudGlsX2Vu YWJsZWQgPSBwc3Jfd2FpdF91bnRpbF9lbmFibGVkLAotCS5jb25uZWN0b3JfcG9zc2libGVfZm4g PSBjb25uZWN0b3JfY2FuX3BzciwKKwkuc3VwcG9ydGVkX29uX2NoaXBzZXQgPSBpZ3RfcHNyX3Np bmtfc3VwcG9ydCwKKwkud2FpdF91bnRpbF9lbmFibGVkID0gaWd0X3Bzcl9hd2FpdF9zdGF0dXMs CisJLmNvbm5lY3Rvcl9wb3NzaWJsZV9mbiA9IGlndF9wc3JfdmFsaWRfY29ubmVjdG9yLAogCS5w YXJhbV9uYW1lID0gImVuYWJsZV9wc3IiLAogfTsKIApAQCAtMjEwLDE3ICsxOTIsMTcgQEAgc3Rh dGljIHZvaWQgc3VidGVzdChzdHJ1Y3QgZmVhdHVyZSAqZmVhdHVyZSwgYm9vbCBzdXNwZW5kKQog CiAJa21zdGVzdF91bnNldF9hbGxfY3J0Y3MoZHJtLmZkLCBkcm0ucmVzKTsKIAl3YWl0X3VzZXIo Ik1vZGVzIHVuc2V0LiIpOwotCWlndF9hc3NlcnQoIWZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxl ZChkcm0uZmQpKTsKKwlpZ3RfYXNzZXJ0KCFmZWF0dXJlLT53YWl0X3VudGlsX2VuYWJsZWQoZHJt LmZkLCB0cnVlKSk7CiAKIAlzZXRfbW9kZV9mb3Jfb25lX3NjcmVlbigmZHJtLCAmZmIsIGZlYXR1 cmUtPmNvbm5lY3Rvcl9wb3NzaWJsZV9mbik7CiAJd2FpdF91c2VyKCJTY3JlZW4gc2V0LiIpOwot CWlndF9hc3NlcnQoZmVhdHVyZS0+d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCkpOworCWlndF9h c3NlcnQoZmVhdHVyZS0+d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCwgdHJ1ZSkpOwogCiAJaWYg KHN1c3BlbmQpIHsKIAkJaWd0X3N5c3RlbV9zdXNwZW5kX2F1dG9yZXN1bWUoU1VTUEVORF9TVEFU RV9NRU0sCiAJCQkJCSAgICAgIFNVU1BFTkRfVEVTVF9OT05FKTsKIAkJc2xlZXAoNSk7Ci0JCWln dF9hc3NlcnQoZmVhdHVyZS0+d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCkpOworCQlpZ3RfYXNz ZXJ0KGZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxlZChkcm0uZmQsIHRydWUpKTsKIAl9CiAKIAlp Z3RfcmVtb3ZlX2ZiKGRybS5mZCwgJmZiKTsKQEAgLTIzMCwxMyArMjEyLDEzIEBAIHN0YXRpYyB2 b2lkIHN1YnRlc3Qoc3RydWN0IGZlYXR1cmUgKmZlYXR1cmUsIGJvb2wgc3VzcGVuZCkKIAlzbGVl cCgzKTsKIAogCXdhaXRfdXNlcigiQmFjayB0byBmYmNvbi4iKTsKLQlpZ3RfYXNzZXJ0KCFmZWF0 dXJlLT53YWl0X3VudGlsX2VuYWJsZWQoZHJtLmZkKSk7CisJaWd0X2Fzc2VydCghZmVhdHVyZS0+ d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCwgdHJ1ZSkpOwogCiAJaWYgKHN1c3BlbmQpIHsKIAkJ aWd0X3N5c3RlbV9zdXNwZW5kX2F1dG9yZXN1bWUoU1VTUEVORF9TVEFURV9NRU0sCiAJCQkJCSAg ICAgIFNVU1BFTkRfVEVTVF9OT05FKTsKIAkJc2xlZXAoNSk7Ci0JCWlndF9hc3NlcnQoIWZlYXR1 cmUtPndhaXRfdW50aWxfZW5hYmxlZChkcm0uZmQpKTsKKwkJaWd0X2Fzc2VydCghZmVhdHVyZS0+ d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCwgdHJ1ZSkpOwogCX0KIH0KIApAQCAtMjY2LDcgKzI0 OCw3IEBAIGlndF9tYWluCiAJCXN1YnRlc3QoJmZiYywgdHJ1ZSk7CiAJaWd0X3N1YnRlc3QoInBz ci1zdXNwZW5kIikKIAkJc3VidGVzdCgmcHNyLCB0cnVlKTsKLQorCQogCWlndF9maXh0dXJlCiAJ CXRlYXJkb3duX2Vudmlyb25tZW50KCk7CiB9CmRpZmYgLS1naXQgYS90ZXN0cy9rbXNfcHNyX3Np bmtfY3JjLmMgYi90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKaW5kZXggOGQyNmI2OC4uMjMzY2Y2 MCAxMDA2NDQKLS0tIGEvdGVzdHMva21zX3Bzcl9zaW5rX2NyYy5jCisrKyBiL3Rlc3RzL2ttc19w c3Jfc2lua19jcmMuYwpAQCAtNzAsNyArNzAsNyBAQCB0eXBlZGVmIHN0cnVjdCB7CiAJdWludDMy X3QgY3J0Y19pZDsKIAlpZ3RfZGlzcGxheV90IGRpc3BsYXk7CiAJZHJtX2ludGVsX2J1Zm1nciAq YnVmbWdyOwotCXN0cnVjdCBpZ3RfZmIgZmJfZ3JlZW4sIGZiX3doaXRlOworCXN0cnVjdCBpZ3Rf ZmIgZmJfZ3JlZW4sIGZiX3doaXRlLCBmYl9ibHVlOzsKIAlpZ3RfcGxhbmVfdCAqcHJpbWFyeSwg KnNwcml0ZSwgKmN1cnNvcjsKIAlpbnQgbW9kX3NpemU7CiAJaW50IG1vZF9zdHJpZGU7CkBAIC03 OCw2ICs3OCw3IEBAIHR5cGVkZWYgc3RydWN0IHsKIAlpZ3Rfb3V0cHV0X3QgKm91dHB1dDsKIH0g ZGF0YV90OwogCisKIHN0YXRpYyB2b2lkIGNyZWF0ZV9jdXJzb3JfZmIoZGF0YV90ICpkYXRhKQog ewogCWNhaXJvX3QgKmNyOwpAQCAtOTMsMTEgKzk0LDExIEBAIHN0YXRpYyB2b2lkIGNyZWF0ZV9j dXJzb3JfZmIoZGF0YV90ICpkYXRhKQogCWlndF9hc3NlcnQoY2Fpcm9fc3RhdHVzKGNyKSA9PSAw KTsKIH0KIAotCiBzdGF0aWMgdm9pZCBzZXR1cF9vdXRwdXQoZGF0YV90ICpkYXRhKQogewogCWln dF9kaXNwbGF5X3QgKmRpc3BsYXkgPSAmZGF0YS0+ZGlzcGxheTsKIAlpZ3Rfb3V0cHV0X3QgKm91 dHB1dDsKKwlkcm1Nb2RlTW9kZUluZm9QdHIgbW9kZSA9IE5VTEw7CiAJZW51bSBwaXBlIHBpcGU7 CiAKIAlmb3JfZWFjaF9waXBlX3dpdGhfdmFsaWRfb3V0cHV0KGRpc3BsYXksIHBpcGUsIG91dHB1 dCkgewpAQCAtMTA2LDExICsxMDcsMTUgQEAgc3RhdGljIHZvaWQgc2V0dXBfb3V0cHV0KGRhdGFf dCAqZGF0YSkKIAkJaWYgKGMtPmNvbm5lY3Rvcl90eXBlICE9IERSTV9NT0RFX0NPTk5FQ1RPUl9l RFApCiAJCQljb250aW51ZTsKIAorCQlpZiAoIWlndF9wc3JfZmluZF9nb29kX21vZGUoYywgJm1v ZGUpKQorCQkJY29udGludWU7CisKKwkJaWd0X2Fzc2VydChtb2RlICE9IE5VTEwpOworCQlpZ3Rf b3V0cHV0X292ZXJyaWRlX21vZGUob3V0cHV0LCBtb2RlKTsKIAkJaWd0X291dHB1dF9zZXRfcGlw ZShvdXRwdXQsIHBpcGUpOwogCQlkYXRhLT5jcnRjX2lkID0gb3V0cHV0LT5jb25maWcuY3J0Yy0+ Y3J0Y19pZDsKIAkJZGF0YS0+b3V0cHV0ID0gb3V0cHV0OwotCQlkYXRhLT5tb2RlID0gaWd0X291 dHB1dF9nZXRfbW9kZShvdXRwdXQpOwotCisJCWRhdGEtPm1vZGUgPSAmb3V0cHV0LT5vdmVycmlk ZV9tb2RlOwogCQlyZXR1cm47CiAJfQogfQpAQCAtMTE5LDEwICsxMjQsMzEgQEAgc3RhdGljIHZv aWQgZGlzcGxheV9pbml0KGRhdGFfdCAqZGF0YSkKIHsKIAlpZ3RfZGlzcGxheV9pbml0KCZkYXRh LT5kaXNwbGF5LCBkYXRhLT5kcm1fZmQpOwogCXNldHVwX291dHB1dChkYXRhKTsKKworCS8qIFdl IG5lZWQgdG8gYmUgYWJsZSB0byBkbyBhIG1vZGVzZXQgYmVmb3JlIHdlIGVuYWJsZSBQU1IgdG8K KwkgKiBlbnN1cmUgdGhhdCB3ZSBhcmUgcnVubmluZyBhdCBhIG1vZGUgc3VjaCB0aGF0IFBTUiBz ZXR1cCBjYW4KKwkgKiBjb21wbGV0ZSB3aXRoaW4gYSBzaW5nbGUgdmJsYW5rIGludGVydmFsLgor CSAqLworCWlndF9kZWJ1ZygiU2VsZWN0ZWQgbW9kZTpcbiIpOworCWttc3Rlc3RfZHVtcF9tb2Rl KGRhdGEtPm1vZGUpOworCWlndF9jcmVhdGVfY29sb3JfZmIoZGF0YS0+ZHJtX2ZkLAorCQkJICAg IGRhdGEtPm1vZGUtPmhkaXNwbGF5LCBkYXRhLT5tb2RlLT52ZGlzcGxheSwKKwkJCSAgICBEUk1f Rk9STUFUX1hSR0I4ODg4LAorCQkJICAgIExPQ0FMX0k5MTVfRk9STUFUX01PRF9YX1RJTEVELAor CQkJICAgIDAuMCwgLjAsIDEuMCwKKwkJCSAgICAmZGF0YS0+ZmJfYmx1ZSk7CisKKwlkYXRhLT5w cmltYXJ5ID0gaWd0X291dHB1dF9nZXRfcGxhbmVfdHlwZShkYXRhLT5vdXRwdXQsCisJCQkJCQkg IERSTV9QTEFORV9UWVBFX1BSSU1BUlkpOworCWlndF9wbGFuZV9zZXRfZmIoZGF0YS0+cHJpbWFy eSwgJmRhdGEtPmZiX2JsdWUpOworCWlndF9kaXNwbGF5X2NvbW1pdCgmZGF0YS0+ZGlzcGxheSk7 CisJaWd0X3NldF9tb2R1bGVfcGFyYW1faW50KCJlbmFibGVfcHNyIiwgcnVubmluZ193aXRoX3Bz cl9kaXNhYmxlZCA/CisJCQkJIDAgOiAxKTsKIH0KIAogc3RhdGljIHZvaWQgZGlzcGxheV9maW5p KGRhdGFfdCAqZGF0YSkKIHsKKwlpZ3Rfb3V0cHV0X292ZXJyaWRlX21vZGUoZGF0YS0+b3V0cHV0 LCBOVUxMKTsKIAlpZ3RfZGlzcGxheV9maW5pKCZkYXRhLT5kaXNwbGF5KTsKIH0KIApAQCAtNDk0 LDggKzUyMCw2IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCWttc3Rlc3Rf c2V0X3Z0X2dyYXBoaWNzX21vZGUoKTsKIAkJZGF0YS5kZXZpZCA9IGludGVsX2dldF9kcm1fZGV2 aWQoZGF0YS5kcm1fZmQpOwogCi0JCWlndF9zZXRfbW9kdWxlX3BhcmFtX2ludCgiZW5hYmxlX3Bz ciIsIHJ1bm5pbmdfd2l0aF9wc3JfZGlzYWJsZWQgPwotCQkJCQkgMCA6IDEpOwogCiAJCWlndF9z a2lwX29uKCFwc3JfcG9zc2libGUoJmRhdGEpKTsKIAotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=