From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B0B8F6EF8B for ; Fri, 20 Jul 2018 12:12:29 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id z13-v6so9575887wma.5 for ; Fri, 20 Jul 2018 05:12:29 -0700 (PDT) From: Tvrtko Ursulin Date: Fri, 20 Jul 2018 13:12:22 +0100 Message-Id: <20180720121222.31090-1-tvrtko.ursulin@linux.intel.com> In-Reply-To: <153208022343.25018.4045411798193903976@skylake-alporthouse-com> References: <153208022343.25018.4045411798193903976@skylake-alporthouse-com> Subject: [igt-dev] [PATCH i-g-t v3] tests/perf_pmu: Restore runtime PM at subtest exit List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org, Tvrtko Ursulin List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlc3RvcmUg cnVudGltZSBQTSBzdGF0ZSAodmlhIGEgbmV3bHkgYWRkZWQgbGlicmFyeSBmdW5jdGlvbikgd2hl biB0aGUKdGVzdCB3aGljaCBzZXRzIGl0IHVwIGV4aXQuIFRoaXMgd2FzIHdlIGF2b2lkIHJ1bm5p bmcgYWxsIHN1YnNlcXVlbnQgc3ViLQp0ZXN0cyBpbiB0aGUgYWdncmVzc2l2ZSBydW50aW1lIFBN IG1vZGUuCgp2MjoKICogU2tpcCBkb3VibGUgcmVzdG9yZS4gKENocmlzIFdpbHNvbikKICogQ2xv c2UgcHJldmlvdXNseSBsZWFrZWQgZmQuCgp2MzoKICogUmVmYWN0b3IgYXRleGl0IGhhbmRsZXJz IHRvIGJlIHNpZ25hbCBzYWZlLiAoQ2hyaXMgV2lsc29uKQogKiBSZXN0b3JlIGF1ZGlvIHJ1bnRp bWUgUE0gc3RhdHVzLgogKiBBZGQgYSBkaWZmZXJlbnQgUENJIHBhdGggdG8gYXVkaW8gZGV2aWNl LgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KLS0tCiBsaWIvaWd0X3BtLmMgICAgIHwgMTUyICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tCiBsaWIvaWd0X3BtLmggICAgIHwgICAxICsKIHRlc3RzL3Bl cmZfcG11LmMgfCAgIDMgKwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMzQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9wbS5jIGIvbGliL2lndF9wbS5jCmlu ZGV4IDhhYzEzMjI2OWQ3OS4uMWZlOGY1ZjQ2Mzk5IDEwMDY0NAotLS0gYS9saWIvaWd0X3BtLmMK KysrIGIvbGliL2lndF9wbS5jCkBAIC02MywzNiArNjMsNzMgQEAgZW51bSB7CiAvKiBSZW1lbWJl ciB0byBmaXggdGhpcyBpZiBhZGRpbmcgbG9uZ2VyIHN0cmluZ3MgKi8KICNkZWZpbmUgTUFYX1BP TElDWV9TVFJMRU4Jc3RybGVuKE1BWF9QRVJGT1JNQU5DRV9TVFIpCiAKK3N0YXRpYyBjb25zdCBj aGFyICpjb25zdCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2xfcGF0aHNbXSA9IHsKKwki L3N5cy9idXMvcGNpL2RldmljZXMvMDAwMDowMDowMy4wL3Bvd2VyL2NvbnRyb2wiLAorCSIvc3lz L2J1cy9wY2kvZGV2aWNlcy8wMDAwOjAwOjFmLjMvcG93ZXIvY29udHJvbCIsCit9OworCiBzdGF0 aWMgY2hhciBfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmVbNjRdOworc3RhdGljIGNv bnN0IGNoYXIgKiBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2xfcGF0aDsKIHN0YXRpYyBj aGFyIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbFs2NF07CiAKLXN0YXRpYyB2b2lkIF9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfZXhpdF9oYW5kbGVyKGludCBzaWcpCitzdGF0aWMgaW50IF9f aWd0X3BtX2F1ZGlvX3Jlc3RvcmVfcnVudGltZV9wbSh2b2lkKQogewogCWludCBmZDsKIAotCWln dF9kZWJ1ZygiUmVzdG9yaW5nIGF1ZGlvIHBvd2VyIG1hbmFnZW1lbnQgdG8gJyVzJyBhbmQgJyVz J1xuIiwKLQkJICBfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUsCi0JCSAgX19pZ3Rf cG1fYXVkaW9fcnVudGltZV9jb250cm9sKTsKKwlpZiAoIV9faWd0X3BtX2F1ZGlvX3J1bnRpbWVf cG93ZXJfc2F2ZVswXSkKKwkJcmV0dXJuIDA7CiAKIAlmZCA9IG9wZW4oIi9zeXMvbW9kdWxlL3Nu ZF9oZGFfaW50ZWwvcGFyYW1ldGVycy9wb3dlcl9zYXZlIiwgT19XUk9OTFkpOwogCWlmIChmZCA8 IDApCi0JCXJldHVybjsKKwkJcmV0dXJuIGVycm5vOworCiAJaWYgKHdyaXRlKGZkLCBfX2lndF9w bV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUsCiAJCSAgc3RybGVuKF9faWd0X3BtX2F1ZGlvX3J1 bnRpbWVfcG93ZXJfc2F2ZSkpICE9Ci0JICAgIHN0cmxlbihfX2lndF9wbV9hdWRpb19ydW50aW1l X3Bvd2VyX3NhdmUpKQotCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3RvcmUgYXVkaW8gcG93ZXJf c2F2ZSB0byAnJXMnXG4iLAotCQkJIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfcG93ZXJfc2F2ZSk7 CisJICAgIHN0cmxlbihfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUpKSB7CisJCWNs b3NlKGZkKTsKKwkJcmV0dXJuIGVycm5vOworCX0KKwogCWNsb3NlKGZkKTsKIAotCWZkID0gb3Bl bigiL3N5cy9idXMvcGNpL2RldmljZXMvMDAwMDowMDowMy4wL3Bvd2VyL2NvbnRyb2wiLCBPX1dS T05MWSk7CisJZmQgPSBvcGVuKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRoLCBP X1dST05MWSk7CiAJaWYgKGZkIDwgMCkKLQkJcmV0dXJuOworCQlyZXR1cm4gZXJybm87CisKIAlp ZiAod3JpdGUoZmQsIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCwKIAkJICBzdHJsZW4o X19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sKSkgIT0KLQkgICAgc3RybGVuKF9faWd0X3Bt X2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpCi0JCWlndF93YXJuKCJGYWlsZWQgdG8gcmVzdG9yZSBh dWRpbyBjb250cm9sIHRvICclcydcbiIsCi0JCQkgX19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250 cm9sKTsKKwkgICAgc3RybGVuKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpIHsKKwkJ Y2xvc2UoZmQpOworCQlyZXR1cm4gZXJybm87CisJfQorCiAJY2xvc2UoZmQpOworCisJX19pZ3Rf cG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZlWzBdID0gMDsKKworCXJldHVybiAwOworfQorCitz dGF0aWMgdm9pZCBpZ3RfcG1fYXVkaW9fcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCit7CisJaW50 IHJldDsKKworCWlmICghX19pZ3RfcG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZlWzBdKQorCQly ZXR1cm47CisKKwlpZ3RfZGVidWcoIlJlc3RvcmluZyBhdWRpbyBwb3dlciBtYW5hZ2VtZW50IHRv ICclcycgYW5kICclcydcbiIsCisJCSAgX19pZ3RfcG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZl LAorCQkgIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCk7CisKKwlyZXQgPSBfX2lndF9w bV9hdWRpb19yZXN0b3JlX3J1bnRpbWVfcG0oKTsKKwlpZiAocmV0KQorCQlpZ3Rfd2FybigiRmFp bGVkIHRvIHJlc3RvcmUgcnVudGltZSBhdWRpbyBQTSEgKGVycm5vPSVkKVxuIiwKKwkJCSByZXQp OworfQorCitzdGF0aWMgdm9pZCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2V4aXRfaGFuZGxlcihp bnQgc2lnKQoreworCV9faWd0X3BtX2F1ZGlvX3Jlc3RvcmVfcnVudGltZV9wbSgpOwogfQogCiBz dGF0aWMgdm9pZCBzdHJjaG9tcChjaGFyICpzdHIpCkBAIC0xMTYsNyArMTUzLDcgQEAgc3RhdGlj IHZvaWQgc3RyY2hvbXAoY2hhciAqc3RyKQogICovCiB2b2lkIGlndF9wbV9lbmFibGVfYXVkaW9f cnVudGltZV9wbSh2b2lkKQogewotCWludCBmZDsKKwlpbnQgZmQsIGk7CiAKIAkvKiBDaGVjayBp ZiBhbHJlYWR5IGVuYWJsZWQuICovCiAJaWYgKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfcG93ZXJf c2F2ZVswXSkKQEAgLTEzMSwxNCArMTY4LDIzIEBAIHZvaWQgaWd0X3BtX2VuYWJsZV9hdWRpb19y dW50aW1lX3BtKHZvaWQpCiAJCWlndF9hc3NlcnRfZXEod3JpdGUoZmQsICIxXG4iLCAyKSwgMik7 CiAJCWNsb3NlKGZkKTsKIAl9Ci0JZmQgPSBvcGVuKCIvc3lzL2J1cy9wY2kvZGV2aWNlcy8wMDAw OjAwOjAzLjAvcG93ZXIvY29udHJvbCIsIE9fUkRXUik7Ci0JaWYgKGZkID49IDApIHsKLQkJaWd0 X2Fzc2VydChyZWFkKGZkLCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wsCi0JCQkJc2l6 ZW9mKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpID4gMCk7Ci0JCXN0cmNob21wKF9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCk7Ci0JCWlndF9hc3NlcnRfZXEod3JpdGUoZmQs ICJhdXRvXG4iLCA1KSwgNSk7Ci0JCWNsb3NlKGZkKTsKKworCWZvciAoaSA9IDA7IGkgPCBBUlJB WV9TSVpFKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRocyk7IGkrKykgeworCQlj b25zdCBjaGFyICpwYXRoID0gX19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sX3BhdGhzW2ld OworCisJCWZkID0gb3BlbihwYXRoLCBPX1JEV1IpOworCQlpZiAoZmQgPj0gMCkgeworCQkJX19p Z3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sX3BhdGggPSBwYXRoOworCQkJaWd0X2Fzc2VydChy ZWFkKGZkLCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wsCisJCQkJCXNpemVvZihfX2ln dF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wpKSA+IDApOworCQkJc3RyY2hvbXAoX19pZ3RfcG1f YXVkaW9fcnVudGltZV9jb250cm9sKTsKKwkJCWlndF9hc3NlcnRfZXEod3JpdGUoZmQsICJhdXRv XG4iLCA1KSwgNSk7CisJCQljbG9zZShmZCk7CisJCQlicmVhazsKKwkJfQogCX0KKwlpZiAoIV9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRoKQorCQlpZ3Rfd2FybigiRmFpbGVkIHRv IGZpbmQgYXVkaW8gUENJIGRldmljZSFcbiIpOwogCiAJaWd0X2RlYnVnKCJTYXZlZCBhdWRpbyBw b3dlciBtYW5hZ2VtZW50IGFzICclcycgYW5kICclcydcbiIsCiAJCSAgX19pZ3RfcG1fYXVkaW9f cnVudGltZV9wb3dlcl9zYXZlLApAQCAtMjkxLDM5ICszMzcsNzcgQEAgdm9pZCBpZ3RfcG1fcmVz dG9yZV9zYXRhX2xpbmtfcG93ZXJfbWFuYWdlbWVudChpbnQ4X3QgKnBtX2RhdGEpCiAJZnJlZShm aWxlX25hbWUpOwogfQogI2RlZmluZSBQT1dFUl9ESVIgIi9zeXMvZGV2aWNlcy9wY2kwMDAwOjAw LzAwMDA6MDA6MDIuMC9wb3dlciIKLS8qIFdlIGp1c3QgbGVhayB0aGlzIG9uIGV4aXQgLi4uICov CiBpbnQgcG1fc3RhdHVzX2ZkID0gLTE7CiAKIHN0YXRpYyBjaGFyIF9faWd0X3BtX3J1bnRpbWVf YXV0b3N1c3BlbmRbNjRdOwogc3RhdGljIGNoYXIgX19pZ3RfcG1fcnVudGltZV9jb250cm9sWzY0 XTsKIAotc3RhdGljIHZvaWQgX19pZ3RfcG1fcnVudGltZV9leGl0X2hhbmRsZXIoaW50IHNpZykK K3N0YXRpYyBpbnQgX19pZ3RfcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCiB7CiAJaW50IGZkOwog Ci0JaWd0X2RlYnVnKCJSZXN0b3JpbmcgcnVudGltZSBtYW5hZ2VtZW50IHRvICclcycgYW5kICcl cydcbiIsCi0JCSAgX19pZ3RfcG1fcnVudGltZV9hdXRvc3VzcGVuZCwKLQkJICBfX2lndF9wbV9y dW50aW1lX2NvbnRyb2wpOworCWlmIChwbV9zdGF0dXNfZmQgPCAwKQorCQlyZXR1cm4gMDsKIAog CWZkID0gb3BlbihQT1dFUl9ESVIgIi9hdXRvc3VzcGVuZF9kZWxheV9tcyIsIE9fV1JPTkxZKTsK IAlpZiAoZmQgPCAwKQotCQlyZXR1cm47CisJCXJldHVybiBlcnJubzsKKwogCWlmICh3cml0ZShm ZCwgX19pZ3RfcG1fcnVudGltZV9hdXRvc3VzcGVuZCwKIAkJICBzdHJsZW4oX19pZ3RfcG1fcnVu dGltZV9hdXRvc3VzcGVuZCkpICE9Ci0JICAgIHN0cmxlbihfX2lndF9wbV9ydW50aW1lX2F1dG9z dXNwZW5kKSkKLQkJaWd0X3dhcm4oIkZhaWxlZCB0byByZXN0b3JlIHJ1bnRpbWUgcG0gYXV0b3N1 c3BlbmQgZGVsYXkgdG8gJyVzJ1xuIiwKLQkJCSBfX2lndF9wbV9ydW50aW1lX2F1dG9zdXNwZW5k KTsKKwkgICAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfYXV0b3N1c3BlbmQpKSB7CisJCWNsb3Nl KGZkKTsKKwkJcmV0dXJuIGVycm5vOworCX0KKwogCWNsb3NlKGZkKTsKIAogCWZkID0gb3BlbihQ T1dFUl9ESVIgIi9jb250cm9sIiwgT19XUk9OTFkpOwogCWlmIChmZCA8IDApCi0JCXJldHVybjsK KwkJcmV0dXJuIGVycm5vOworCiAJaWYgKHdyaXRlKGZkLCBfX2lndF9wbV9ydW50aW1lX2NvbnRy b2wsCiAJCSAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfY29udHJvbCkpICE9Ci0JICAgIHN0cmxl bihfX2lndF9wbV9ydW50aW1lX2NvbnRyb2wpKQotCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3Rv cmUgcnVudGltZSBwbSBjb250cm9sIHRvICclcydcbiIsCi0JCQkgX19pZ3RfcG1fcnVudGltZV9j b250cm9sKTsKKwkgICAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfY29udHJvbCkpIHsKKwkJY2xv c2UoZmQpOworCQlyZXR1cm4gZXJybm87CisJfQorCiAJY2xvc2UoZmQpOworCisJY2xvc2UocG1f c3RhdHVzX2ZkKTsKKwlwbV9zdGF0dXNfZmQgPSAtMTsKKworCXJldHVybiAwOworfQorCisvKioK KyAqIGlndF9yZXN0b3JlX3J1bnRpbWVfcG06CisgKgorICogUmVzdG9yZXMgdGhlIHJ1bnRpbWUg UE0gY29uZmlndXJhdGlvbiBhcyBpdCB3YXMgYmVmb3JlIHRoZSBjYWxsIHRvCisgKiBpZ3Rfc2V0 dXBfcnVudGltZV9wbS4KKyAqLwordm9pZCBpZ3RfcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCit7 CisJaW50IHJldDsKKworCWlmIChwbV9zdGF0dXNfZmQgPCAwKQorCQlyZXR1cm47CisKKwlpZ3Rf ZGVidWcoIlJlc3RvcmluZyBydW50aW1lIFBNIG1hbmFnZW1lbnQgdG8gJyVzJyBhbmQgJyVzJ1xu IiwKKwkJICBfX2lndF9wbV9ydW50aW1lX2F1dG9zdXNwZW5kLAorCQkgIF9faWd0X3BtX3J1bnRp bWVfY29udHJvbCk7CisKKwlyZXQgPSBfX2lndF9yZXN0b3JlX3J1bnRpbWVfcG0oKTsKKwlpZiAo cmV0KQorCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3RvcmUgcnVudGltZSBQTSEgKGVycm5vPSVk KVxuIiwgcmV0KTsKKworCWlndF9wbV9hdWRpb19yZXN0b3JlX3J1bnRpbWVfcG0oKTsKK30KKwor c3RhdGljIHZvaWQgX19pZ3RfcG1fcnVudGltZV9leGl0X2hhbmRsZXIoaW50IHNpZykKK3sKKwlf X2lndF9yZXN0b3JlX3J1bnRpbWVfcG0oKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9saWIvaWd0 X3BtLmggYi9saWIvaWd0X3BtLmgKaW5kZXggZWNlZDM5Zjg4MDFhLi4xMGNjNjc5NGU0ZTcgMTAw NjQ0Ci0tLSBhL2xpYi9pZ3RfcG0uaAorKysgYi9saWIvaWd0X3BtLmgKQEAgLTQ3LDYgKzQ3LDcg QEAgZW51bSBpZ3RfcnVudGltZV9wbV9zdGF0dXMgewogfTsKIAogYm9vbCBpZ3Rfc2V0dXBfcnVu dGltZV9wbSh2b2lkKTsKK3ZvaWQgaWd0X3Jlc3RvcmVfcnVudGltZV9wbSh2b2lkKTsKIGVudW0g aWd0X3J1bnRpbWVfcG1fc3RhdHVzIGlndF9nZXRfcnVudGltZV9wbV9zdGF0dXModm9pZCk7CiBi b29sIGlndF93YWl0X2Zvcl9wbV9zdGF0dXMoZW51bSBpZ3RfcnVudGltZV9wbV9zdGF0dXMgc3Rh dHVzKTsKIApkaWZmIC0tZ2l0IGEvdGVzdHMvcGVyZl9wbXUuYyBiL3Rlc3RzL3BlcmZfcG11LmMK aW5kZXggYTFkMzZhYzRmYTlkLi45YTIwYWJiNmI5NWMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3BlcmZf cG11LmMKKysrIGIvdGVzdHMvcGVyZl9wbXUuYwpAQCAtMTQ0MSw2ICsxNDQxLDkgQEAgdGVzdF9y YzYoaW50IGdlbV9mZCwgdW5zaWduZWQgaW50IGZsYWdzKQogCWNsb3NlKGZ3KTsKIAljbG9zZShm ZCk7CiAKKwlpZiAoZmxhZ3MgJiBURVNUX1JVTlRJTUVfUE0pCisJCWlndF9yZXN0b3JlX3J1bnRp bWVfcG0oKTsKKwogCWFzc2VydF93aXRoaW5fZXBzaWxvbihidXN5IC0gcHJldiwgMC4wLCB0b2xl cmFuY2UpOwogfQogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmlndC1kZXYgbWFpbGluZyBsaXN0CmlndC1kZXZAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v aWd0LWRldgo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH i-g-t v3] tests/perf_pmu: Restore runtime PM at subtest exit Date: Fri, 20 Jul 2018 13:12:22 +0100 Message-ID: <20180720121222.31090-1-tvrtko.ursulin@linux.intel.com> References: <153208022343.25018.4045411798193903976@skylake-alporthouse-com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F9046E3E2 for ; Fri, 20 Jul 2018 12:12:29 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id h20-v6so9515319wmb.4 for ; Fri, 20 Jul 2018 05:12:29 -0700 (PDT) In-Reply-To: <153208022343.25018.4045411798193903976@skylake-alporthouse-com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KClJlc3RvcmUg cnVudGltZSBQTSBzdGF0ZSAodmlhIGEgbmV3bHkgYWRkZWQgbGlicmFyeSBmdW5jdGlvbikgd2hl biB0aGUKdGVzdCB3aGljaCBzZXRzIGl0IHVwIGV4aXQuIFRoaXMgd2FzIHdlIGF2b2lkIHJ1bm5p bmcgYWxsIHN1YnNlcXVlbnQgc3ViLQp0ZXN0cyBpbiB0aGUgYWdncmVzc2l2ZSBydW50aW1lIFBN IG1vZGUuCgp2MjoKICogU2tpcCBkb3VibGUgcmVzdG9yZS4gKENocmlzIFdpbHNvbikKICogQ2xv c2UgcHJldmlvdXNseSBsZWFrZWQgZmQuCgp2MzoKICogUmVmYWN0b3IgYXRleGl0IGhhbmRsZXJz IHRvIGJlIHNpZ25hbCBzYWZlLiAoQ2hyaXMgV2lsc29uKQogKiBSZXN0b3JlIGF1ZGlvIHJ1bnRp bWUgUE0gc3RhdHVzLgogKiBBZGQgYSBkaWZmZXJlbnQgUENJIHBhdGggdG8gYXVkaW8gZGV2aWNl LgoKU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNv bT4KLS0tCiBsaWIvaWd0X3BtLmMgICAgIHwgMTUyICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tCiBsaWIvaWd0X3BtLmggICAgIHwgICAxICsKIHRlc3RzL3Bl cmZfcG11LmMgfCAgIDMgKwogMyBmaWxlcyBjaGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgMzQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliL2lndF9wbS5jIGIvbGliL2lndF9wbS5jCmlu ZGV4IDhhYzEzMjI2OWQ3OS4uMWZlOGY1ZjQ2Mzk5IDEwMDY0NAotLS0gYS9saWIvaWd0X3BtLmMK KysrIGIvbGliL2lndF9wbS5jCkBAIC02MywzNiArNjMsNzMgQEAgZW51bSB7CiAvKiBSZW1lbWJl ciB0byBmaXggdGhpcyBpZiBhZGRpbmcgbG9uZ2VyIHN0cmluZ3MgKi8KICNkZWZpbmUgTUFYX1BP TElDWV9TVFJMRU4Jc3RybGVuKE1BWF9QRVJGT1JNQU5DRV9TVFIpCiAKK3N0YXRpYyBjb25zdCBj aGFyICpjb25zdCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2xfcGF0aHNbXSA9IHsKKwki L3N5cy9idXMvcGNpL2RldmljZXMvMDAwMDowMDowMy4wL3Bvd2VyL2NvbnRyb2wiLAorCSIvc3lz L2J1cy9wY2kvZGV2aWNlcy8wMDAwOjAwOjFmLjMvcG93ZXIvY29udHJvbCIsCit9OworCiBzdGF0 aWMgY2hhciBfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmVbNjRdOworc3RhdGljIGNv bnN0IGNoYXIgKiBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2xfcGF0aDsKIHN0YXRpYyBj aGFyIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbFs2NF07CiAKLXN0YXRpYyB2b2lkIF9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfZXhpdF9oYW5kbGVyKGludCBzaWcpCitzdGF0aWMgaW50IF9f aWd0X3BtX2F1ZGlvX3Jlc3RvcmVfcnVudGltZV9wbSh2b2lkKQogewogCWludCBmZDsKIAotCWln dF9kZWJ1ZygiUmVzdG9yaW5nIGF1ZGlvIHBvd2VyIG1hbmFnZW1lbnQgdG8gJyVzJyBhbmQgJyVz J1xuIiwKLQkJICBfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUsCi0JCSAgX19pZ3Rf cG1fYXVkaW9fcnVudGltZV9jb250cm9sKTsKKwlpZiAoIV9faWd0X3BtX2F1ZGlvX3J1bnRpbWVf cG93ZXJfc2F2ZVswXSkKKwkJcmV0dXJuIDA7CiAKIAlmZCA9IG9wZW4oIi9zeXMvbW9kdWxlL3Nu ZF9oZGFfaW50ZWwvcGFyYW1ldGVycy9wb3dlcl9zYXZlIiwgT19XUk9OTFkpOwogCWlmIChmZCA8 IDApCi0JCXJldHVybjsKKwkJcmV0dXJuIGVycm5vOworCiAJaWYgKHdyaXRlKGZkLCBfX2lndF9w bV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUsCiAJCSAgc3RybGVuKF9faWd0X3BtX2F1ZGlvX3J1 bnRpbWVfcG93ZXJfc2F2ZSkpICE9Ci0JICAgIHN0cmxlbihfX2lndF9wbV9hdWRpb19ydW50aW1l X3Bvd2VyX3NhdmUpKQotCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3RvcmUgYXVkaW8gcG93ZXJf c2F2ZSB0byAnJXMnXG4iLAotCQkJIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfcG93ZXJfc2F2ZSk7 CisJICAgIHN0cmxlbihfX2lndF9wbV9hdWRpb19ydW50aW1lX3Bvd2VyX3NhdmUpKSB7CisJCWNs b3NlKGZkKTsKKwkJcmV0dXJuIGVycm5vOworCX0KKwogCWNsb3NlKGZkKTsKIAotCWZkID0gb3Bl bigiL3N5cy9idXMvcGNpL2RldmljZXMvMDAwMDowMDowMy4wL3Bvd2VyL2NvbnRyb2wiLCBPX1dS T05MWSk7CisJZmQgPSBvcGVuKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRoLCBP X1dST05MWSk7CiAJaWYgKGZkIDwgMCkKLQkJcmV0dXJuOworCQlyZXR1cm4gZXJybm87CisKIAlp ZiAod3JpdGUoZmQsIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCwKIAkJICBzdHJsZW4o X19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sKSkgIT0KLQkgICAgc3RybGVuKF9faWd0X3Bt X2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpCi0JCWlndF93YXJuKCJGYWlsZWQgdG8gcmVzdG9yZSBh dWRpbyBjb250cm9sIHRvICclcydcbiIsCi0JCQkgX19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250 cm9sKTsKKwkgICAgc3RybGVuKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpIHsKKwkJ Y2xvc2UoZmQpOworCQlyZXR1cm4gZXJybm87CisJfQorCiAJY2xvc2UoZmQpOworCisJX19pZ3Rf cG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZlWzBdID0gMDsKKworCXJldHVybiAwOworfQorCitz dGF0aWMgdm9pZCBpZ3RfcG1fYXVkaW9fcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCit7CisJaW50 IHJldDsKKworCWlmICghX19pZ3RfcG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZlWzBdKQorCQly ZXR1cm47CisKKwlpZ3RfZGVidWcoIlJlc3RvcmluZyBhdWRpbyBwb3dlciBtYW5hZ2VtZW50IHRv ICclcycgYW5kICclcydcbiIsCisJCSAgX19pZ3RfcG1fYXVkaW9fcnVudGltZV9wb3dlcl9zYXZl LAorCQkgIF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCk7CisKKwlyZXQgPSBfX2lndF9w bV9hdWRpb19yZXN0b3JlX3J1bnRpbWVfcG0oKTsKKwlpZiAocmV0KQorCQlpZ3Rfd2FybigiRmFp bGVkIHRvIHJlc3RvcmUgcnVudGltZSBhdWRpbyBQTSEgKGVycm5vPSVkKVxuIiwKKwkJCSByZXQp OworfQorCitzdGF0aWMgdm9pZCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2V4aXRfaGFuZGxlcihp bnQgc2lnKQoreworCV9faWd0X3BtX2F1ZGlvX3Jlc3RvcmVfcnVudGltZV9wbSgpOwogfQogCiBz dGF0aWMgdm9pZCBzdHJjaG9tcChjaGFyICpzdHIpCkBAIC0xMTYsNyArMTUzLDcgQEAgc3RhdGlj IHZvaWQgc3RyY2hvbXAoY2hhciAqc3RyKQogICovCiB2b2lkIGlndF9wbV9lbmFibGVfYXVkaW9f cnVudGltZV9wbSh2b2lkKQogewotCWludCBmZDsKKwlpbnQgZmQsIGk7CiAKIAkvKiBDaGVjayBp ZiBhbHJlYWR5IGVuYWJsZWQuICovCiAJaWYgKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfcG93ZXJf c2F2ZVswXSkKQEAgLTEzMSwxNCArMTY4LDIzIEBAIHZvaWQgaWd0X3BtX2VuYWJsZV9hdWRpb19y dW50aW1lX3BtKHZvaWQpCiAJCWlndF9hc3NlcnRfZXEod3JpdGUoZmQsICIxXG4iLCAyKSwgMik7 CiAJCWNsb3NlKGZkKTsKIAl9Ci0JZmQgPSBvcGVuKCIvc3lzL2J1cy9wY2kvZGV2aWNlcy8wMDAw OjAwOjAzLjAvcG93ZXIvY29udHJvbCIsIE9fUkRXUik7Ci0JaWYgKGZkID49IDApIHsKLQkJaWd0 X2Fzc2VydChyZWFkKGZkLCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wsCi0JCQkJc2l6 ZW9mKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCkpID4gMCk7Ci0JCXN0cmNob21wKF9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbCk7Ci0JCWlndF9hc3NlcnRfZXEod3JpdGUoZmQs ICJhdXRvXG4iLCA1KSwgNSk7Ci0JCWNsb3NlKGZkKTsKKworCWZvciAoaSA9IDA7IGkgPCBBUlJB WV9TSVpFKF9faWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRocyk7IGkrKykgeworCQlj b25zdCBjaGFyICpwYXRoID0gX19pZ3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sX3BhdGhzW2ld OworCisJCWZkID0gb3BlbihwYXRoLCBPX1JEV1IpOworCQlpZiAoZmQgPj0gMCkgeworCQkJX19p Z3RfcG1fYXVkaW9fcnVudGltZV9jb250cm9sX3BhdGggPSBwYXRoOworCQkJaWd0X2Fzc2VydChy ZWFkKGZkLCBfX2lndF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wsCisJCQkJCXNpemVvZihfX2ln dF9wbV9hdWRpb19ydW50aW1lX2NvbnRyb2wpKSA+IDApOworCQkJc3RyY2hvbXAoX19pZ3RfcG1f YXVkaW9fcnVudGltZV9jb250cm9sKTsKKwkJCWlndF9hc3NlcnRfZXEod3JpdGUoZmQsICJhdXRv XG4iLCA1KSwgNSk7CisJCQljbG9zZShmZCk7CisJCQlicmVhazsKKwkJfQogCX0KKwlpZiAoIV9f aWd0X3BtX2F1ZGlvX3J1bnRpbWVfY29udHJvbF9wYXRoKQorCQlpZ3Rfd2FybigiRmFpbGVkIHRv IGZpbmQgYXVkaW8gUENJIGRldmljZSFcbiIpOwogCiAJaWd0X2RlYnVnKCJTYXZlZCBhdWRpbyBw b3dlciBtYW5hZ2VtZW50IGFzICclcycgYW5kICclcydcbiIsCiAJCSAgX19pZ3RfcG1fYXVkaW9f cnVudGltZV9wb3dlcl9zYXZlLApAQCAtMjkxLDM5ICszMzcsNzcgQEAgdm9pZCBpZ3RfcG1fcmVz dG9yZV9zYXRhX2xpbmtfcG93ZXJfbWFuYWdlbWVudChpbnQ4X3QgKnBtX2RhdGEpCiAJZnJlZShm aWxlX25hbWUpOwogfQogI2RlZmluZSBQT1dFUl9ESVIgIi9zeXMvZGV2aWNlcy9wY2kwMDAwOjAw LzAwMDA6MDA6MDIuMC9wb3dlciIKLS8qIFdlIGp1c3QgbGVhayB0aGlzIG9uIGV4aXQgLi4uICov CiBpbnQgcG1fc3RhdHVzX2ZkID0gLTE7CiAKIHN0YXRpYyBjaGFyIF9faWd0X3BtX3J1bnRpbWVf YXV0b3N1c3BlbmRbNjRdOwogc3RhdGljIGNoYXIgX19pZ3RfcG1fcnVudGltZV9jb250cm9sWzY0 XTsKIAotc3RhdGljIHZvaWQgX19pZ3RfcG1fcnVudGltZV9leGl0X2hhbmRsZXIoaW50IHNpZykK K3N0YXRpYyBpbnQgX19pZ3RfcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCiB7CiAJaW50IGZkOwog Ci0JaWd0X2RlYnVnKCJSZXN0b3JpbmcgcnVudGltZSBtYW5hZ2VtZW50IHRvICclcycgYW5kICcl cydcbiIsCi0JCSAgX19pZ3RfcG1fcnVudGltZV9hdXRvc3VzcGVuZCwKLQkJICBfX2lndF9wbV9y dW50aW1lX2NvbnRyb2wpOworCWlmIChwbV9zdGF0dXNfZmQgPCAwKQorCQlyZXR1cm4gMDsKIAog CWZkID0gb3BlbihQT1dFUl9ESVIgIi9hdXRvc3VzcGVuZF9kZWxheV9tcyIsIE9fV1JPTkxZKTsK IAlpZiAoZmQgPCAwKQotCQlyZXR1cm47CisJCXJldHVybiBlcnJubzsKKwogCWlmICh3cml0ZShm ZCwgX19pZ3RfcG1fcnVudGltZV9hdXRvc3VzcGVuZCwKIAkJICBzdHJsZW4oX19pZ3RfcG1fcnVu dGltZV9hdXRvc3VzcGVuZCkpICE9Ci0JICAgIHN0cmxlbihfX2lndF9wbV9ydW50aW1lX2F1dG9z dXNwZW5kKSkKLQkJaWd0X3dhcm4oIkZhaWxlZCB0byByZXN0b3JlIHJ1bnRpbWUgcG0gYXV0b3N1 c3BlbmQgZGVsYXkgdG8gJyVzJ1xuIiwKLQkJCSBfX2lndF9wbV9ydW50aW1lX2F1dG9zdXNwZW5k KTsKKwkgICAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfYXV0b3N1c3BlbmQpKSB7CisJCWNsb3Nl KGZkKTsKKwkJcmV0dXJuIGVycm5vOworCX0KKwogCWNsb3NlKGZkKTsKIAogCWZkID0gb3BlbihQ T1dFUl9ESVIgIi9jb250cm9sIiwgT19XUk9OTFkpOwogCWlmIChmZCA8IDApCi0JCXJldHVybjsK KwkJcmV0dXJuIGVycm5vOworCiAJaWYgKHdyaXRlKGZkLCBfX2lndF9wbV9ydW50aW1lX2NvbnRy b2wsCiAJCSAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfY29udHJvbCkpICE9Ci0JICAgIHN0cmxl bihfX2lndF9wbV9ydW50aW1lX2NvbnRyb2wpKQotCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3Rv cmUgcnVudGltZSBwbSBjb250cm9sIHRvICclcydcbiIsCi0JCQkgX19pZ3RfcG1fcnVudGltZV9j b250cm9sKTsKKwkgICAgc3RybGVuKF9faWd0X3BtX3J1bnRpbWVfY29udHJvbCkpIHsKKwkJY2xv c2UoZmQpOworCQlyZXR1cm4gZXJybm87CisJfQorCiAJY2xvc2UoZmQpOworCisJY2xvc2UocG1f c3RhdHVzX2ZkKTsKKwlwbV9zdGF0dXNfZmQgPSAtMTsKKworCXJldHVybiAwOworfQorCisvKioK KyAqIGlndF9yZXN0b3JlX3J1bnRpbWVfcG06CisgKgorICogUmVzdG9yZXMgdGhlIHJ1bnRpbWUg UE0gY29uZmlndXJhdGlvbiBhcyBpdCB3YXMgYmVmb3JlIHRoZSBjYWxsIHRvCisgKiBpZ3Rfc2V0 dXBfcnVudGltZV9wbS4KKyAqLwordm9pZCBpZ3RfcmVzdG9yZV9ydW50aW1lX3BtKHZvaWQpCit7 CisJaW50IHJldDsKKworCWlmIChwbV9zdGF0dXNfZmQgPCAwKQorCQlyZXR1cm47CisKKwlpZ3Rf ZGVidWcoIlJlc3RvcmluZyBydW50aW1lIFBNIG1hbmFnZW1lbnQgdG8gJyVzJyBhbmQgJyVzJ1xu IiwKKwkJICBfX2lndF9wbV9ydW50aW1lX2F1dG9zdXNwZW5kLAorCQkgIF9faWd0X3BtX3J1bnRp bWVfY29udHJvbCk7CisKKwlyZXQgPSBfX2lndF9yZXN0b3JlX3J1bnRpbWVfcG0oKTsKKwlpZiAo cmV0KQorCQlpZ3Rfd2FybigiRmFpbGVkIHRvIHJlc3RvcmUgcnVudGltZSBQTSEgKGVycm5vPSVk KVxuIiwgcmV0KTsKKworCWlndF9wbV9hdWRpb19yZXN0b3JlX3J1bnRpbWVfcG0oKTsKK30KKwor c3RhdGljIHZvaWQgX19pZ3RfcG1fcnVudGltZV9leGl0X2hhbmRsZXIoaW50IHNpZykKK3sKKwlf X2lndF9yZXN0b3JlX3J1bnRpbWVfcG0oKTsKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9saWIvaWd0 X3BtLmggYi9saWIvaWd0X3BtLmgKaW5kZXggZWNlZDM5Zjg4MDFhLi4xMGNjNjc5NGU0ZTcgMTAw NjQ0Ci0tLSBhL2xpYi9pZ3RfcG0uaAorKysgYi9saWIvaWd0X3BtLmgKQEAgLTQ3LDYgKzQ3LDcg QEAgZW51bSBpZ3RfcnVudGltZV9wbV9zdGF0dXMgewogfTsKIAogYm9vbCBpZ3Rfc2V0dXBfcnVu dGltZV9wbSh2b2lkKTsKK3ZvaWQgaWd0X3Jlc3RvcmVfcnVudGltZV9wbSh2b2lkKTsKIGVudW0g aWd0X3J1bnRpbWVfcG1fc3RhdHVzIGlndF9nZXRfcnVudGltZV9wbV9zdGF0dXModm9pZCk7CiBi b29sIGlndF93YWl0X2Zvcl9wbV9zdGF0dXMoZW51bSBpZ3RfcnVudGltZV9wbV9zdGF0dXMgc3Rh dHVzKTsKIApkaWZmIC0tZ2l0IGEvdGVzdHMvcGVyZl9wbXUuYyBiL3Rlc3RzL3BlcmZfcG11LmMK aW5kZXggYTFkMzZhYzRmYTlkLi45YTIwYWJiNmI5NWMgMTAwNjQ0Ci0tLSBhL3Rlc3RzL3BlcmZf cG11LmMKKysrIGIvdGVzdHMvcGVyZl9wbXUuYwpAQCAtMTQ0MSw2ICsxNDQxLDkgQEAgdGVzdF9y YzYoaW50IGdlbV9mZCwgdW5zaWduZWQgaW50IGZsYWdzKQogCWNsb3NlKGZ3KTsKIAljbG9zZShm ZCk7CiAKKwlpZiAoZmxhZ3MgJiBURVNUX1JVTlRJTUVfUE0pCisJCWlndF9yZXN0b3JlX3J1bnRp bWVfcG0oKTsKKwogCWFzc2VydF93aXRoaW5fZXBzaWxvbihidXN5IC0gcHJldiwgMC4wLCB0b2xl cmFuY2UpOwogfQogCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo=