From: Jim Bride Subject: [PATCH IGT 4/5] tests/kms_frontbuffer_tracking: Refactor to use IGT PSR library functions Date: Fri, 5 May 2017 14:04:48 -0700 Message-ID: <1494018289-30259-5-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 049446E71C 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+Ci0tLQogdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNr aW5nLmMgfCA5NSArKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZp bGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgODUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNraW5nLmMgYi90ZXN0cy9rbXNfZnJvbnRidWZm ZXJfdHJhY2tpbmcuYwppbmRleCBjMjRlNGE4Li44MzlkMjk2IDEwMDY0NAotLS0gYS90ZXN0cy9r bXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYworKysgYi90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJh Y2tpbmcuYwpAQCAtMzI3LDI4ICszMjcsNiBAQCBkcm1Nb2RlTW9kZUluZm8gc3RkXzEwMjRfbW9k ZSA9IHsKIAkubmFtZSA9ICJDdXN0b20gMTAyNHg3NjgiLAogfTsKIAotc3RhdGljIGRybU1vZGVN b2RlSW5mb1B0ciBnZXRfY29ubmVjdG9yX3NtYWxsZXN0X21vZGUoZHJtTW9kZUNvbm5lY3RvclB0 ciBjKQotewotCWludCBpOwotCWRybU1vZGVNb2RlSW5mb1B0ciBzbWFsbGVzdCA9IE5VTEw7Ci0K LQlmb3IgKGkgPSAwOyBpIDwgYy0+Y291bnRfbW9kZXM7IGkrKykgewotCQlkcm1Nb2RlTW9kZUlu Zm9QdHIgbW9kZSA9ICZjLT5tb2Rlc1tpXTsKLQotCQlpZiAoIXNtYWxsZXN0KQotCQkJc21hbGxl c3QgPSBtb2RlOwotCi0JCWlmIChtb2RlLT5oZGlzcGxheSAqIG1vZGUtPnZkaXNwbGF5IDwKLQkJ ICAgIHNtYWxsZXN0LT5oZGlzcGxheSAqIHNtYWxsZXN0LT52ZGlzcGxheSkKLQkJCXNtYWxsZXN0 ID0gbW9kZTsKLQl9Ci0KLQlpZiAoYy0+Y29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVD VE9SX2VEUCkKLQkJc21hbGxlc3QgPSAmc3RkXzEwMjRfbW9kZTsKLQotCXJldHVybiBzbWFsbGVz dDsKLX0KLQogc3RhdGljIGRybU1vZGVDb25uZWN0b3JQdHIgZ2V0X2Nvbm5lY3Rvcih1aW50MzJf dCBpZCkKIHsKIAlpbnQgaTsKQEAgLTQyMSwzMCArMzk5LDYgQEAgc3RhdGljIHZvaWQgaW5pdF9t b2RlX3BhcmFtcyhzdHJ1Y3QgbW9kZXNldF9wYXJhbXMgKnBhcmFtcywgdWludDMyX3QgY3J0Y19p ZCwKIAlwYXJhbXMtPnNwcml0ZS5oID0gNjQ7CiB9CiAKLXN0YXRpYyBib29sIGNvbm5lY3Rvcl9n ZXRfbW9kZShkcm1Nb2RlQ29ubmVjdG9yUHRyIGMsIGRybU1vZGVNb2RlSW5mb1B0ciAqbW9kZSkK LXsKLQkqbW9kZSA9IE5VTEw7Ci0KLQlpZiAoYy0+Y29ubmVjdGlvbiAhPSBEUk1fTU9ERV9DT05O RUNURUQgfHwgIWMtPmNvdW50X21vZGVzKQotCQlyZXR1cm4gZmFsc2U7Ci0KLQlpZiAoYy0+Y29u bmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX2VEUCAmJiBvcHQubm9fZWRwKQotCQly ZXR1cm4gZmFsc2U7Ci0KLQlpZiAob3B0LnNtYWxsX21vZGVzKQotCQkqbW9kZSA9IGdldF9jb25u ZWN0b3Jfc21hbGxlc3RfbW9kZShjKTsKLQllbHNlCi0JCSptb2RlID0gJmMtPm1vZGVzWzBdOwot Ci0JIC8qIE9uIEhTVyB0aGUgQ1JDIFdBIGlzIHNvIGF3ZnVsIHRoYXQgaXQgbWFrZXMgeW91IHRo aW5rIGV2ZXJ5dGhpbmcgaXMKLQkgICogYnVnZ2VkLiAqLwotCWlmIChJU19IQVNXRUxMKGludGVs X2dldF9kcm1fZGV2aWQoZHJtLmZkKSkgJiYKLQkgICAgYy0+Y29ubmVjdG9yX3R5cGUgPT0gRFJN X01PREVfQ09OTkVDVE9SX2VEUCkKLQkJKm1vZGUgPSAmc3RkXzEwMjRfbW9kZTsKLQotCXJldHVy biB0cnVlOwotfQotCiBzdGF0aWMgYm9vbCBjb25uZWN0b3Jfc3VwcG9ydHNfcGlwZV9hKGRybU1v ZGVDb25uZWN0b3JQdHIgY29ubmVjdG9yKQogewogCWludCBpOwpAQCAtNDczLDcgKzQyNyw3IEBA IHN0YXRpYyBib29sIGZpbmRfY29ubmVjdG9yKGJvb2wgZWRwX29ubHksIGJvb2wgcGlwZV9hLCB1 aW50MzJfdCBmb3JiaWRkZW5faWQsCiAJCQljb250aW51ZTsKIAkJaWYgKGMtPmNvbm5lY3Rvcl9p ZCA9PSBmb3JiaWRkZW5faWQpCiAJCQljb250aW51ZTsKLQkJaWYgKCFjb25uZWN0b3JfZ2V0X21v ZGUoYywgJm1vZGUpKQorCQlpZiAoIWlndF9wc3JfZmluZF9nb29kX21vZGUoYywgJm1vZGUpKQog CQkJY29udGludWU7CiAKIAkJKnJldF9jb25uZWN0b3IgPSBjOwpAQCAtODA0LDIzICs3NTgsNiBA QCBzdGF0aWMgdm9pZCBmYmNfcHJpbnRfc3RhdHVzKHZvaWQpCiAJaWd0X2luZm8oIkZCQyBzdGF0 dXM6XG4lc1xuIiwgYnVmKTsKIH0KIAotc3RhdGljIGJvb2wgcHNyX2lzX2VuYWJsZWQodm9pZCkK LXsKLQljaGFyIGJ1ZlsyNTZdOwotCi0JZGVidWdmc19yZWFkKCJpOTE1X2VkcF9wc3Jfc3RhdHVz IiwgYnVmKTsKLQlyZXR1cm4gc3Ryc3RyKGJ1ZiwgIlxuQWN0aXZlOiB5ZXNcbiIpICYmCi0JICAg ICAgIHN0cnN0cihidWYsICJcbkhXIEVuYWJsZWQgJiBBY3RpdmUgYml0OiB5ZXNcbiIpOwotfQot Ci1zdGF0aWMgdm9pZCBwc3JfcHJpbnRfc3RhdHVzKHZvaWQpCi17Ci0JY2hhciBidWZbMjU2XTsK LQotCWRlYnVnZnNfcmVhZCgiaTkxNV9lZHBfcHNyX3N0YXR1cyIsIGJ1Zik7Ci0JaWd0X2luZm8o IlBTUiBzdGF0dXM6XG4lc1xuIiwgYnVmKTsKLX0KLQogc3RhdGljIHN0cnVjdCB0aW1lc3BlYyBm YmNfZ2V0X2xhc3RfYWN0aW9uKHZvaWQpCiB7CiAJc3RydWN0IHRpbWVzcGVjIHJldCA9IHsgMCwg MCB9OwpAQCAtOTI2LDE1ICs4NjMsOCBAQCBzdGF0aWMgYm9vbCBmYmNfd2FpdF91bnRpbF9lbmFi bGVkKHZvaWQpCiAJcmV0dXJuIGlndF93YWl0KGZiY19pc19lbmFibGVkKCksIDIwMDAsIDEpOwog fQogCi1zdGF0aWMgYm9vbCBwc3Jfd2FpdF91bnRpbF9lbmFibGVkKHZvaWQpCi17Ci0JcmV0dXJu IGlndF93YWl0KHBzcl9pc19lbmFibGVkKCksIDUwMDAsIDEpOwotfQotCiAjZGVmaW5lIGZiY19l bmFibGUoKSBpZ3Rfc2V0X21vZHVsZV9wYXJhbV9pbnQoImVuYWJsZV9mYmMiLCAxKQogI2RlZmlu ZSBmYmNfZGlzYWJsZSgpIGlndF9zZXRfbW9kdWxlX3BhcmFtX2ludCgiZW5hYmxlX2ZiYyIsIDAp Ci0jZGVmaW5lIHBzcl9lbmFibGUoKSBpZ3Rfc2V0X21vZHVsZV9wYXJhbV9pbnQoImVuYWJsZV9w c3IiLCAxKQotI2RlZmluZSBwc3JfZGlzYWJsZSgpIGlndF9zZXRfbW9kdWxlX3BhcmFtX2ludCgi ZW5hYmxlX3BzciIsIDApCiAKIHN0YXRpYyB2b2lkIGdldF9zaW5rX2NyYyhzaW5rX2NyY190ICpj cmMsIGJvb2wgbWFuZGF0b3J5KQogewpAQCAtMTE4MCw3ICsxMTEwLDcgQEAgc3RhdGljIHZvaWQg ZGlzYWJsZV9mZWF0dXJlcyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQogCQlyZXR1cm47CiAK IAlmYmNfZGlzYWJsZSgpOwotCXBzcl9kaXNhYmxlKCk7CisJaWd0X3Bzcl9kaXNhYmxlKCk7CiB9 CiAKIHN0YXRpYyB2b2lkICpidXN5X3RocmVhZF9mdW5jKHZvaWQgKmRhdGEpCkBAIC0xNTQ3LDE0 ICsxNDc3LDYgQEAgc3RhdGljIHZvaWQgdGVhcmRvd25fZmJjKHZvaWQpCiB7CiB9CiAKLXN0YXRp YyBib29sIHBzcl9zaW5rX2hhc19zdXBwb3J0KHZvaWQpCi17Ci0JY2hhciBidWZbMjU2XTsKLQot CWRlYnVnZnNfcmVhZCgiaTkxNV9lZHBfcHNyX3N0YXR1cyIsIGJ1Zik7Ci0JcmV0dXJuIHN0cnN0 cihidWYsICJTaW5rX1N1cHBvcnQ6IHllc1xuIik7Ci19Ci0KIHN0YXRpYyB2b2lkIHNldHVwX3Bz cih2b2lkKQogewogCWlmIChnZXRfY29ubmVjdG9yKHByaW1fbW9kZV9wYXJhbXMuY29ubmVjdG9y X2lkKS0+Y29ubmVjdG9yX3R5cGUgIT0KQEAgLTE1NjMsNyArMTQ4NSw3IEBAIHN0YXRpYyB2b2lk IHNldHVwX3Bzcih2b2lkKQogCQlyZXR1cm47CiAJfQogCi0JaWYgKCFwc3Jfc2lua19oYXNfc3Vw cG9ydCgpKSB7CisJaWYgKCFpZ3RfcHNyX3Npbmtfc3VwcG9ydChkcm0uZmQpKSB7CiAJCWlndF9p bmZvKCJDYW4ndCB0ZXN0IFBTUjogbm90IHN1cHBvcnRlZCBieSBzaW5rLlxuIik7CiAJCXJldHVy bjsKIAl9CkBAIC0xNzE3LDEyICsxNjM5LDE1IEBAIHN0YXRpYyBpbnQgYWRqdXN0X2Fzc2VydGlv bl9mbGFncyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0LCBpbnQgZmxhZ3MpCiAJfQkJCQkJCQkJ XAogCQkJCQkJCQkJXAogCWlmIChmbGFnc18gJiBBU1NFUlRfUFNSX0VOQUJMRUQpIHsJCQkJXAot CQlpZiAoIXBzcl93YWl0X3VudGlsX2VuYWJsZWQoKSkgewkJCVwKLQkJCXBzcl9wcmludF9zdGF0 dXMoKTsJCQkJXAorCQlpZiAoIWlndF9wc3JfYXdhaXRfc3RhdHVzKGRybS5mZCwgdHJ1ZSkpIHsJ CVwKKwkJCWlndF9wc3JfcHJpbnRfc3RhdHVzKGRybS5mZCk7CQkJXAogCQkJaWd0X2Fzc2VydF9m KGZhbHNlLCAiUFNSIGRpc2FibGVkXG4iKTsJCVwKIAkJfQkJCQkJCQlcCiAJfSBlbHNlIGlmIChm bGFnc18gJiBBU1NFUlRfUFNSX0RJU0FCTEVEKSB7CQkJXAotCQlpZ3RfYXNzZXJ0KCFwc3Jfd2Fp dF91bnRpbF9lbmFibGVkKCkpOwkJCVwKKwkJaWYgKCFpZ3RfcHNyX2F3YWl0X3N0YXR1cyhkcm0u ZmQsIGZhbHNlKSkgewkJXAorCQkJaWd0X3Bzcl9wcmludF9zdGF0dXMoZHJtLmZkKTsgICAgICAg ICAgICAgICAgICAgXAorCQkJaWd0X2Fzc2VydF9mKGZhbHNlLCAiUFNSIGVuYWJsZWRcbiIpOwkJ XAorCQl9CQkJCQkJCVwKIAl9CQkJCQkJCQlcCiB9IHdoaWxlICgwKQogCkBAIC0xODIyLDcgKzE3 NDcsNyBAQCBzdGF0aWMgdm9pZCBlbmFibGVfZmVhdHVyZXNfZm9yX3Rlc3QoY29uc3Qgc3RydWN0 IHRlc3RfbW9kZSAqdCkKIAlpZiAodC0+ZmVhdHVyZSAmIEZFQVRVUkVfRkJDKQogCQlmYmNfZW5h YmxlKCk7CiAJaWYgKHQtPmZlYXR1cmUgJiBGRUFUVVJFX1BTUikKLQkJcHNyX2VuYWJsZSgpOwor CQlpZ3RfcHNyX2VuYWJsZSgpOwogfQogCiBzdGF0aWMgdm9pZCBjaGVja190ZXN0X3JlcXVpcmVt ZW50cyhjb25zdCBzdHJ1Y3QgdGVzdF9tb2RlICp0KQotLSAKMi43LjQKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QK SW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=