From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 19/23] drm/i915: Support flags in whitlist WAs Date: Tue, 3 Sep 2019 12:24:20 -0400 Message-ID: <20190903162424.6877-19-sashal@kernel.org> References: <20190903162424.6877-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190903162424.6877-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Tvrtko Ursulin , "Robert M . Fosha" , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, John Harrison List-Id: dri-devel@lists.freedesktop.org RnJvbTogSm9obiBIYXJyaXNvbiA8Sm9obi5DLkhhcnJpc29uQEludGVsLmNvbT4KClsgVXBzdHJl YW0gY29tbWl0IDY4ODNlYWIyNzQ4MTNkMTU4YmZjZmI0OTlhYTIyNWVjZTYxYzBmMjkgXQoKTmV3 ZXIgaGFyZHdhcmUgYWRkcyBmbGFncyB0byB0aGUgd2hpdGVsaXN0IHdvcmstYXJvdW5kIHJlZ2lz dGVyLiBUaGVzZQphbGxvdyBwZXIgYWNjZXNzIGRpcmVjdGlvbiBwcml2aWxlZ2VzIGFuZCByYW5n ZXMuCgpTaWduZWQtb2ZmLWJ5OiBKb2huIEhhcnJpc29uIDxKb2huLkMuSGFycmlzb25ASW50ZWwu Y29tPgpTaWduZWQtb2ZmLWJ5OiBSb2JlcnQgTS4gRm9zaGEgPHJvYmVydC5tLmZvc2hhQGludGVs LmNvbT4KQ2M6IFR2cnRrbyBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBD aHJpcyBXaWxzb24gPGNocmlzQGNocmlzLXdpbHNvbi5jby51az4KUmV2aWV3ZWQtYnk6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+ClJldmlld2VkLWJ5OiBUdnJ0a28g VXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBUdnJ0a28g VXJzdWxpbiA8dHZydGtvLnVyc3VsaW5AaW50ZWwuY29tPgpMaW5rOiBodHRwczovL3BhdGNod29y ay5mcmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTA2MTgwMTAxMDguMjc0OTktMi1Kb2hu LkMuSGFycmlzb25ASW50ZWwuY29tCihjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IDUzODBkMGI3 ODFjNDkxZDk0YjRmNDY5MGVjZjk3NjJjMTk0NmM0ZWMpClNpZ25lZC1vZmYtYnk6IEpvb25hcyBM YWh0aW5lbiA8am9vbmFzLmxhaHRpbmVuQGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTog U2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9pOTE1 L2k5MTVfcmVnLmggICAgICAgICAgfCA3ICsrKysrKysKIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2lu dGVsX3dvcmthcm91bmRzLmMgfCA5ICsrKysrKysrLQogMiBmaWxlcyBjaGFuZ2VkLCAxNSBpbnNl cnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfcmVnLmgKaW5kZXggMTNk NmJkNGUxN2IyMC4uY2Y3NDhiODBlNjQwMSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaTkxNV9yZWcuaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3JlZy5oCkBAIC0y NTEwLDYgKzI1MTAsMTMgQEAgZW51bSBpOTE1X3Bvd2VyX3dlbGxfaWQgewogI2RlZmluZSAgIFJJ TkdfV0FJVF9TRU1BUEhPUkUJKDEgPDwgMTApIC8qIGdlbjYrICovCiAKICNkZWZpbmUgUklOR19G T1JDRV9UT19OT05QUklWKGJhc2UsIGkpIF9NTUlPKCgoYmFzZSkgKyAweDREMCkgKyAoaSkgKiA0 KQorI2RlZmluZSAgIFJJTkdfRk9SQ0VfVE9fTk9OUFJJVl9SVwkJKDAgPDwgMjgpICAgIC8qIENG TCsgJiBHZW4xMSsgKi8KKyNkZWZpbmUgICBSSU5HX0ZPUkNFX1RPX05PTlBSSVZfUkQJCSgxIDw8 IDI4KQorI2RlZmluZSAgIFJJTkdfRk9SQ0VfVE9fTk9OUFJJVl9XUgkJKDIgPDwgMjgpCisjZGVm aW5lICAgUklOR19GT1JDRV9UT19OT05QUklWX1JBTkdFXzEJCSgwIDw8IDApICAgICAvKiBDRkwr ICYgR2VuMTErICovCisjZGVmaW5lICAgUklOR19GT1JDRV9UT19OT05QUklWX1JBTkdFXzQJCSgx IDw8IDApCisjZGVmaW5lICAgUklOR19GT1JDRV9UT19OT05QUklWX1JBTkdFXzE2CSgyIDw8IDAp CisjZGVmaW5lICAgUklOR19GT1JDRV9UT19OT05QUklWX1JBTkdFXzY0CSgzIDw8IDApCiAjZGVm aW5lICAgUklOR19NQVhfTk9OUFJJVl9TTE9UUyAgMTIKIAogI2RlZmluZSBHRU43X1RMQl9SRF9B RERSCV9NTUlPKDB4NDcwMCkKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVs X3dvcmthcm91bmRzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF93b3JrYXJvdW5kcy5j CmluZGV4IDJmYjcwZmFiMmQxYzYuLjFkYjgyNmIxMjc3NGUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2ludGVsX3dvcmthcm91bmRzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfd29ya2Fyb3VuZHMuYwpAQCAtOTgxLDcgKzk4MSw3IEBAIGJvb2wgaW50ZWxfZ3Rf dmVyaWZ5X3dvcmthcm91bmRzKHN0cnVjdCBkcm1faTkxNV9wcml2YXRlICppOTE1LAogfQogCiBz dGF0aWMgdm9pZAotd2hpdGVsaXN0X3JlZyhzdHJ1Y3QgaTkxNV93YV9saXN0ICp3YWwsIGk5MTVf cmVnX3QgcmVnKQord2hpdGVsaXN0X3JlZ19leHQoc3RydWN0IGk5MTVfd2FfbGlzdCAqd2FsLCBp OTE1X3JlZ190IHJlZywgdTMyIGZsYWdzKQogewogCXN0cnVjdCBpOTE1X3dhIHdhID0gewogCQku cmVnID0gcmVnCkBAIC05OTAsOSArOTkwLDE2IEBAIHdoaXRlbGlzdF9yZWcoc3RydWN0IGk5MTVf d2FfbGlzdCAqd2FsLCBpOTE1X3JlZ190IHJlZykKIAlpZiAoR0VNX0RFQlVHX1dBUk5fT04od2Fs LT5jb3VudCA+PSBSSU5HX01BWF9OT05QUklWX1NMT1RTKSkKIAkJcmV0dXJuOwogCisJd2EucmVn LnJlZyB8PSBmbGFnczsKIAlfd2FfYWRkKHdhbCwgJndhKTsKIH0KIAorc3RhdGljIHZvaWQKK3do aXRlbGlzdF9yZWcoc3RydWN0IGk5MTVfd2FfbGlzdCAqd2FsLCBpOTE1X3JlZ190IHJlZykKK3sK Kwl3aGl0ZWxpc3RfcmVnX2V4dCh3YWwsIHJlZywgUklOR19GT1JDRV9UT19OT05QUklWX1JXKTsK K30KKwogc3RhdGljIHZvaWQgZ2VuOV93aGl0ZWxpc3RfYnVpbGQoc3RydWN0IGk5MTVfd2FfbGlz dCAqdykKIHsKIAkvKiBXYVZGRVN0YXRlQWZ0ZXJQaXBlQ29udHJvbHdpdGhNZWRpYVN0YXRlQ2xl YXI6c2tsLGJ4dCxnbGssY2ZsICovCi0tIAoyLjIwLjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04DFFC3A5A2 for ; Tue, 3 Sep 2019 16:40:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CEB4C2339D for ; Tue, 3 Sep 2019 16:40:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567528817; bh=YEKpx2P2hrGWksNlq1jYo57hOhkCpoZ8pPpWkNg0n7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZC1lJ11HdeKsPM3h+Qxl+V8o8plNbd6CbnaE8Y9eeAW3wi2BRr1HzWPJ1BBFemA24 Qzc8zwIxucTrBgjNSW+yXsmLmsG6n3leXse6TeOjGftsGXwkl/hhJcJAcVEXnKspK/ nwuELDj7r3pbQoL07+P0gFOdfGc0VLzM4piJn2NY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730339AbfICQZT (ORCPT ); Tue, 3 Sep 2019 12:25:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:44968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730297AbfICQZL (ORCPT ); Tue, 3 Sep 2019 12:25:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C13DF23711; Tue, 3 Sep 2019 16:25:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567527909; bh=YEKpx2P2hrGWksNlq1jYo57hOhkCpoZ8pPpWkNg0n7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y6tofRjy31mgcYBs/IyrFck/TggwP24LSg7gq6ugduq5ViEoFLxNMQ2SQhpeMnRvS f/ZgrDfmMvqk7+vCq2DHd6bbxrc31pHIlIOXQFzX/BhpVEiG7lANOS/ksiodX6CKZS JZUsT2VgOF1wxzYE2dmw24fOyLuuQIhCIqtuwFh4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Harrison , "Robert M . Fosha" , Tvrtko Ursulin , Chris Wilson , Joonas Lahtinen , Sasha Levin , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 19/23] drm/i915: Support flags in whitlist WAs Date: Tue, 3 Sep 2019 12:24:20 -0400 Message-Id: <20190903162424.6877-19-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190903162424.6877-1-sashal@kernel.org> References: <20190903162424.6877-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: John Harrison [ Upstream commit 6883eab274813d158bfcfb499aa225ece61c0f29 ] Newer hardware adds flags to the whitelist work-around register. These allow per access direction privileges and ranges. Signed-off-by: John Harrison Signed-off-by: Robert M. Fosha Cc: Tvrtko Ursulin Cc: Chris Wilson Reviewed-by: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin Signed-off-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20190618010108.27499-2-John.C.Harrison@Intel.com (cherry picked from commit 5380d0b781c491d94b4f4690ecf9762c1946c4ec) Signed-off-by: Joonas Lahtinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ drivers/gpu/drm/i915/intel_workarounds.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 13d6bd4e17b20..cf748b80e6401 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -2510,6 +2510,13 @@ enum i915_power_well_id { #define RING_WAIT_SEMAPHORE (1 << 10) /* gen6+ */ #define RING_FORCE_TO_NONPRIV(base, i) _MMIO(((base) + 0x4D0) + (i) * 4) +#define RING_FORCE_TO_NONPRIV_RW (0 << 28) /* CFL+ & Gen11+ */ +#define RING_FORCE_TO_NONPRIV_RD (1 << 28) +#define RING_FORCE_TO_NONPRIV_WR (2 << 28) +#define RING_FORCE_TO_NONPRIV_RANGE_1 (0 << 0) /* CFL+ & Gen11+ */ +#define RING_FORCE_TO_NONPRIV_RANGE_4 (1 << 0) +#define RING_FORCE_TO_NONPRIV_RANGE_16 (2 << 0) +#define RING_FORCE_TO_NONPRIV_RANGE_64 (3 << 0) #define RING_MAX_NONPRIV_SLOTS 12 #define GEN7_TLB_RD_ADDR _MMIO(0x4700) diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c index 2fb70fab2d1c6..1db826b12774e 100644 --- a/drivers/gpu/drm/i915/intel_workarounds.c +++ b/drivers/gpu/drm/i915/intel_workarounds.c @@ -981,7 +981,7 @@ bool intel_gt_verify_workarounds(struct drm_i915_private *i915, } static void -whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg) +whitelist_reg_ext(struct i915_wa_list *wal, i915_reg_t reg, u32 flags) { struct i915_wa wa = { .reg = reg @@ -990,9 +990,16 @@ whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg) if (GEM_DEBUG_WARN_ON(wal->count >= RING_MAX_NONPRIV_SLOTS)) return; + wa.reg.reg |= flags; _wa_add(wal, &wa); } +static void +whitelist_reg(struct i915_wa_list *wal, i915_reg_t reg) +{ + whitelist_reg_ext(wal, reg, RING_FORCE_TO_NONPRIV_RW); +} + static void gen9_whitelist_build(struct i915_wa_list *w) { /* WaVFEStateAfterPipeControlwithMediaStateClear:skl,bxt,glk,cfl */ -- 2.20.1