drm/i915: Revert extra intel_wait_for_vblank to prevent stalls.
With the extra intel_wait_for_vblank added in commit
9d0498a2bf
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>
This commit is contained in:
parent
2bbda38963
commit
efe8c25680
1 changed files with 4 additions and 2 deletions
|
@ -2328,8 +2328,10 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode)
|
||||||
I915_READ(dspbase_reg);
|
I915_READ(dspbase_reg);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Wait for vblank for the disable to take effect */
|
if (!IS_I9XX(dev)) {
|
||||||
intel_wait_for_vblank_off(dev, pipe);
|
/* 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 */
|
/* Don't disable pipe A or pipe A PLLs if needed */
|
||||||
if (pipeconf_reg == PIPEACONF &&
|
if (pipeconf_reg == PIPEACONF &&
|
||||||
|
|
Loading…
Reference in a new issue