Commit c6ddc5f3 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-3-git-send-email-chris@chris-wilson.co.uk
parent 3f5582dd

drivers/gpu/drm/i915/i915_drv.c

+5 −4
Original line number Diff line number Diff line
@@ -2535,8 +2535,6 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on) 
	u32 val;

	int err;



#define COND (I915_READ(VLV_GTLC_SURVIVABILITY_REG) & VLV_GFX_CLK_STATUS_BIT)



	val = I915_READ(VLV_GTLC_SURVIVABILITY_REG);

	val &= ~VLV_GFX_CLK_FORCE_ON_BIT;

	if (force_on)
@@ -2546,13 +2544,16 @@ int vlv_force_gfx_clock(struct drm_i915_private *dev_priv, bool force_on) 
	if (!force_on)

		return 0;



	err = wait_for(COND, 20);

	err = intel_wait_for_register(dev_priv,

				      VLV_GTLC_SURVIVABILITY_REG,

				      VLV_GFX_CLK_STATUS_BIT,

				      VLV_GFX_CLK_STATUS_BIT,

				      20);

	if (err)

		DRM_ERROR("timeout waiting for GFX clock force-on (%08x)\n",

			  I915_READ(VLV_GTLC_SURVIVABILITY_REG));



	return err;

#undef COND

}



static int vlv_allow_gt_wake(struct drm_i915_private *dev_priv, bool allow)