diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2014-08-30 11:51:01 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-03 06:39:03 -0400 |
commit | 04ad2dc7116347a4219b13935c7569ceaab95155 (patch) | |
tree | 5dee034c63e5da9f8e14cb489147665daa1776c7 /drivers/gpu/drm | |
parent | 55820e1e840def3802fc366607f2b25e31036ab1 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 96618c0c5085..5ef0f994b0bb 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -663,7 +663,7 @@ static inline void intel_ring_emit_wa(struct intel_engine_cs *ring, | |||
663 | struct drm_device *dev = ring->dev; | 663 | struct drm_device *dev = ring->dev; |
664 | struct drm_i915_private *dev_priv = dev->dev_private; | 664 | struct drm_i915_private *dev_priv = dev->dev_private; |
665 | 665 | ||
666 | if (dev_priv->num_wa_regs >= I915_MAX_WA_REGS) | 666 | if (WARN_ON(dev_priv->num_wa_regs >= I915_MAX_WA_REGS)) |
667 | return; | 667 | return; |
668 | 668 | ||
669 | intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1)); | 669 | intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(1)); |