diff options
| author | Chris Wilson | 2016-06-30 16:33:29 +0200 |
|---|---|---|
| committer | Chris Wilson | 2016-06-30 16:42:26 +0200 |
| commit | 25ab57f42f96f7e66af29546bcc67c9057277e84 (patch) | |
| tree | 728bc325263e2e8e662a728b90aadb22e644ae7b /drivers/gpu | |
| parent | drm/i915: Convert wait_for(I915_READ(reg)) to intel_wait_for_register() (diff) | |
| download | kernel-qcow2-linux-25ab57f42f96f7e66af29546bcc67c9057277e84.tar.gz kernel-qcow2-linux-25ab57f42f96f7e66af29546bcc67c9057277e84.tar.xz kernel-qcow2-linux-25ab57f42f96f7e66af29546bcc67c9057277e84.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-46-git-send-email-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 04a2d141e690..7ef3e68c8fd6 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -515,8 +515,9 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine) I915_WRITE(reg, _MASKED_BIT_ENABLE(INSTPM_TLB_INVALIDATE | INSTPM_SYNC_FLUSH)); - if (wait_for((I915_READ(reg) & INSTPM_SYNC_FLUSH) == 0, - 1000)) + if (intel_wait_for_register(dev_priv, + reg, INSTPM_SYNC_FLUSH, 0, + 1000)) DRM_ERROR("%s: wait for SyncFlush to complete for TLB invalidation timed out\n", engine->name); } |