Commit fc2c807b authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter

drm/i915: Make underruns DRM_ERROR

I want to see these without having full debugs enabled.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: fix the gen8 irq handler as spotted by Paulo in his review.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2d9d2b0b
...@@ -1487,7 +1487,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg) ...@@ -1487,7 +1487,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS && if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS &&
intel_set_cpu_fifo_underrun_reporting(dev, pipe, false)) intel_set_cpu_fifo_underrun_reporting(dev, pipe, false))
DRM_DEBUG_DRIVER("pipe %c underrun\n", pipe_name(pipe)); DRM_ERROR("pipe %c underrun\n", pipe_name(pipe));
} }
/* Consume port. Then clear IIR or we'll miss events */ /* Consume port. Then clear IIR or we'll miss events */
...@@ -1564,12 +1564,12 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir) ...@@ -1564,12 +1564,12 @@ static void ibx_irq_handler(struct drm_device *dev, u32 pch_iir)
if (pch_iir & SDE_TRANSA_FIFO_UNDER) if (pch_iir & SDE_TRANSA_FIFO_UNDER)
if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A,
false)) false))
DRM_DEBUG_DRIVER("PCH transcoder A FIFO underrun\n"); DRM_ERROR("PCH transcoder A FIFO underrun\n");
if (pch_iir & SDE_TRANSB_FIFO_UNDER) if (pch_iir & SDE_TRANSB_FIFO_UNDER)
if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_B, if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_B,
false)) false))
DRM_DEBUG_DRIVER("PCH transcoder B FIFO underrun\n"); DRM_ERROR("PCH transcoder B FIFO underrun\n");
} }
static void ivb_err_int_handler(struct drm_device *dev) static void ivb_err_int_handler(struct drm_device *dev)
...@@ -1585,7 +1585,7 @@ static void ivb_err_int_handler(struct drm_device *dev) ...@@ -1585,7 +1585,7 @@ static void ivb_err_int_handler(struct drm_device *dev)
if (err_int & ERR_INT_FIFO_UNDERRUN(pipe)) { if (err_int & ERR_INT_FIFO_UNDERRUN(pipe)) {
if (intel_set_cpu_fifo_underrun_reporting(dev, pipe, if (intel_set_cpu_fifo_underrun_reporting(dev, pipe,
false)) false))
DRM_DEBUG_DRIVER("Pipe %c FIFO underrun\n", DRM_ERROR("Pipe %c FIFO underrun\n",
pipe_name(pipe)); pipe_name(pipe));
} }
...@@ -1611,17 +1611,17 @@ static void cpt_serr_int_handler(struct drm_device *dev) ...@@ -1611,17 +1611,17 @@ static void cpt_serr_int_handler(struct drm_device *dev)
if (serr_int & SERR_INT_TRANS_A_FIFO_UNDERRUN) if (serr_int & SERR_INT_TRANS_A_FIFO_UNDERRUN)
if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A,
false)) false))
DRM_DEBUG_DRIVER("PCH transcoder A FIFO underrun\n"); DRM_ERROR("PCH transcoder A FIFO underrun\n");
if (serr_int & SERR_INT_TRANS_B_FIFO_UNDERRUN) if (serr_int & SERR_INT_TRANS_B_FIFO_UNDERRUN)
if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_B, if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_B,
false)) false))
DRM_DEBUG_DRIVER("PCH transcoder B FIFO underrun\n"); DRM_ERROR("PCH transcoder B FIFO underrun\n");
if (serr_int & SERR_INT_TRANS_C_FIFO_UNDERRUN) if (serr_int & SERR_INT_TRANS_C_FIFO_UNDERRUN)
if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_C, if (intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_C,
false)) false))
DRM_DEBUG_DRIVER("PCH transcoder C FIFO underrun\n"); DRM_ERROR("PCH transcoder C FIFO underrun\n");
I915_WRITE(SERR_INT, serr_int); I915_WRITE(SERR_INT, serr_int);
} }
...@@ -1683,7 +1683,7 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir) ...@@ -1683,7 +1683,7 @@ static void ilk_display_irq_handler(struct drm_device *dev, u32 de_iir)
if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe)) if (de_iir & DE_PIPE_FIFO_UNDERRUN(pipe))
if (intel_set_cpu_fifo_underrun_reporting(dev, pipe, false)) if (intel_set_cpu_fifo_underrun_reporting(dev, pipe, false))
DRM_DEBUG_DRIVER("Pipe %c FIFO underrun\n", DRM_ERROR("Pipe %c FIFO underrun\n",
pipe_name(pipe)); pipe_name(pipe));
if (de_iir & DE_PIPE_CRC_DONE(pipe)) if (de_iir & DE_PIPE_CRC_DONE(pipe))
...@@ -1885,7 +1885,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg) ...@@ -1885,7 +1885,7 @@ static irqreturn_t gen8_irq_handler(int irq, void *arg)
if (pipe_iir & GEN8_PIPE_FIFO_UNDERRUN) { if (pipe_iir & GEN8_PIPE_FIFO_UNDERRUN) {
if (intel_set_cpu_fifo_underrun_reporting(dev, pipe, if (intel_set_cpu_fifo_underrun_reporting(dev, pipe,
false)) false))
DRM_DEBUG_DRIVER("Pipe %c FIFO underrun\n", DRM_ERROR("Pipe %c FIFO underrun\n",
pipe_name(pipe)); pipe_name(pipe));
} }
...@@ -3239,7 +3239,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg) ...@@ -3239,7 +3239,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS && if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS &&
intel_set_cpu_fifo_underrun_reporting(dev, pipe, false)) intel_set_cpu_fifo_underrun_reporting(dev, pipe, false))
DRM_DEBUG_DRIVER("pipe %c underrun\n", pipe_name(pipe)); DRM_ERROR("pipe %c underrun\n", pipe_name(pipe));
} }
iir = new_iir; iir = new_iir;
...@@ -3437,7 +3437,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg) ...@@ -3437,7 +3437,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS && if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS &&
intel_set_cpu_fifo_underrun_reporting(dev, pipe, false)) intel_set_cpu_fifo_underrun_reporting(dev, pipe, false))
DRM_DEBUG_DRIVER("pipe %c underrun\n", pipe_name(pipe)); DRM_ERROR("pipe %c underrun\n", pipe_name(pipe));
} }
if (blc_event || (iir & I915_ASLE_INTERRUPT)) if (blc_event || (iir & I915_ASLE_INTERRUPT))
...@@ -3682,7 +3682,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg) ...@@ -3682,7 +3682,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS && if (pipe_stats[pipe] & PIPE_FIFO_UNDERRUN_STATUS &&
intel_set_cpu_fifo_underrun_reporting(dev, pipe, false)) intel_set_cpu_fifo_underrun_reporting(dev, pipe, false))
DRM_DEBUG_DRIVER("pipe %c underrun\n", pipe_name(pipe)); DRM_ERROR("pipe %c underrun\n", pipe_name(pipe));
} }
if (blc_event || (iir & I915_ASLE_INTERRUPT)) if (blc_event || (iir & I915_ASLE_INTERRUPT))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment