From c86d88d06301cb9a80e54cee194d136f89bb568b Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Thu, 4 Oct 2012 19:20:03 +0200 Subject: [PATCH] --- yaml --- r: 334379 b: refs/heads/master c: 6ce9410047f9f06c1b3336d5215402b77d6fd70f h: refs/heads/master i: 334377: 1c69629ca0cb36db15c91a2695262b8e594a73f3 334375: b50b677011dcbc35f6206e31ab907ec0c5334f87 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0c57fc9e4222..78676442c37b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c77d7162a7ae451c2e895d7ef7fbeb0906107472 +refs/heads/master: 6ce9410047f9f06c1b3336d5215402b77d6fd70f diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 67912febb322..9cecfd73b0b1 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -3253,6 +3253,16 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) if (HAS_PCH_CPT(dev)) intel_cpt_verify_modeset(dev, intel_crtc->pipe); + + /* + * There seems to be a race in PCH platform hw (at least on some + * outputs) where an enabled pipe still completes any pageflip right + * away (as if the pipe is off) instead of waiting for vblank. As soon + * as the first vblank happend, everything works as expected. Hence just + * wait for one vblank before returning to avoid strange things + * happening. + */ + intel_wait_for_vblank(dev, intel_crtc->pipe); } static void ironlake_crtc_disable(struct drm_crtc *crtc)