Commit fd3790d4 authored by Chris Wilson's avatar 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: 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-8-git-send-email-chris@chris-wilson.co.uk
parent a522ae4b
...@@ -398,8 +398,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector) ...@@ -398,8 +398,8 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
CRT_HOTPLUG_FORCE_DETECT, CRT_HOTPLUG_FORCE_DETECT,
CRT_HOTPLUG_FORCE_DETECT); CRT_HOTPLUG_FORCE_DETECT);
/* wait for FORCE_DETECT to go off */ /* wait for FORCE_DETECT to go off */
if (wait_for((I915_READ(PORT_HOTPLUG_EN) & if (intel_wait_for_register(dev_priv, PORT_HOTPLUG_EN,
CRT_HOTPLUG_FORCE_DETECT) == 0, CRT_HOTPLUG_FORCE_DETECT, 0,
1000)) 1000))
DRM_DEBUG_KMS("timed out waiting for FORCE_DETECT to go off"); DRM_DEBUG_KMS("timed out waiting for FORCE_DETECT to go off");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment