aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Zanoni <paulo.r.zanoni@intel.com>2013-12-19 16:12:30 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-02-12 12:53:07 -0500
commitf1ff6965e7ae5b5312ebba280570545f05409244 (patch)
tree2cdbb05a0b54915aed4fee1ca9cb57efa3dc56b8
parent851855d8573fc0b9f30901980001d6374d92653e (diff)
drm/i915: don't wait for vblank after enabling pipe on HSW
Because on Haswell, the pipe is never running at this point, so we hit the 50ms timeout waiting for nothing. We already have two other places where we wait for vblanks on haswell_crtc_enable, so we're safe. This gets us rid of one instance of "vblank wait timed out" for each mode set, which means driver init and resume are also 50ms faster. Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index c456768282da..0523419bc485 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3747,7 +3747,7 @@ static void haswell_crtc_enable(struct drm_crtc *crtc)
3747 3747
3748 intel_update_watermarks(crtc); 3748 intel_update_watermarks(crtc);
3749 intel_enable_pipe(dev_priv, pipe, 3749 intel_enable_pipe(dev_priv, pipe,
3750 intel_crtc->config.has_pch_encoder, false, true); 3750 intel_crtc->config.has_pch_encoder, false, false);
3751 3751
3752 if (intel_crtc->config.has_pch_encoder) 3752 if (intel_crtc->config.has_pch_encoder)
3753 lpt_pch_enable(crtc); 3753 lpt_pch_enable(crtc);