Commit 823c6909 authored May 16, 2014 by Ville Syrjälä Committed by Daniel Vetter May 16, 2014

drm/i915: Convert uncleared FIFO underrun message to errors



Some platforms have a shared error interrupt, so if FIFO underrun
reporting gets disabled for one pipe/transcoder it gets disabled
for all pipes/transcoders.

When we disable FIFO underrun reporting we check whether the
interrupt was enabled or not. If it wasn't we might have missed
an underrun and we perform one last check right there. Currently
we print a debug message when an underrun is detect using this
mechanism. Promote the message to DRM_ERROR() to match the other
underrun error messages.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 5cc9ed4b

drivers/gpu/drm/i915/i915_irq.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@ static void ivybridge_set_fifo_underrun_reporting(struct drm_device *dev,

		if (!was_enabled &&
		(I915_READ(GEN7_ERR_INT) & ERR_INT_FIFO_UNDERRUN(pipe))) {
		DRM_DEBUG_KMS("uncleared fifo underrun on pipe %c\n",
		DRM_ERROR("uncleared fifo underrun on pipe %c\n",
		pipe_name(pipe));
		}
		}
		@@ -435,7 +435,7 @@ static void cpt_set_fifo_underrun_reporting(struct drm_device *dev,

		if (!was_enabled &&
		(tmp & SERR_INT_TRANS_FIFO_UNDERRUN(pch_transcoder))) {
		DRM_DEBUG_KMS("uncleared pch fifo underrun on pch transcoder %c\n",
		DRM_ERROR("uncleared pch fifo underrun on pch transcoder %c\n",
		transcoder_name(pch_transcoder));
		}
		}