Commit d6242aeb authored Oct 17, 2017 by Oscar Mateo Committed by Chris Wilson Oct 17, 2017

drm/i915: No need for RING_MAX_NONPRIV_SLOTS space



Now that we write RING_FORCE_TO_NONPRIV registers directly to hardware,
[commit 32ced39c ("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>

parent 56ffc742

drivers/gpu/drm/i915/i915_drv.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -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];