aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2015-11-20 15:09:20 -0500
committerVille Syrjälä <ville.syrjala@linux.intel.com>2015-11-24 09:22:39 -0500
commit9bbc8258ae5914af1986561767d971417cee7a28 (patch)
treec67967f95d85f3f2b3fbd6baa07cd3dc930468c8
parent7864578a70ac8af640b02d2caf3555aba9048f6f (diff)
drm/i915: Check for underruns after crtc disable
To get a better idea if underruns occurred during crtc disabling, let's check for them explicitly. This helps in cases where the error interrupt isn't active, or there is no underrun interrupt support at all. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1448050160-14124-3-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9c8718366cc2..3df22f0c84df 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13402,6 +13402,13 @@ static int intel_atomic_commit(struct drm_device *dev,
13402 dev_priv->display.crtc_disable(crtc); 13402 dev_priv->display.crtc_disable(crtc);
13403 intel_crtc->active = false; 13403 intel_crtc->active = false;
13404 intel_disable_shared_dpll(intel_crtc); 13404 intel_disable_shared_dpll(intel_crtc);
13405
13406 /*
13407 * Underruns don't always raise
13408 * interrupts, so check manually.
13409 */
13410 intel_check_cpu_fifo_underruns(dev_priv);
13411 intel_check_pch_fifo_underruns(dev_priv);
13405 } 13412 }
13406 } 13413 }
13407 13414