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

Commit aaaffb83 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-59-git-send-email-chris@chris-wilson.co.uk
parent 84a6e1d7

drivers/gpu/drm/i915/intel_sideband.c

+5 −2
Original line number Diff line number Diff line
@@ -256,7 +256,10 @@ void intel_sbi_write(struct drm_i915_private *dev_priv, u16 reg, u32 value, 
		tmp = SBI_CTL_DEST_MPHY | SBI_CTL_OP_IOWR;

	I915_WRITE(SBI_CTL_STAT, SBI_BUSY | tmp);



	if (wait_for((I915_READ(SBI_CTL_STAT) & (SBI_BUSY | SBI_RESPONSE_FAIL)) == 0,

	if (intel_wait_for_register(dev_priv,

				    SBI_CTL_STAT,

				    SBI_BUSY | SBI_RESPONSE_FAIL,

				    0,

				    100)) {

		DRM_ERROR("timeout waiting for SBI to complete write transaction\n");

		return;