From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tvrtko Ursulin Subject: [PATCH 3/6] drm/i915/perf: lock powergating configuration to default when active Date: Mon, 17 Sep 2018 12:30:55 +0100 Message-ID: <20180917113058.28994-4-tvrtko.ursulin@linux.intel.com> References: <20180917113058.28994-1-tvrtko.ursulin@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03FB96E147 for ; Mon, 17 Sep 2018 11:31:09 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id b19-v6so9164436wme.3 for ; Mon, 17 Sep 2018 04:31:08 -0700 (PDT) In-Reply-To: <20180917113058.28994-1-tvrtko.ursulin@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 RnJvbTogTGlvbmVsIExhbmR3ZXJsaW4gPGxpb25lbC5nLmxhbmR3ZXJsaW5AaW50ZWwuY29tPgoK SWYgc29tZSBvZiB0aGUgY29udGV4dHMgc3VibWl0dGluZyB3b3JrbG9hZHMgdG8gdGhlIEdQVSBo YXZlIGJlZW4KY29uZmlndXJlZCB0byBzaHV0ZG93biBzbGljZXMvc3Vic2xpY2VzLCB3ZSBtaWdo dCBsb29zZSB0aGUgTk9BCmNvbmZpZ3VyYXRpb25zIHdyaXR0ZW4gaW4gdGhlIE5PQSBtdXhlcy4K Ck9uZSBwb3NzaWJsZSBzb2x1dGlvbiB0byB0aGlzIHByb2JsZW0gaXMgdG8gcmVwcm9ncmFtIHRo ZSBOT0EgbXV4ZXMKd2hlbiB3ZSBzd2l0Y2ggdG8gYSBuZXcgY29udGV4dC4gV2UgaW5pdGlhbGx5 IHRyaWVkIHRoaXMgaW4gdGhlCndvcmthcm91bmQgYmF0Y2hidWZmZXIgYnV0IHNvbWUgY29uY2Vy bnMgd2hlcmUgcmFpc2VkIGFib3V0IHRoZSBjb3N0Cm9mIHJlcHJvZ3JhbW1pbmcgYXQgZXZlcnkg Y29udGV4dCBzd2l0Y2guIFRoaXMgc29sdXRpb24gaXMgYWxzbyBub3QKd2l0aG91dCBjb25zZXF1 ZW5jZXMgZnJvbSB0aGUgdXNlcnNwYWNlIHBvaW50IG9mIHZpZXcuIFJlcHJvZ3JhbW1pbmcKb2Yg dGhlIG11eGVzIGNhbiBvbmx5IGhhcHBlbiBvbmNlIHRoZSBwb3dlcmdhdGluZyBjb25maWd1cmF0 aW9uIGhhcwpjaGFuZ2VkICh3aGljaCBoYXBwZW5zIGFmdGVyIGNvbnRleHQgc3dpdGNoKS4gVGhp cyBtZWFucyBmb3IgYSB3aW5kb3cKb2YgdGltZSBkdXJpbmcgdGhlIHJlY29yZGluZywgY291bnRl cnMgcmVjb3JkZWQgYnkgdGhlIE9BIHVuaXQgbWlnaHQKYmUgaW52YWxpZC4gVGhpcyByZXF1aXJl cyB1c2Vyc3BhY2UgZGVhbGluZyB3aXRoIE9BIHJlcG9ydHMgdG8gZGlzY2FyZAp0aGUgaW52YWxp ZCB2YWx1ZXMuCgpNaW5pbWl6aW5nIHRoZSByZXByb2dyYW1taW5nIGNvdWxkIGJlIGltcGxlbWVu dGVkIGJ5IHRyYWNraW5nIG9mIHRoZQpsYXN0IHByb2dyYW1tZWQgY29uZmlndXJhdGlvbiBzb21l d2hlcmUgaW4gR0dUVCBhbmQgdXNlIE1JX1BSRURJQ0FURQp0byBkaXNjYXJkIHNvbWUgb2YgdGhl IHByb2dyYW1taW5nIGNvbW1hbmRzLCBidXQgdGhlIGNvbW1hbmQgc3RyZWFtZXIKd291bGQgc3Rp bGwgaGF2ZSB0byBwYXJzZSBhbGwgdGhlIE1JX0xSSSBpbnN0cnVjdGlvbnMgaW4gdGhlCndvcmth cm91bmQgYmF0Y2hidWZmZXIuCgpBbm90aGVyIHNvbHV0aW9uLCB3aGljaCB0aGlzIGNoYW5nZSBp bXBsZW1lbnRzLCBpcyB0byBzaW1wbHkgZGlzcmVnYXJkCnRoZSB1c2VyIHJlcXVlc3RlZCBjb25m aWd1cmF0aW9uIGZvciB0aGUgcGVyaW9kIG9mIHRpbWUgd2hlbiBpOTE1L3BlcmYKaXMgYWN0aXZl LiBUaGVyZSBpcyBubyBrbm93biBpc3N1ZSB3aXRoIHRoaXMgYXBhcnQgZnJvbSBhIHBlcmZvcm1h bmNlCnBlbmFsaXR5IGZvciBzb21lIG1lZGlhIHdvcmtsb2FkcyB0aGF0IGJlbmVmaXQgZnJvbSBy dW5uaW5nIG9uIGEKcGFydGlhbGx5IHBvd2VyZ2F0ZWQgR1BVLiBXZSBhbHJlYWR5IHByZXZlbnQg UkM2IGZyb20gYWZmZWN0aW5nIHRoZQpwcm9ncmFtbWluZyBzbyBpdCBkb2Vzbid0IHNvdW5kIGNv bXBsZXRlbHkgdW5yZWFzb25hYmxlIHRvIGhvbGQgb24KcG93ZXJnYXRpbmcgZm9yIHRoZSBzYW1l IHJlYXNvbi4KCnYyOiBMZWF2ZSBSUENTIHByb2dyYW1taW5nIGluIGludGVsX2xyYy5jIChMaW9u ZWwpCgp2MzogVXBkYXRlIGZvciBzL3VuaW9uIGludGVsX3NzZXUvc3RydWN0IGludGVsX3NzZXUv IChMaW9uZWwpCiAgICBNb3JlIHRvX2ludGVsX2NvbnRleHQoKSAoVHZydGtvKQogICAgcy9kZXZf cHJpdi9pOTE1LyAoVHZydGtvKQoKVHZydGtvIFVyc3VsaW46Cgp2NDoKICogUmViYXNlIGZvciBt YWtlX3JwY3MgY2hhbmdlcy4KCnY1OgogKiBBcHBseSBPQSByZXN0cmljdGlvbiBmcm9tIG1ha2Vf cnBjcyBkaXJlY3RseS4KCnY2OgogKiBSZWJhc2UgZm9yIGNvbnRleHQgaW1hZ2Ugc2V0dXAgY2hh bmdlcy4KCnY3OgogKiBNb3ZlIHN0cmVhbSBhc3NpZ25tZW50IGJlZm9yZSBtZXRyaWMgZW5hYmxl LgoKdjg6CiAqIFJlYmFzZS4KClNpZ25lZC1vZmYtYnk6IExpb25lbCBMYW5kd2VybGluIDxsaW9u ZWwuZy5sYW5kd2VybGluQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogVHZydGtvIFVyc3VsaW4g PHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X3BlcmYuYyB8IDEzICsrKysrKysrKy0tLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jIHwgMzEgKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLQogZHJpdmVycy9ncHUvZHJt L2k5MTUvaW50ZWxfbHJjLmggfCAgMiArKwogMyBmaWxlcyBjaGFuZ2VkLCAzMSBpbnNlcnRpb25z KCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BlcmYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcGVyZi5jCmluZGV4IDY2NGI5 NmJiNjVhMy4uNDZkZGQxOTEzZmVlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9p OTE1X3BlcmYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BlcmYuYwpAQCAtMTY3 Nyw2ICsxNjc3LDExIEBAIHN0YXRpYyB2b2lkIGdlbjhfdXBkYXRlX3JlZ19zdGF0ZV91bmxvY2tl ZChzdHJ1Y3QgaTkxNV9nZW1fY29udGV4dCAqY3R4LAogCiAJCUNUWF9SRUcocmVnX3N0YXRlLCBz dGF0ZV9vZmZzZXQsIGZsZXhfcmVnc1tpXSwgdmFsdWUpOwogCX0KKworCUNUWF9SRUcocmVnX3N0 YXRlLCBDVFhfUl9QV1JfQ0xLX1NUQVRFLCBHRU44X1JfUFdSX0NMS19TVEFURSwKKwkJZ2VuOF9t YWtlX3JwY3MoZGV2X3ByaXYsCisJCQkgICAgICAgJnRvX2ludGVsX2NvbnRleHQoY3R4LAorCQkJ CQkJIGRldl9wcml2LT5lbmdpbmVbUkNTXSktPnNzZXUpKTsKIH0KIAogLyoKQEAgLTIwOTIsNiAr MjA5Nyw5IEBAIHN0YXRpYyBpbnQgaTkxNV9vYV9zdHJlYW1faW5pdChzdHJ1Y3QgaTkxNV9wZXJm X3N0cmVhbSAqc3RyZWFtLAogCWlmIChyZXQpCiAJCWdvdG8gZXJyX2xvY2s7CiAKKwlzdHJlYW0t Pm9wcyA9ICZpOTE1X29hX3N0cmVhbV9vcHM7CisJZGV2X3ByaXYtPnBlcmYub2EuZXhjbHVzaXZl X3N0cmVhbSA9IHN0cmVhbTsKKwogCXJldCA9IGRldl9wcml2LT5wZXJmLm9hLm9wcy5lbmFibGVf bWV0cmljX3NldChkZXZfcHJpdiwKIAkJCQkJCSAgICAgIHN0cmVhbS0+b2FfY29uZmlnKTsKIAlp ZiAocmV0KSB7CkBAIC0yMDk5LDE1ICsyMTA3LDEyIEBAIHN0YXRpYyBpbnQgaTkxNV9vYV9zdHJl YW1faW5pdChzdHJ1Y3QgaTkxNV9wZXJmX3N0cmVhbSAqc3RyZWFtLAogCQlnb3RvIGVycl9lbmFi bGU7CiAJfQogCi0Jc3RyZWFtLT5vcHMgPSAmaTkxNV9vYV9zdHJlYW1fb3BzOwotCi0JZGV2X3By aXYtPnBlcmYub2EuZXhjbHVzaXZlX3N0cmVhbSA9IHN0cmVhbTsKLQogCW11dGV4X3VubG9jaygm ZGV2X3ByaXYtPmRybS5zdHJ1Y3RfbXV0ZXgpOwogCiAJcmV0dXJuIDA7CiAKIGVycl9lbmFibGU6 CisJZGV2X3ByaXYtPnBlcmYub2EuZXhjbHVzaXZlX3N0cmVhbSA9IE5VTEw7CiAJZGV2X3ByaXYt PnBlcmYub2Eub3BzLmRpc2FibGVfbWV0cmljX3NldChkZXZfcHJpdik7CiAJbXV0ZXhfdW5sb2Nr KCZkZXZfcHJpdi0+ZHJtLnN0cnVjdF9tdXRleCk7CiAKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfbHJjLmMK aW5kZXggMTQ5MTAzMmI2NzViLi5jZjJlMDg0OGZhNTUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2xyYy5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2xy Yy5jCkBAIC0xMzA1LDkgKzEzMDUsNiBAQCBzdGF0aWMgaW50IF9fY29udGV4dF9waW4oc3RydWN0 IGk5MTVfZ2VtX2NvbnRleHQgKmN0eCwgc3RydWN0IGk5MTVfdm1hICp2bWEpCiAJcmV0dXJuIGk5 MTVfdm1hX3Bpbih2bWEsIDAsIDAsIGZsYWdzKTsKIH0KIAotc3RhdGljIHUzMgotbWFrZV9ycGNz KHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBzdHJ1Y3QgaW50ZWxfc3NldSAqY3R4X3Nz ZXUpOwotCiBzdGF0aWMgdm9pZAogX19leGVjbGlzdHNfdXBkYXRlX3JlZ19zdGF0ZShzdHJ1Y3Qg aW50ZWxfZW5naW5lX2NzICplbmdpbmUsCiAJCQkgICAgIHN0cnVjdCBpbnRlbF9jb250ZXh0ICpj ZSkKQEAgLTEzMjEsOCArMTMxOCw4IEBAIF9fZXhlY2xpc3RzX3VwZGF0ZV9yZWdfc3RhdGUoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lLAogCiAJLyogUlBDUyAqLwogCWlmIChlbmdpbmUt PmNsYXNzID09IFJFTkRFUl9DTEFTUykKLQkJcmVnc1tDVFhfUl9QV1JfQ0xLX1NUQVRFICsgMV0g PSBtYWtlX3JwY3MoZW5naW5lLT5pOTE1LAotCQkJCQkJCSAgJmNlLT5zc2V1KTsKKwkJcmVnc1tD VFhfUl9QV1JfQ0xLX1NUQVRFICsgMV0gPSBnZW44X21ha2VfcnBjcyhlbmdpbmUtPmk5MTUsCisJ CQkJCQkJICAgICAgICZjZS0+c3NldSk7CiB9CiAKIHN0YXRpYyBzdHJ1Y3QgaW50ZWxfY29udGV4 dCAqCkBAIC0yNTA3LDEzICsyNTA0LDEyIEBAIGludCBsb2dpY2FsX3hjc19yaW5nX2luaXQoc3Ry dWN0IGludGVsX2VuZ2luZV9jcyAqZW5naW5lKQogCXJldHVybiBsb2dpY2FsX3JpbmdfaW5pdChl bmdpbmUpOwogfQogCi1zdGF0aWMgdTMyCi1tYWtlX3JwY3Moc3RydWN0IGRybV9pOTE1X3ByaXZh dGUgKmk5MTUsIHN0cnVjdCBpbnRlbF9zc2V1ICpjdHhfc3NldSkKK3UzMiBnZW44X21ha2VfcnBj cyhzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqaTkxNSwgc3RydWN0IGludGVsX3NzZXUgKnJlcV9z c2V1KQogewogCWNvbnN0IHN0cnVjdCBzc2V1X2Rldl9pbmZvICpzc2V1ID0gJklOVEVMX0lORk8o aTkxNSktPnNzZXU7CiAJYm9vbCBzdWJzbGljZV9wZyA9IHNzZXUtPmhhc19zdWJzbGljZV9wZzsK LQl1OCBzbGljZXMgPSBod2VpZ2h0OChjdHhfc3NldS0+c2xpY2VfbWFzayk7Ci0JdTggc3Vic2xp Y2VzID0gaHdlaWdodDgoY3R4X3NzZXUtPnN1YnNsaWNlX21hc2spOworCXN0cnVjdCBpbnRlbF9z c2V1IGN0eF9zc2V1OworCXU4IHNsaWNlcywgc3Vic2xpY2VzOwogCXUzMiBycGNzID0gMDsKIAog CS8qCkBAIC0yNTIzLDYgKzI1MTksMTkgQEAgbWFrZV9ycGNzKHN0cnVjdCBkcm1faTkxNV9wcml2 YXRlICppOTE1LCBzdHJ1Y3QgaW50ZWxfc3NldSAqY3R4X3NzZXUpCiAJaWYgKElOVEVMX0dFTihp OTE1KSA8IDkpCiAJCXJldHVybiAwOwogCisJLyoKKwkgKiBJZiBpOTE1L3BlcmYgaXMgYWN0aXZl LCB3ZSB3YW50IGEgc3RhYmxlIHBvd2VyZ2F0aW5nIGNvbmZpZ3VyYXRpb24KKwkgKiBvbiB0aGUg c3lzdGVtLiBUaGUgbW9zdCBuYXR1cmFsIGNvbmZpZ3VyYXRpb24gdG8gdGFrZSBpbiB0aGF0IGNh c2UKKwkgKiBpcyB0aGUgZGVmYXVsdCAoaS5lIG1heGltdW0gdGhlIGhhcmR3YXJlIGNhbiBkbyku CisJICovCisJaWYgKHVubGlrZWx5KGk5MTUtPnBlcmYub2EuZXhjbHVzaXZlX3N0cmVhbSkpCisJ CWN0eF9zc2V1ID0gaW50ZWxfZGV2aWNlX2RlZmF1bHRfc3NldShpOTE1KTsKKwllbHNlCisJCWN0 eF9zc2V1ID0gKnJlcV9zc2V1OworCisJc2xpY2VzID0gaHdlaWdodDgoY3R4X3NzZXUuc2xpY2Vf bWFzayk7CisJc3Vic2xpY2VzID0gaHdlaWdodDgoY3R4X3NzZXUuc3Vic2xpY2VfbWFzayk7CisK IAkvKgogCSAqIFNpbmNlIHRoZSBTU2NvdW50IGJpdGZpZWxkIGluIEdFTjhfUl9QV1JfQ0xLX1NU QVRFIGlzIG9ubHkgdGhyZWUgYml0cwogCSAqIHdpZGUgYW5kIEljZWxha2UgaGFzIHVwIHRvIGVp Z2h0IHN1YnNsaWNlcywgc3BlY2ZpYWwgcHJvZ3JhbW1pbmcgaXMKQEAgLTI1OTIsMTMgKzI2MDEs MTMgQEAgbWFrZV9ycGNzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LCBzdHJ1Y3QgaW50 ZWxfc3NldSAqY3R4X3NzZXUpCiAJaWYgKHNzZXUtPmhhc19ldV9wZykgewogCQl1MzIgdmFsOwog Ci0JCXZhbCA9IGN0eF9zc2V1LT5taW5fZXVzX3Blcl9zdWJzbGljZSA8PCBHRU44X1JQQ1NfRVVf TUlOX1NISUZUOworCQl2YWwgPSBjdHhfc3NldS5taW5fZXVzX3Blcl9zdWJzbGljZSA8PCBHRU44 X1JQQ1NfRVVfTUlOX1NISUZUOwogCQlHRU1fQlVHX09OKHZhbCAmIH5HRU44X1JQQ1NfRVVfTUlO X01BU0spOwogCQl2YWwgJj0gR0VOOF9SUENTX0VVX01JTl9NQVNLOwogCiAJCXJwY3MgfD0gdmFs OwogCi0JCXZhbCA9IGN0eF9zc2V1LT5tYXhfZXVzX3Blcl9zdWJzbGljZSA8PCBHRU44X1JQQ1Nf RVVfTUFYX1NISUZUOworCQl2YWwgPSBjdHhfc3NldS5tYXhfZXVzX3Blcl9zdWJzbGljZSA8PCBH RU44X1JQQ1NfRVVfTUFYX1NISUZUOwogCQlHRU1fQlVHX09OKHZhbCAmIH5HRU44X1JQQ1NfRVVf TUFYX01BU0spOwogCQl2YWwgJj0gR0VOOF9SUENTX0VVX01BWF9NQVNLOwogCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1 L2ludGVsX2xyYy5oCmluZGV4IGY1YTU1MDJlY2Y3MC4uYTRlMjhjYzU1ZmRhIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9scmMuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9scmMuaApAQCAtMTA0LDQgKzEwNCw2IEBAIHZvaWQgaW50ZWxfbHJfY29udGV4 dF9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKIAogdm9pZCBpbnRl bF9leGVjbGlzdHNfc2V0X2RlZmF1bHRfc3VibWlzc2lvbihzdHJ1Y3QgaW50ZWxfZW5naW5lX2Nz ICplbmdpbmUpOwogCit1MzIgZ2VuOF9tYWtlX3JwY3Moc3RydWN0IGRybV9pOTE1X3ByaXZhdGUg Kmk5MTUsIHN0cnVjdCBpbnRlbF9zc2V1ICpjdHhfc3NldSk7CisKICNlbmRpZiAvKiBfSU5URUxf TFJDX0hfICovCi0tIAoyLjE3LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVk ZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZv L2ludGVsLWdmeAo=