Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe8c256 authored by Sitsofe Wheeler's avatar Sitsofe Wheeler Committed by Chris Wilson
Browse files

drm/i915: Revert extra intel_wait_for_vblank to prevent stalls. 



With the extra intel_wait_for_vblank added in commit
9d0498a2 periodic stalls were being
triggered (which were detected by i915_hangcheck_elapsed). Partially
revert this change for now.

Signed-off-by: default avatarSitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 2bbda389

drivers/gpu/drm/i915/intel_display.c

+4 −2
Original line number Diff line number Diff line
@@ -2328,8 +2328,10 @@ static void i9xx_crtc_dpms(struct drm_crtc *crtc, int mode) 
			I915_READ(dspbase_reg);

		}



		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 &&