diff options
| author | Sitsofe Wheeler <sitsofe@yahoo.com> | 2010-08-24 16:56:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-08 10:13:34 +0100 |
| commit | efe8c25680fcd3548142f956dcd02d5fdaf3f159 (patch) | |
| tree | 8173469ff7d6e183d7dba04d57bb60270bef52b8 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 2bbda389632dd810d80c055fc1ec90827a16f687 (diff) | |
| download | blackbird-op-linux-efe8c25680fcd3548142f956dcd02d5fdaf3f159.tar.gz blackbird-op-linux-efe8c25680fcd3548142f956dcd02d5fdaf3f159.zip | |
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 <sitsofe@yahoo.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 && |
