diff options
| author | Chris Wilson | 2016-06-30 16:32:59 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-06-30 16:42:07 +0200 |
| commit | a7d04662358daf44c4fe61d1f27bbaeca7cd126e (patch) | |
| tree | 165870a70dc7aba3de7478b15c705c8c31c9c9e2 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Convert wait_for(I915_READ(reg)) to intel_wait_for_register() (diff) | |
| download | kernel-qcow2-linux-a7d04662358daf44c4fe61d1f27bbaeca7cd126e.tar.gz kernel-qcow2-linux-a7d04662358daf44c4fe61d1f27bbaeca7cd126e.tar.xz kernel-qcow2-linux-a7d04662358daf44c4fe61d1f27bbaeca7cd126e.zip | |
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-16-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 50ad3c55f0a9..99e8c8ea7f00 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1937,7 +1937,9 @@ static void ironlake_disable_pch_transcoder(struct drm_i915_private *dev_priv, val &= ~TRANS_ENABLE; I915_WRITE(reg, val); /* wait for PCH transcoder off, transcoder state */ - if (wait_for((I915_READ(reg) & TRANS_STATE_ENABLE) == 0, 50)) + if (intel_wait_for_register(dev_priv, + reg, TRANS_STATE_ENABLE, 0, + 50)) DRM_ERROR("failed to disable transcoder %c\n", pipe_name(pipe)); if (HAS_PCH_CPT(dev)) { |