Commit 8c4223be authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Only call udelay() when waiting for clocks to stabilise 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent d5e0d2f5

drivers/gpu/drm/i915/intel_display.c

+1 −3
Original line number Diff line number Diff line
@@ -1989,8 +1989,8 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 
	if ((temp & DPLL_VCO_ENABLE) == 0) {

		I915_WRITE(pch_dpll_reg, temp | DPLL_VCO_ENABLE);

		I915_READ(pch_dpll_reg);

	}

		udelay(200);

	}



	if (HAS_PCH_CPT(dev)) {

		/* Be sure PCH DPLL SEL is set */
@@ -2136,8 +2136,6 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc) 
	} else

		DRM_DEBUG_KMS("crtc %d is disabled\n", pipe);



	udelay(100);



	/* Disable PF */

	I915_WRITE(pipe ? PFB_CTL_1 : PFA_CTL_1, 0);

	I915_WRITE(pipe ? PFB_WIN_SZ : PFA_WIN_SZ, 0);