Commit 04ad2dc7 authored Aug 30, 2014 by Damien Lespiau Committed by Daniel Vetter Sep 03, 2014

drm/i915: Don't silently discard workarounds



If we happen to emit more than I915_MAX_WA_REGS workarounds, we will
currently discard them, not even emit the LRI. Not really what we want,
so warn loudly.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 55820e1e

drivers/gpu/drm/i915/intel_ringbuffer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -663,7 +663,7 @@ static inline void intel_ring_emit_wa(struct intel_engine_cs *ring,
		struct drm_device *dev = ring->dev;
		struct drm_i915_private *dev_priv = dev->dev_private;

		if (dev_priv->num_wa_regs >= I915_MAX_WA_REGS)
		if (WARN_ON(dev_priv->num_wa_regs >= I915_MAX_WA_REGS))
		return;

		intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1));