From: Sitsofe Wheeler Date: Tue, 24 Aug 2010 15:56:16 +0000 (+0100) Subject: drm/i915: Revert extra intel_wait_for_vblank to prevent stalls. X-Git-Tag: v2.6.37-rc1~77^2~31^2~245 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=efe8c25680fcd3548142f956dcd02d5fdaf3f159;p=linux-block.git drm/i915: Revert extra intel_wait_for_vblank to prevent stalls. With the extra intel_wait_for_vblank added in commit 9d0498a2bf7455159b317f19531a3e5db2ecc9c4 periodic stalls were being triggered (which were detected by i915_hangcheck_elapsed). Partially revert this change for now. Signed-off-by: Sitsofe Wheeler Signed-off-by: Chris Wilson --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 854d8f4415b7..3a03c62496d3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2328,8 +2328,10 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) I915_READ(dspbase_reg); } - /* Wait for vblank for the disable to take effect */ - intel_wait_for_vblank_off(dev, pipe); + if (!IS_I9XX(dev)) { + /* Wait for vblank for the disable to take effect */ + intel_wait_for_vblank_off(dev, pipe); + } /* Don't disable pipe A or pipe A PLLs if needed */ if (pipeconf_reg == PIPEACONF &&