All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Robert M. Fosha" <robert.m.fosha@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 4/4] drm/i915: Add whitelist workarounds for ICL
Date: Thu, 13 Jun 2019 17:28:38 -0700	[thread overview]
Message-ID: <20190614002838.3072-5-robert.m.fosha@intel.com> (raw)
In-Reply-To: <20190614002838.3072-1-robert.m.fosha@intel.com>

From: John Harrison <John.C.Harrison@Intel.com>

Updated whitelist table for ICL.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Robert M. Fosha <robert.m.fosha@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gt/intel_workarounds.c | 87 +++++++++++++++++++--
 1 file changed, 79 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 60bd515edaf1..aa99fb3ffbcb 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -1146,17 +1146,88 @@ static void icl_whitelist_build(struct intel_engine_cs *engine)
 {
 	struct i915_wa_list *w = &engine->whitelist;
 
-	if (engine->class != RENDER_CLASS)
-		return;
+	switch (engine->class) {
+	case RENDER_CLASS:
+		/* WaSendPushConstantsFromMMIO:icl */
+		whitelist_reg_ext(w, COMMON_SLICE_CHICKEN2,
+				  RING_FORCE_TO_NONPRIV_RW);
 
-	/* WaAllowUMDToModifyHalfSliceChicken7:icl */
-	whitelist_reg(w, GEN9_HALF_SLICE_CHICKEN7);
+		/* WaAllowUMDToModifyHalfSliceChicken7:icl */
+		whitelist_reg_ext(w, GEN9_HALF_SLICE_CHICKEN7,
+				  RING_FORCE_TO_NONPRIV_RW);
 
-	/* WaAllowUMDToModifySamplerMode:icl */
-	whitelist_reg(w, GEN10_SAMPLER_MODE);
+		/* WaAllowUMDToModifySamplerMode:icl */
+		whitelist_reg_ext(w, GEN10_SAMPLER_MODE,
+				  RING_FORCE_TO_NONPRIV_RW);
 
-	/* WaEnableStateCacheRedirectToCS:icl */
-	whitelist_reg(w, GEN9_SLICE_COMMON_ECO_CHICKEN1);
+		/* WaEnableStateCacheRedirectToCS:icl */
+		whitelist_reg_ext(w, GEN9_SLICE_COMMON_ECO_CHICKEN1,
+				  RING_FORCE_TO_NONPRIV_RW);
+
+		/* WaAllowUMDToModifyHalfSliceChicken2:icl */
+		whitelist_reg_ext(w, HALF_SLICE_CHICKEN2,
+				  RING_FORCE_TO_NONPRIV_RW);
+
+		/* WaDisableMidObjectPreemptioninUMD:icl */
+		whitelist_reg_ext(w, GEN8_CS_CHICKEN1,
+				  RING_FORCE_TO_NONPRIV_RW);
+
+		/* FtrSSEUPowerGatingControlByUMD:icl */
+		whitelist_reg_ext(w, _MMIO(0x20C8), RING_FORCE_TO_NONPRIV_RW);
+
+		/* WaUseOaReportTriggersForQuery:icl */
+		whitelist_reg_ext(w, OAREPORTTRIG2, RING_FORCE_TO_NONPRIV_RW);
+
+		/* WaAllowUmdWriteTRTTRootTable:icl */
+		whitelist_reg_ext(w, _MMIO(0x4DE0), RING_FORCE_TO_NONPRIV_RW);
+		whitelist_reg_ext(w, _MMIO(0x4DE4), RING_FORCE_TO_NONPRIV_RW);
+
+		/* CL_PRIMITIVE_COUNT/PS_INVOCATIONS_COUNT */
+		whitelist_reg_ext(w, CL_PRIMITIVES_COUNT,
+				  RING_FORCE_TO_NONPRIV_RD |
+				  RING_FORCE_TO_NONPRIV_RANGE_4);
+
+		/* PS_DEPTH_COUNT */
+		whitelist_reg_ext(w, PS_DEPTH_COUNT, RING_FORCE_TO_NONPRIV_RD |
+				  RING_FORCE_TO_NONPRIV_RANGE_4);
+
+		/* EUMETRICS_EVENT_0 -> _5 */
+		whitelist_reg_ext(w, _MMIO(0xD8C), RING_FORCE_TO_NONPRIV_RD);
+		whitelist_reg_ext(w, _MMIO(0xD90), RING_FORCE_TO_NONPRIV_RD |
+				  RING_FORCE_TO_NONPRIV_RANGE_4);
+		whitelist_reg_ext(w, _MMIO(0xDA0), RING_FORCE_TO_NONPRIV_RD);
+
+		/* SRD_PERF_COUNTER */
+		whitelist_reg_ext(w, _MMIO(0x64844), RING_FORCE_TO_NONPRIV_RD);
+
+		/* WaAllowUMDAccesstoOARegisters:icl */
+		whitelist_reg_ext(w, _MMIO(0x28A0), RING_FORCE_TO_NONPRIV_RW);
+		whitelist_reg_ext(w, OAREPORTTRIG6, RING_FORCE_TO_NONPRIV_RW);
+		break;
+	case VIDEO_DECODE_CLASS:
+		/* hucStatusRegOffset */
+		whitelist_reg_ext(w, _MMIO(0x2000 + engine->mmio_base),
+				  RING_FORCE_TO_NONPRIV_RD);
+		/* hucUKernelHdrInfoRegOffset */
+		whitelist_reg_ext(w, _MMIO(0x2014 + engine->mmio_base),
+				  RING_FORCE_TO_NONPRIV_RD);
+		/* hucStatus2RegOffset */
+		whitelist_reg_ext(w, _MMIO(0x23B0 + engine->mmio_base),
+				  RING_FORCE_TO_NONPRIV_RD);
+
+		/* fall through */
+	case VIDEO_ENHANCEMENT_CLASS:
+		/* WATCHDOG_COUNT_CONTROL */
+		whitelist_reg_ext(w, _MMIO(0x178 + engine->mmio_base),
+				  RING_FORCE_TO_NONPRIV_RD);
+
+		/* WATCHDOG_COUNT_THRESHOLD */
+		whitelist_reg_ext(w, _MMIO(0x17C + engine->mmio_base),
+				  RING_FORCE_TO_NONPRIV_RD);
+		break;
+	default:
+		break;
+	}
 }
 
 void intel_engine_init_whitelist(struct intel_engine_cs *engine)
