Commit 95cac283 authored Jun 30, 2016 by Chris Wilson

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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1467297225-21379-20-git-send-email-chris@chris-wilson.co.uk

parent b85c1ecf

drivers/gpu/drm/i915/intel_display.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -5418,7 +5418,9 @@ static void bxt_de_pll_disable(struct drm_i915_private *dev_priv)
		I915_WRITE(BXT_DE_PLL_ENABLE, 0);

		/* Timeout 200us */
		if (wait_for((I915_READ(BXT_DE_PLL_ENABLE) & BXT_DE_PLL_LOCK) == 0, 1))
		if (intel_wait_for_register(dev_priv,
		BXT_DE_PLL_ENABLE, BXT_DE_PLL_LOCK, 0,
		1))
		DRM_ERROR("timeout waiting for DE PLL unlock\n");

		dev_priv->cdclk_pll.vco = 0;