From 068b3f139b64961a4643dffccbcd3f62a66a2f57 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 May 2012 21:41:25 +0200 Subject: [PATCH] --- yaml --- r: 309371 b: refs/heads/master c: bf2125e2f7e931b50a6c76ba0435ba001409ccbf h: refs/heads/master i: 309369: 07a78ce216da576e6c1e8b569f84bf96209dee36 309367: bd82ad867899209a8ad6f4626b3a672e10e92fdf v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_tv.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c6b5c9f303ee..99f95616a0e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3347111999870c37eab1b969e90af9fdaf0334ba +refs/heads/master: bf2125e2f7e931b50a6c76ba0435ba001409ccbf diff --git a/trunk/drivers/gpu/drm/i915/intel_tv.c b/trunk/drivers/gpu/drm/i915/intel_tv.c index 3346612d2953..475f6d4d97fd 100644 --- a/trunk/drivers/gpu/drm/i915/intel_tv.c +++ b/trunk/drivers/gpu/drm/i915/intel_tv.c @@ -1194,6 +1194,11 @@ intel_tv_detect_type(struct intel_tv *intel_tv, I915_WRITE(TV_DAC, save_tv_dac & ~TVDAC_STATE_CHG_EN); I915_WRITE(TV_CTL, save_tv_ctl); + POSTING_READ(TV_CTL); + + /* For unknown reasons the hw barfs if we don't do this vblank wait. */ + intel_wait_for_vblank(intel_tv->base.base.dev, + to_intel_crtc(intel_tv->base.base.crtc)->pipe); /* Restore interrupt config */ if (connector->polled & DRM_CONNECTOR_POLL_HPD) {