Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d54fe4aa authored by Chris Wilson's avatar Chris Wilson
Browse files

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-48-git-send-email-chris@chris-wilson.co.uk
parent 3d808eb1

drivers/gpu/drm/i915/intel_ringbuffer.c

+5 −3
Original line number Diff line number Diff line
@@ -2696,8 +2696,10 @@ static void gen6_bsd_ring_write_tail(struct intel_engine_cs *engine, 
	I915_WRITE64(GEN6_BSD_RNCID, 0x0);



	/* Wait for the ring not to be idle, i.e. for it to wake up. */

	if (wait_for((I915_READ(GEN6_BSD_SLEEP_PSMI_CONTROL) &

		      GEN6_BSD_SLEEP_INDICATOR) == 0,

	if (intel_wait_for_register(dev_priv,

				    GEN6_BSD_SLEEP_PSMI_CONTROL,

				    GEN6_BSD_SLEEP_INDICATOR,

				    0,

				    50))

		DRM_ERROR("timed out waiting for the BSD ring to wake up\n");