]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: No need for RING_MAX_NONPRIV_SLOTS space
authorOscar Mateo <oscar.mateo@intel.com>
Tue, 17 Oct 2017 20:27:51 +0000 (13:27 -0700)
committerChris Wilson <chris@chris-wilson.co.uk>
Tue, 17 Oct 2017 22:20:19 +0000 (23:20 +0100)
Now that we write RING_FORCE_TO_NONPRIV registers directly to hardware,
[commit 32ced39 ("drm/i915: Transform whitelisting WAs into a simple reg
write")] there is no need to save space for them in the list of context
workarounds.

v2: Refer to previous commit in commit message (Michel)

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1508272071-15125-1-git-send-email-oscar.mateo@intel.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/i915_drv.h

index dd141b25058318479d2438425c5c1f8f6adf8a95..d31addb540adf3f00c84eb928d0123c6fe8963fd 100644 (file)
@@ -1964,13 +1964,7 @@ struct i915_wa_reg {
        u32 mask;
 };
 
-/*
- * RING_MAX_NONPRIV_SLOTS is per-engine but at this point we are only
- * allowing it for RCS as we don't foresee any requirement of having
- * a whitelist for other engines. When it is really required for
- * other engines then the limit need to be increased.
- */
-#define I915_MAX_WA_REGS (16 + RING_MAX_NONPRIV_SLOTS)
+#define I915_MAX_WA_REGS 16
 
 struct i915_workarounds {
        struct i915_wa_reg reg[I915_MAX_WA_REGS];