From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Bride Subject: [PATCH IGT v2 4/6] tests/kms_frontbuffer_tracking: Refactor to use IGT PSR library functions Date: Fri, 30 Jun 2017 12:12:22 -0700 Message-ID: <1498849944-26404-5-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 16A4E6E85D for ; Fri, 30 Jun 2017 19:14:54 +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 djI6ICogTWlub3IgZnVuY3Rpb25hbCB0d2Vha3MgYW5kIGJ1ZyBmaXhlcwogICAgKiBSZWJhc2UK CkNjOiBSb2RyaWdvIFZpdmkgPHJvZHJpZ28udml2aUBpbnRlbC5jb20+CkNjOiBQYXVsbyBaYW5v bmkgPHBhdWxvLnIuemFub25pQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogSmltIEJyaWRlIDxq aW0uYnJpZGVAbGludXguaW50ZWwuY29tPgotLS0KIHRlc3RzL2ttc19mcm9udGJ1ZmZlcl90cmFj a2luZy5jIHwgMTE5ICsrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBm aWxlIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEwMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYyBiL3Rlc3RzL2ttc19mcm9udGJ1 ZmZlcl90cmFja2luZy5jCmluZGV4IGMyNGU0YTguLjNhOGI3NTQgMTAwNjQ0Ci0tLSBhL3Rlc3Rz L2ttc19mcm9udGJ1ZmZlcl90cmFja2luZy5jCisrKyBiL3Rlc3RzL2ttc19mcm9udGJ1ZmZlcl90 cmFja2luZy5jCkBAIC0xODMsNyArMTgzLDcgQEAgc3RydWN0IHsKIH07CiAKIAotI2RlZmluZSBT SU5LX0NSQ19TSVpFIDEyCisjZGVmaW5lIFNJTktfQ1JDX1NJWkUgNgogdHlwZWRlZiBzdHJ1Y3Qg ewogCWNoYXIgZGF0YVtTSU5LX0NSQ19TSVpFXTsKIH0gc2lua19jcmNfdDsKQEAgLTMyNywyOCAr MzI3LDYgQEAgZHJtTW9kZU1vZGVJbmZvIHN0ZF8xMDI0X21vZGUgPSB7CiAJLm5hbWUgPSAiQ3Vz dG9tIDEwMjR4NzY4IiwKIH07CiAKLXN0YXRpYyBkcm1Nb2RlTW9kZUluZm9QdHIgZ2V0X2Nvbm5l Y3Rvcl9zbWFsbGVzdF9tb2RlKGRybU1vZGVDb25uZWN0b3JQdHIgYykKLXsKLQlpbnQgaTsKLQlk cm1Nb2RlTW9kZUluZm9QdHIgc21hbGxlc3QgPSBOVUxMOwotCi0JZm9yIChpID0gMDsgaSA8IGMt PmNvdW50X21vZGVzOyBpKyspIHsKLQkJZHJtTW9kZU1vZGVJbmZvUHRyIG1vZGUgPSAmYy0+bW9k ZXNbaV07Ci0KLQkJaWYgKCFzbWFsbGVzdCkKLQkJCXNtYWxsZXN0ID0gbW9kZTsKLQotCQlpZiAo bW9kZS0+aGRpc3BsYXkgKiBtb2RlLT52ZGlzcGxheSA8Ci0JCSAgICBzbWFsbGVzdC0+aGRpc3Bs YXkgKiBzbWFsbGVzdC0+dmRpc3BsYXkpCi0JCQlzbWFsbGVzdCA9IG1vZGU7Ci0JfQotCi0JaWYg KGMtPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFApCi0JCXNtYWxsZXN0 ID0gJnN0ZF8xMDI0X21vZGU7Ci0KLQlyZXR1cm4gc21hbGxlc3Q7Ci19Ci0KIHN0YXRpYyBkcm1N b2RlQ29ubmVjdG9yUHRyIGdldF9jb25uZWN0b3IodWludDMyX3QgaWQpCiB7CiAJaW50IGk7CkBA IC00MjEsMzAgKzM5OSw2IEBAIHN0YXRpYyB2b2lkIGluaXRfbW9kZV9wYXJhbXMoc3RydWN0IG1v ZGVzZXRfcGFyYW1zICpwYXJhbXMsIHVpbnQzMl90IGNydGNfaWQsCiAJcGFyYW1zLT5zcHJpdGUu aCA9IDY0OwogfQogCi1zdGF0aWMgYm9vbCBjb25uZWN0b3JfZ2V0X21vZGUoZHJtTW9kZUNvbm5l Y3RvclB0ciBjLCBkcm1Nb2RlTW9kZUluZm9QdHIgKm1vZGUpCi17Ci0JKm1vZGUgPSBOVUxMOwot Ci0JaWYgKGMtPmNvbm5lY3Rpb24gIT0gRFJNX01PREVfQ09OTkVDVEVEIHx8ICFjLT5jb3VudF9t b2RlcykKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYgKGMtPmNvbm5lY3Rvcl90eXBlID09IERSTV9N T0RFX0NPTk5FQ1RPUl9lRFAgJiYgb3B0Lm5vX2VkcCkKLQkJcmV0dXJuIGZhbHNlOwotCi0JaWYg KG9wdC5zbWFsbF9tb2RlcykKLQkJKm1vZGUgPSBnZXRfY29ubmVjdG9yX3NtYWxsZXN0X21vZGUo Yyk7Ci0JZWxzZQotCQkqbW9kZSA9ICZjLT5tb2Rlc1swXTsKLQotCSAvKiBPbiBIU1cgdGhlIENS QyBXQSBpcyBzbyBhd2Z1bCB0aGF0IGl0IG1ha2VzIHlvdSB0aGluayBldmVyeXRoaW5nIGlzCi0J ICAqIGJ1Z2dlZC4gKi8KLQlpZiAoSVNfSEFTV0VMTChpbnRlbF9nZXRfZHJtX2RldmlkKGRybS5m ZCkpICYmCi0JICAgIGMtPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFAp Ci0JCSptb2RlID0gJnN0ZF8xMDI0X21vZGU7Ci0KLQlyZXR1cm4gdHJ1ZTsKLX0KLQogc3RhdGlj IGJvb2wgY29ubmVjdG9yX3N1cHBvcnRzX3BpcGVfYShkcm1Nb2RlQ29ubmVjdG9yUHRyIGNvbm5l Y3RvcikKIHsKIAlpbnQgaTsKQEAgLTQ3Myw3ICs0MjcsNyBAQCBzdGF0aWMgYm9vbCBmaW5kX2Nv bm5lY3Rvcihib29sIGVkcF9vbmx5LCBib29sIHBpcGVfYSwgdWludDMyX3QgZm9yYmlkZGVuX2lk LAogCQkJY29udGludWU7CiAJCWlmIChjLT5jb25uZWN0b3JfaWQgPT0gZm9yYmlkZGVuX2lkKQog CQkJY29udGludWU7Ci0JCWlmICghY29ubmVjdG9yX2dldF9tb2RlKGMsICZtb2RlKSkKKwkJaWYg KCFpZ3RfcHNyX2ZpbmRfZ29vZF9tb2RlKGMsICZtb2RlKSkKIAkJCWNvbnRpbnVlOwogCiAJCSpy ZXRfY29ubmVjdG9yID0gYzsKQEAgLTgwNCwyMyArNzU4LDYgQEAgc3RhdGljIHZvaWQgZmJjX3By aW50X3N0YXR1cyh2b2lkKQogCWlndF9pbmZvKCJGQkMgc3RhdHVzOlxuJXNcbiIsIGJ1Zik7CiB9 CiAKLXN0YXRpYyBib29sIHBzcl9pc19lbmFibGVkKHZvaWQpCi17Ci0JY2hhciBidWZbMjU2XTsK LQotCWRlYnVnZnNfcmVhZCgiaTkxNV9lZHBfcHNyX3N0YXR1cyIsIGJ1Zik7Ci0JcmV0dXJuIHN0 cnN0cihidWYsICJcbkFjdGl2ZTogeWVzXG4iKSAmJgotCSAgICAgICBzdHJzdHIoYnVmLCAiXG5I VyBFbmFibGVkICYgQWN0aXZlIGJpdDogeWVzXG4iKTsKLX0KLQotc3RhdGljIHZvaWQgcHNyX3By aW50X3N0YXR1cyh2b2lkKQotewotCWNoYXIgYnVmWzI1Nl07Ci0KLQlkZWJ1Z2ZzX3JlYWQoImk5 MTVfZWRwX3Bzcl9zdGF0dXMiLCBidWYpOwotCWlndF9pbmZvKCJQU1Igc3RhdHVzOlxuJXNcbiIs IGJ1Zik7Ci19Ci0KIHN0YXRpYyBzdHJ1Y3QgdGltZXNwZWMgZmJjX2dldF9sYXN0X2FjdGlvbih2 b2lkKQogewogCXN0cnVjdCB0aW1lc3BlYyByZXQgPSB7IDAsIDAgfTsKQEAgLTkyNiw0NCArODYz LDMxIEBAIHN0YXRpYyBib29sIGZiY193YWl0X3VudGlsX2VuYWJsZWQodm9pZCkKIAlyZXR1cm4g aWd0X3dhaXQoZmJjX2lzX2VuYWJsZWQoKSwgMjAwMCwgMSk7CiB9CiAKLXN0YXRpYyBib29sIHBz cl93YWl0X3VudGlsX2VuYWJsZWQodm9pZCkKLXsKLQlyZXR1cm4gaWd0X3dhaXQocHNyX2lzX2Vu YWJsZWQoKSwgNTAwMCwgMSk7Ci19Ci0KICNkZWZpbmUgZmJjX2VuYWJsZSgpIGlndF9zZXRfbW9k dWxlX3BhcmFtX2ludCgiZW5hYmxlX2ZiYyIsIDEpCiAjZGVmaW5lIGZiY19kaXNhYmxlKCkgaWd0 X3NldF9tb2R1bGVfcGFyYW1faW50KCJlbmFibGVfZmJjIiwgMCkKLSNkZWZpbmUgcHNyX2VuYWJs ZSgpIGlndF9zZXRfbW9kdWxlX3BhcmFtX2ludCgiZW5hYmxlX3BzciIsIDEpCi0jZGVmaW5lIHBz cl9kaXNhYmxlKCkgaWd0X3NldF9tb2R1bGVfcGFyYW1faW50KCJlbmFibGVfcHNyIiwgMCkKIAog c3RhdGljIHZvaWQgZ2V0X3NpbmtfY3JjKHNpbmtfY3JjX3QgKmNyYywgYm9vbCBtYW5kYXRvcnkp CiB7Ci0JaW50IHJjLCBlcnJub187CisJaW50IHJjOwogCiAJaWYgKCFzaW5rX2NyYy5zdXBwb3J0 ZWQpIHsKIAkJbWVtY3B5KGNyYywgInVuc3VwcG9ydGVkISIsIFNJTktfQ1JDX1NJWkUpOwogCQly ZXR1cm47CiAJfQogCi0JbHNlZWsoc2lua19jcmMuZmQsIDAsIFNFRUtfU0VUKTsKLQotCXJjID0g cmVhZChzaW5rX2NyYy5mZCwgY3JjLT5kYXRhLCBTSU5LX0NSQ19TSVpFKTsKLQllcnJub18gPSBl cnJubzsKLQotCWlmIChyYyA9PSAtMSAmJiBlcnJub18gPT0gRU5PVFRZKSB7CisJcmMgPSBpZ3Rf cHNyX2dldF9zaW5rX2NyYyhzaW5rX2NyYy5mZCwgY3JjLT5kYXRhKTsKKwlpZiAocmMgPT0gRU5P VFRZKSB7CiAJCWlndF9pbmZvKCJTaW5rIENSQyBub3Qgc3VwcG9ydGVkOiBwYW5lbCBkb2Vzbid0 IHN1cHBvcnQgaXRcbiIpOwogCQlzaW5rX2NyYy5zdXBwb3J0ZWQgPSBmYWxzZTsKLQl9IGVsc2Ug aWYgKHJjID09IC0xICYmIGVycm5vXyA9PSBFVElNRURPVVQpIHsKLQkJaWYgKHNpbmtfY3JjLnJl bGlhYmxlKSB7Ci0JCQlpZ3RfaW5mbygiU2luayBDUkMgaXMgdW5yZWxpYWJsZSBvbiB0aGlzIG1h Y2hpbmUuXG4iKTsKKwl9IGVsc2UgaWYgKHJjID09IEVUSU1FRE9VVCkgeworCQlpZiAoc2lua19j cmMucmVsaWFibGUpIAogCQkJc2lua19jcmMucmVsaWFibGUgPSBmYWxzZTsKLQkJfQorCQkKIAog CQlpZiAobWFuZGF0b3J5KQogCQkJaWd0X3NraXAoIlNpbmsgQ1JDIGlzIHVucmVsaWFibGUgb24g dGhpcyBtYWNoaW5lLlxuIik7CiAJfSBlbHNlIHsKLQkJaWd0X2Fzc2VydF9mKHJjICE9IC0xLCAi VW5leHBlY3RlZCBlcnJvcjogJWRcbiIsIGVycm5vXyk7Ci0JCWlndF9hc3NlcnQocmMgPT0gU0lO S19DUkNfU0laRSk7CisJCWlndF9hc3NlcnRfZihyYyA9PSAwLCAiVW5leHBlY3RlZCBlcnJvcjog JWRcbiIsIHJjKTsKIAl9CiB9CiAKQEAgLTExODAsNyArMTEwNCw3IEBAIHN0YXRpYyB2b2lkIGRp c2FibGVfZmVhdHVyZXMoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAkJcmV0dXJuOwogCiAJ ZmJjX2Rpc2FibGUoKTsKLQlwc3JfZGlzYWJsZSgpOworCWlndF9wc3JfZGlzYWJsZSgpOwogfQog CiBzdGF0aWMgdm9pZCAqYnVzeV90aHJlYWRfZnVuYyh2b2lkICpkYXRhKQpAQCAtMTQzMiw3ICsx MzU2LDcgQEAgc3RhdGljIHZvaWQgc2V0dXBfc2lua19jcmModm9pZCkKIAlmaWxsX2ZiX3JlZ2lv bigmcHJpbV9tb2RlX3BhcmFtcy5mYiwgQ09MT1JfUFJJTV9CRyk7CiAJc2V0X21vZGVfZm9yX3Bh cmFtcygmcHJpbV9tb2RlX3BhcmFtcyk7CiAKLQlzaW5rX2NyYy5mZCA9IG9wZW5hdChkcm0uZGVi dWdmcywgImk5MTVfc2lua19jcmNfZURQMSIsIE9fUkRPTkxZKTsKKwlzaW5rX2NyYy5mZCA9IGln dF9wc3Jfb3Blbl9zaW5rX2NyYyhkcm0uZGVidWdmcyk7CiAJaWd0X2Fzc2VydF9sdGUoMCwgc2lu a19jcmMuZmQpOwogCiAJLyogRG8gYSBmaXJzdCByZWFkIHRvIHRyeSB0byBkZXRlY3QgaWYgaXQn cyBzdXBwb3J0ZWQuICovCkBAIC0xNTQ3LDE0ICsxNDcxLDYgQEAgc3RhdGljIHZvaWQgdGVhcmRv d25fZmJjKHZvaWQpCiB7CiB9CiAKLXN0YXRpYyBib29sIHBzcl9zaW5rX2hhc19zdXBwb3J0KHZv aWQpCi17Ci0JY2hhciBidWZbMjU2XTsKLQotCWRlYnVnZnNfcmVhZCgiaTkxNV9lZHBfcHNyX3N0 YXR1cyIsIGJ1Zik7Ci0JcmV0dXJuIHN0cnN0cihidWYsICJTaW5rX1N1cHBvcnQ6IHllc1xuIik7 Ci19Ci0KIHN0YXRpYyB2b2lkIHNldHVwX3Bzcih2b2lkKQogewogCWlmIChnZXRfY29ubmVjdG9y KHByaW1fbW9kZV9wYXJhbXMuY29ubmVjdG9yX2lkKS0+Y29ubmVjdG9yX3R5cGUgIT0KQEAgLTE1 NjMsNyArMTQ3OSw3IEBAIHN0YXRpYyB2b2lkIHNldHVwX3Bzcih2b2lkKQogCQlyZXR1cm47CiAJ fQogCi0JaWYgKCFwc3Jfc2lua19oYXNfc3VwcG9ydCgpKSB7CisJaWYgKCFpZ3RfcHNyX3Npbmtf c3VwcG9ydChkcm0uZmQpKSB7CiAJCWlndF9pbmZvKCJDYW4ndCB0ZXN0IFBTUjogbm90IHN1cHBv cnRlZCBieSBzaW5rLlxuIik7CiAJCXJldHVybjsKIAl9CkBAIC0xNzE3LDEyICsxNjMzLDE1IEBA IHN0YXRpYyBpbnQgYWRqdXN0X2Fzc2VydGlvbl9mbGFncyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2Rl ICp0LCBpbnQgZmxhZ3MpCiAJfQkJCQkJCQkJXAogCQkJCQkJCQkJXAogCWlmIChmbGFnc18gJiBB U1NFUlRfUFNSX0VOQUJMRUQpIHsJCQkJXAotCQlpZiAoIXBzcl93YWl0X3VudGlsX2VuYWJsZWQo KSkgewkJCVwKLQkJCXBzcl9wcmludF9zdGF0dXMoKTsJCQkJXAorCQlpZiAoIWlndF9wc3JfYXdh aXRfc3RhdHVzKGRybS5mZCwgdHJ1ZSkpIHsJCVwKKwkJCWlndF9wc3JfcHJpbnRfc3RhdHVzKGRy bS5mZCk7CQkJXAogCQkJaWd0X2Fzc2VydF9mKGZhbHNlLCAiUFNSIGRpc2FibGVkXG4iKTsJCVwK IAkJfQkJCQkJCQlcCiAJfSBlbHNlIGlmIChmbGFnc18gJiBBU1NFUlRfUFNSX0RJU0FCTEVEKSB7 CQkJXAotCQlpZ3RfYXNzZXJ0KCFwc3Jfd2FpdF91bnRpbF9lbmFibGVkKCkpOwkJCVwKKwkJaWYg KCFpZ3RfcHNyX2F3YWl0X3N0YXR1cyhkcm0uZmQsIGZhbHNlKSkgewkJXAorCQkJaWd0X3Bzcl9w cmludF9zdGF0dXMoZHJtLmZkKTsgICAgICAgICAgICAgICAgICAgXAorCQkJaWd0X2Fzc2VydF9m KGZhbHNlLCAiUFNSIGVuYWJsZWRcbiIpOwkJXAorCQl9CQkJCQkJCVwKIAl9CQkJCQkJCQlcCiB9 IHdoaWxlICgwKQogCkBAIC0xODIyLDcgKzE3NDEsNyBAQCBzdGF0aWMgdm9pZCBlbmFibGVfZmVh dHVyZXNfZm9yX3Rlc3QoY29uc3Qgc3RydWN0IHRlc3RfbW9kZSAqdCkKIAlpZiAodC0+ZmVhdHVy ZSAmIEZFQVRVUkVfRkJDKQogCQlmYmNfZW5hYmxlKCk7CiAJaWYgKHQtPmZlYXR1cmUgJiBGRUFU VVJFX1BTUikKLQkJcHNyX2VuYWJsZSgpOworCQlpZ3RfcHNyX2VuYWJsZSgpOwogfQogCiBzdGF0 aWMgdm9pZCBjaGVja190ZXN0X3JlcXVpcmVtZW50cyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0 KQotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdm eAo=