From: Jim Bride Subject: [PATCH IGT 07/11] lib: Add igt_psr_await_status() and modify tests to use it. Date: Tue, 11 Jul 2017 15:48:32 -0700 Message-ID: <1499813316-15038-8-git-send-email-jim.bride@linux.intel.com> References: <1499813316-15038-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 mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF1D16E320 for ; Tue, 11 Jul 2017 22:51:07 +0000 (UTC) In-Reply-To: <1499813316-15038-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 List-Id: intel-gfx@lists.freedesktop.org U2lnbmVkLW9mZi1ieTogSmltIEJyaWRlIDxqaW0uYnJpZGVAbGludXguaW50ZWwuY29tPgotLS0K IGxpYi9pZ3RfcHNyLmMgICAgICAgICAgICAgICAgICAgIHwgMTIgKysrKysrKysrKysrCiBsaWIv aWd0X3Bzci5oICAgICAgICAgICAgICAgICAgICB8ICAxICsKIHRlc3RzL2ttc19mYmNvbl9mYnQu YyAgICAgICAgICAgIHwgMjggKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLQogdGVzdHMva21z X2Zyb250YnVmZmVyX3RyYWNraW5nLmMgfCAxNyArKysrKy0tLS0tLS0tLS0tLQogdGVzdHMva21z X3Bzcl9zaW5rX2NyYy5jICAgICAgICAgfCAxNiArKy0tLS0tLS0tLS0tLS0tCiA1IGZpbGVzIGNo YW5nZWQsIDMyIGluc2VydGlvbnMoKyksIDQyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xp Yi9pZ3RfcHNyLmMgYi9saWIvaWd0X3Bzci5jCmluZGV4IGQ4NDk5NjEuLmQyN2MzMmEgMTAwNjQ0 Ci0tLSBhL2xpYi9pZ3RfcHNyLmMKKysrIGIvbGliL2lndF9wc3IuYwpAQCAtMTAyLDMgKzEwMiwx NSBAQCBib29sIGlndF9wc3JfYWN0aXZlKGludCBmZCkKIAkJIGFjdHJldCA/ICJ0cnVlIiA6ICJm YWxzZSIpOwogCXJldHVybiBod2FjdHJldCAmJiBhY3RyZXQ7CiB9CisKKy8qKgorICogaWd0X3Bz cl9hd2FpdF9zdGF0dXM6CisgKiBAYWN0aXZlOiBBIGJvb2xlYW4gdGhhdCBjYXVzZXMgdGhlIGZ1 bmN0aW9uIHRvIHdhaXQgZm9yIFBTUiB0byBhY3RpdmF0ZQorICogICAgICAgICAgaWYgc2V0IHRv IHRydWUsIG9yIHRvIHdhaXQgZm9yIFBTUiB0byBkZWFjdGl2YXRlIGlmIGZhbHNlLgorICoKKyAq IFJldHVybnMgdHJ1ZSBpZiB0aGUgcmVxdWVzdGVkIGNvbmRpdGlvbiBpcyBtZXQuCisgKi8KK2Jv b2wgaWd0X3Bzcl9hd2FpdF9zdGF0dXMoaW50IGZkLCBib29sIGFjdGl2ZSkKK3sKKwlyZXR1cm4g aWd0X3dhaXQoaWd0X3Bzcl9hY3RpdmUoZmQpID09IGFjdGl2ZSwgNTAwMCwgMSk7Cit9CmRpZmYg LS1naXQgYS9saWIvaWd0X3Bzci5oIGIvbGliL2lndF9wc3IuaAppbmRleCBiNjc4MzI5Li4zYzM1 NWUwIDEwMDY0NAotLS0gYS9saWIvaWd0X3Bzci5oCisrKyBiL2xpYi9pZ3RfcHNyLmgKQEAgLTMx LDUgKzMxLDYgQEAgYm9vbCBpZ3RfcHNyX3NvdXJjZV9zdXBwb3J0KGludCBmZCk7CiBib29sIGln dF9wc3Jfc2lua19zdXBwb3J0KGludCBmZCk7CiBib29sIGlndF9wc3JfcG9zc2libGUoaW50IGZk KTsKIGJvb2wgaWd0X3Bzcl9hY3RpdmUoaW50IGZkKTsKK2Jvb2wgaWd0X3Bzcl9hd2FpdF9zdGF0 dXMoaW50IGZkLCBib29sIGFjdGl2ZSk7CiAKICNlbmRpZiAvKiBJR1RfUFNSX0ggKi8KZGlmZiAt LWdpdCBhL3Rlc3RzL2ttc19mYmNvbl9mYnQuYyBiL3Rlc3RzL2ttc19mYmNvbl9mYnQuYwppbmRl eCA0MWFiMzZkLi5jYmE2MzJlIDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfZmJjb25fZmJ0LmMKKysr IGIvdGVzdHMva21zX2ZiY29uX2ZidC5jCkBAIC0xMDMsOCArMTAzLDkgQEAgc3RhdGljIGJvb2wg ZmJjX2lzX2VuYWJsZWQoaW50IGZkKQogCXJldHVybiBzdHJzdHIoYnVmLCAiRkJDIGVuYWJsZWRc biIpOwogfQogCi1zdGF0aWMgYm9vbCBmYmNfd2FpdF91bnRpbF9lbmFibGVkKGludCBmZCkKK3N0 YXRpYyBib29sIGZiY19hd2FpdF9zdGF0dXMoaW50IGZkLCBib29sIGVuYWJsZWQpCiB7CisJaWd0 X2Fzc2VydChlbmFibGVkKTsKIAlyZXR1cm4gaWd0X3dhaXQoZmJjX2lzX2VuYWJsZWQoZmQpLCA1 MDAwLCAxKTsKIH0KIApAQCAtMTU3LDI5ICsxNTgsMjQgQEAgc3RhdGljIGJvb2wgY29ubmVjdG9y X2Nhbl9wc3IoZHJtTW9kZUNvbm5lY3RvclB0ciBjb25uZWN0b3IpCiAJcmV0dXJuIChjb25uZWN0 b3ItPmNvbm5lY3Rvcl90eXBlID09IERSTV9NT0RFX0NPTk5FQ1RPUl9lRFApOwogfQogCi1zdGF0 aWMgYm9vbCBwc3JfaXNfZW5hYmxlZChpbnQgZmQpCitzdGF0aWMgYm9vbCBwc3JfYXdhaXRfc3Rh dHVzKGludCBmZCwgYm9vbCBlbmFibGVkKQogewotCXJldHVybiBpZ3RfcHNyX2FjdGl2ZShmZCk7 Ci19Ci0KLXN0YXRpYyBib29sIHBzcl93YWl0X3VudGlsX2VuYWJsZWQoaW50IGZkKQotewotCXJl dHVybiBpZ3Rfd2FpdChwc3JfaXNfZW5hYmxlZChmZCksIDUwMDAsIDEpOworCXJldHVybiBpZ3Rf cHNyX2F3YWl0X3N0YXR1cyhmZCwgZW5hYmxlZCk7CiB9CiAKIHN0cnVjdCBmZWF0dXJlIHsKIAli b29sICgqc3VwcG9ydGVkX29uX2NoaXBzZXQpKGludCBmZCk7Ci0JYm9vbCAoKndhaXRfdW50aWxf ZW5hYmxlZCkoaW50IGZkKTsKKwlib29sICgqYXdhaXRfc3RhdHVzKShpbnQgZmQsIGJvb2wgZW5h YmxlZCk7CiAJYm9vbCAoKmNvbm5lY3Rvcl9wb3NzaWJsZV9mbikoZHJtTW9kZUNvbm5lY3RvclB0 ciBjb25uZWN0b3IpOwogCWNvbnN0IGNoYXIgKnBhcmFtX25hbWU7CiB9IGZiYyA9IHsKIAkuc3Vw cG9ydGVkX29uX2NoaXBzZXQgPSBmYmNfc3VwcG9ydGVkX29uX2NoaXBzZXQsCi0JLndhaXRfdW50 aWxfZW5hYmxlZCA9IGZiY193YWl0X3VudGlsX2VuYWJsZWQsCisJLmF3YWl0X3N0YXR1cyA9IGZi Y19hd2FpdF9zdGF0dXMsCiAJLmNvbm5lY3Rvcl9wb3NzaWJsZV9mbiA9IGNvbm5lY3Rvcl9jYW5f ZmJjLAogCS5wYXJhbV9uYW1lID0gImVuYWJsZV9mYmMiLAogfSwgcHNyID0gewogCS5zdXBwb3J0 ZWRfb25fY2hpcHNldCA9IHBzcl9zdXBwb3J0ZWRfb25fY2hpcHNldCwKLQkud2FpdF91bnRpbF9l bmFibGVkID0gcHNyX3dhaXRfdW50aWxfZW5hYmxlZCwKKwkuYXdhaXRfc3RhdHVzID0gcHNyX2F3 YWl0X3N0YXR1cywKIAkuY29ubmVjdG9yX3Bvc3NpYmxlX2ZuID0gY29ubmVjdG9yX2Nhbl9wc3Is CiAJLnBhcmFtX25hbWUgPSAiZW5hYmxlX3BzciIsCiB9OwpAQCAtMjA0LDE3ICsyMDAsMTcgQEAg c3RhdGljIHZvaWQgc3VidGVzdChzdHJ1Y3QgZmVhdHVyZSAqZmVhdHVyZSwgYm9vbCBzdXNwZW5k KQogCiAJa21zdGVzdF91bnNldF9hbGxfY3J0Y3MoZHJtLmZkLCBkcm0ucmVzKTsKIAl3YWl0X3Vz ZXIoIk1vZGVzIHVuc2V0LiIpOwotCWlndF9hc3NlcnQoIWZlYXR1cmUtPndhaXRfdW50aWxfZW5h YmxlZChkcm0uZmQpKTsKKwlpZ3RfYXNzZXJ0KGZlYXR1cmUtPmF3YWl0X3N0YXR1cyhkcm0uZmQs IGZhbHNlKSk7CiAKIAlzZXRfbW9kZV9mb3Jfb25lX3NjcmVlbigmZHJtLCAmZmIsIGZlYXR1cmUt PmNvbm5lY3Rvcl9wb3NzaWJsZV9mbik7CiAJd2FpdF91c2VyKCJTY3JlZW4gc2V0LiIpOwotCWln dF9hc3NlcnQoZmVhdHVyZS0+d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCkpOworCWlndF9hc3Nl cnQoZmVhdHVyZS0+YXdhaXRfc3RhdHVzKGRybS5mZCwgdHJ1ZSkpOwogCiAJaWYgKHN1c3BlbmQp IHsKIAkJaWd0X3N5c3RlbV9zdXNwZW5kX2F1dG9yZXN1bWUoU1VTUEVORF9TVEFURV9NRU0sCiAJ CQkJCSAgICAgIFNVU1BFTkRfVEVTVF9OT05FKTsKIAkJc2xlZXAoNSk7Ci0JCWlndF9hc3NlcnQo ZmVhdHVyZS0+d2FpdF91bnRpbF9lbmFibGVkKGRybS5mZCkpOworCQlpZ3RfYXNzZXJ0KGZlYXR1 cmUtPmF3YWl0X3N0YXR1cyhkcm0uZmQsIHRydWUpKTsKIAl9CiAKIAlpZ3RfcmVtb3ZlX2ZiKGRy bS5mZCwgJmZiKTsKQEAgLTIyNCwxMyArMjIwLDEzIEBAIHN0YXRpYyB2b2lkIHN1YnRlc3Qoc3Ry dWN0IGZlYXR1cmUgKmZlYXR1cmUsIGJvb2wgc3VzcGVuZCkKIAlzbGVlcCgzKTsKIAogCXdhaXRf dXNlcigiQmFjayB0byBmYmNvbi4iKTsKLQlpZ3RfYXNzZXJ0KCFmZWF0dXJlLT53YWl0X3VudGls X2VuYWJsZWQoZHJtLmZkKSk7CisJaWd0X2Fzc2VydChmZWF0dXJlLT5hd2FpdF9zdGF0dXMoZHJt LmZkLCBmYWxzZSkpOwogCiAJaWYgKHN1c3BlbmQpIHsKIAkJaWd0X3N5c3RlbV9zdXNwZW5kX2F1 dG9yZXN1bWUoU1VTUEVORF9TVEFURV9NRU0sCiAJCQkJCSAgICAgIFNVU1BFTkRfVEVTVF9OT05F KTsKIAkJc2xlZXAoNSk7Ci0JCWlndF9hc3NlcnQoIWZlYXR1cmUtPndhaXRfdW50aWxfZW5hYmxl ZChkcm0uZmQpKTsKKwkJaWd0X2Fzc2VydChmZWF0dXJlLT5hd2FpdF9zdGF0dXMoZHJtLmZkLCBm YWxzZSkpOwogCX0KIH0KIApkaWZmIC0tZ2l0IGEvdGVzdHMva21zX2Zyb250YnVmZmVyX3RyYWNr aW5nLmMgYi90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYwppbmRleCBiMjAyMjk3Li40 ZDIwODk5IDEwMDY0NAotLS0gYS90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYworKysg Yi90ZXN0cy9rbXNfZnJvbnRidWZmZXJfdHJhY2tpbmcuYwpAQCAtNzk4LDExICs3OTgsNiBAQCBz dGF0aWMgdm9pZCBmYmNfcHJpbnRfc3RhdHVzKHZvaWQpCiAJaWd0X2luZm8oIkZCQyBzdGF0dXM6 XG4lc1xuIiwgYnVmKTsKIH0KIAotc3RhdGljIGJvb2wgcHNyX2lzX2VuYWJsZWQodm9pZCkKLXsK LQlyZXR1cm4gaWd0X3Bzcl9hY3RpdmUoZHJtLmZkKTsKLX0KLQogc3RhdGljIHZvaWQgcHNyX3By aW50X3N0YXR1cyh2b2lkKQogewogCWNoYXIgYnVmWzI1Nl07CkBAIC05MTYsMTEgKzkxMSw2IEBA IHN0YXRpYyBib29sIGZiY193YWl0X3VudGlsX2VuYWJsZWQodm9pZCkKIAlyZXR1cm4gaWd0X3dh aXQoZmJjX2lzX2VuYWJsZWQoKSwgMjAwMCwgMSk7CiB9CiAKLXN0YXRpYyBib29sIHBzcl93YWl0 X3VudGlsX2VuYWJsZWQodm9pZCkKLXsKLQlyZXR1cm4gaWd0X3dhaXQocHNyX2lzX2VuYWJsZWQo KSwgNTAwMCwgMSk7Ci19Ci0KICNkZWZpbmUgZmJjX2VuYWJsZSgpIGlndF9zZXRfbW9kdWxlX3Bh cmFtX2ludCgiZW5hYmxlX2ZiYyIsIDEpCiAjZGVmaW5lIGZiY19kaXNhYmxlKCkgaWd0X3NldF9t b2R1bGVfcGFyYW1faW50KCJlbmFibGVfZmJjIiwgMCkKICNkZWZpbmUgcHNyX2VuYWJsZSgpIGln dF9wc3JfZW5hYmxlKCkKQEAgLTE3MDQsMTIgKzE2OTQsMTUgQEAgc3RhdGljIGludCBhZGp1c3Rf YXNzZXJ0aW9uX2ZsYWdzKGNvbnN0IHN0cnVjdCB0ZXN0X21vZGUgKnQsIGludCBmbGFncykKIAl9 CQkJCQkJCQlcCiAJCQkJCQkJCQlcCiAJaWYgKGZsYWdzXyAmIEFTU0VSVF9QU1JfRU5BQkxFRCkg ewkJCQlcCi0JCWlmICghcHNyX3dhaXRfdW50aWxfZW5hYmxlZCgpKSB7CQkJXAorCQlpZiAoIWln dF9wc3JfYXdhaXRfc3RhdHVzKGRybS5mZCwgdHJ1ZSkpIHsJCVwKIAkJCXBzcl9wcmludF9zdGF0 dXMoKTsJCQkJXAogCQkJaWd0X2Fzc2VydF9mKGZhbHNlLCAiUFNSIGRpc2FibGVkXG4iKTsJCVwK IAkJfQkJCQkJCQlcCiAJfSBlbHNlIGlmIChmbGFnc18gJiBBU1NFUlRfUFNSX0RJU0FCTEVEKSB7 CQkJXAotCQlpZ3RfYXNzZXJ0KCFwc3Jfd2FpdF91bnRpbF9lbmFibGVkKCkpOwkJCVwKKwkJaWYg KCFpZ3RfcHNyX2F3YWl0X3N0YXR1cyhkcm0uZmQsIGZhbHNlKSkgeyAgICAgICAgICAgICBcCisJ CQlwc3JfcHJpbnRfc3RhdHVzKCk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCisJCQlp Z3RfYXNzZXJ0X2YoZmFsc2UsICJQU1IgZW5hYmxlZFxuIik7ICAgICAgICAgICBcCisJCX0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogCX0J CQkJCQkJCVwKIH0gd2hpbGUgKDApCiAKZGlmZiAtLWdpdCBhL3Rlc3RzL2ttc19wc3Jfc2lua19j cmMuYyBiL3Rlc3RzL2ttc19wc3Jfc2lua19jcmMuYwppbmRleCAwYzI3ZmM3Li5jOWY3OTkzIDEw MDY0NAotLS0gYS90ZXN0cy9rbXNfcHNyX3NpbmtfY3JjLmMKKysrIGIvdGVzdHMva21zX3Bzcl9z aW5rX2NyYy5jCkBAIC0xOTgsMjIgKzE5OCwxMCBAQCBzdGF0aWMgYm9vbCBwc3JfcG9zc2libGUo ZGF0YV90ICpkYXRhKQogCQlpZ3RfcHNyX3Bvc3NpYmxlKGRhdGEtPmRybV9mZCk7CiB9CiAKLXN0 YXRpYyBib29sIHBzcl9hY3RpdmUoZGF0YV90ICpkYXRhKQotewotCi0JcmV0dXJuIHJ1bm5pbmdf d2l0aF9wc3JfZGlzYWJsZWQgfHwKLQkJaWd0X3Bzcl9hY3RpdmUoZGF0YS0+ZHJtX2ZkKTsKLX0K LQogc3RhdGljIGJvb2wgd2FpdF9wc3JfZW50cnkoZGF0YV90ICpkYXRhKQogewotCWludCB0aW1l b3V0ID0gNTsKLQl3aGlsZSAodGltZW91dC0tKSB7Ci0JCWlmIChwc3JfYWN0aXZlKGRhdGEpKQot CQkJcmV0dXJuIHRydWU7Ci0JCXNsZWVwKDEpOwotCX0KLQlyZXR1cm4gZmFsc2U7CisJcmV0dXJu IHJ1bm5pbmdfd2l0aF9wc3JfZGlzYWJsZWQgfHwKKwkJaWd0X3Bzcl9hd2FpdF9zdGF0dXMoZGF0 YS0+ZHJtX2ZkLCB0cnVlKTsKIH0KIAogc3RhdGljIHZvaWQgZ2V0X3NpbmtfY3JjKGRhdGFfdCAq ZGF0YSwgY2hhciAqY3JjKSB7Ci0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg==