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-26-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-06-30 15:33:09 +01:00
parent 93220c08ed
commit 9036ff06c2

View File

@ -1768,8 +1768,9 @@ static void wait_panel_status(struct intel_dp *intel_dp,
I915_READ(pp_stat_reg), I915_READ(pp_stat_reg),
I915_READ(pp_ctrl_reg)); I915_READ(pp_ctrl_reg));
if (_wait_for((I915_READ(pp_stat_reg) & mask) == value, if (intel_wait_for_register(dev_priv,
5 * USEC_PER_SEC, 10 * USEC_PER_MSEC)) pp_stat_reg, mask, value,
5000))
DRM_ERROR("Panel status timeout: status %08x control %08x\n", DRM_ERROR("Panel status timeout: status %08x control %08x\n",
I915_READ(pp_stat_reg), I915_READ(pp_stat_reg),
I915_READ(pp_ctrl_reg)); I915_READ(pp_ctrl_reg));