-- 
2.21.0.5.gaeb582a983

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-06-14  0:33 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-14  0:28 [PATCH 0/4] Update whitelist support for new hardware Robert M. Fosha
2019-06-14  0:28 ` [PATCH 1/4] drm/i915: Support flags in whitlist WAs Robert M. Fosha
2019-06-14  6:48   ` Tvrtko Ursulin
2019-06-18  1:13     ` John Harrison
2019-06-18  6:51       ` Tvrtko Ursulin
2019-06-14  0:28 ` [PATCH 2/4] drm/i915: Support whitelist workarounds on all engines Robert M. Fosha
2019-06-14  6:50   ` Tvrtko Ursulin
2019-06-14  0:28 ` [PATCH 3/4] drm/i915: Add whitelist workarounds for CFL Robert M. Fosha
2019-06-14  6:54   ` Tvrtko Ursulin
2019-06-14  0:28 ` Robert M. Fosha [this message]
2019-06-14  6:57   ` [PATCH 4/4] drm/i915: Add whitelist workarounds for ICL Tvrtko Ursulin
2019-06-14  1:09 ` ✗ Fi.CI.CHECKPATCH: warning for Update whitelist support for new hardware Patchwork
2019-06-14 14:23 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-06-14 17:19   ` Tvrtko Ursulin
2019-06-14 18:17     ` John Harrison
2019-06-14 18:22       ` Chris Wilson
2019-06-14 18:44         ` Tvrtko Ursulin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190614002838.3072-5-robert.m.fosha@intel.com \
    --to=robert.m.fosha@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.