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

Commit e24ca054 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Convert wait_for(I915_READ(reg)) to intel_wait_for_register() 



By using the out-of-line intel_wait_for_register() not only do we can
efficiency from using the hybrid wait_for() contained within, but we
avoid code bloat from the numerous inlined loops, in total (all patches):

   text    data     bss     dec     hex filename
1078551    4557     416 1083524  108884 drivers/gpu/drm/i915/i915.ko
1070775    4557     416 1075748  106a24 drivers/gpu/drm/i915/i915.ko

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467297225-21379-22-git-send-email-chris@chris-wilson.co.uk
parent e084e1b9

drivers/gpu/drm/i915/intel_display.c

+3 −1
Original line number Diff line number Diff line
@@ -5706,7 +5706,9 @@ skl_dpll0_enable(struct drm_i915_private *dev_priv, int vco) 


	I915_WRITE(LCPLL1_CTL, I915_READ(LCPLL1_CTL) | LCPLL_PLL_ENABLE);



	if (wait_for(I915_READ(LCPLL1_CTL) & LCPLL_PLL_LOCK, 5))

	if (intel_wait_for_register(dev_priv,

				    LCPLL1_CTL, LCPLL_PLL_LOCK, LCPLL_PLL_LOCK,

				    5))

		DRM_ERROR("DPLL0 not locked\n");



	dev_priv->cdclk_pll.vco = vco;