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

Commit 919fcd51 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-52-git-send-email-chris@chris-wilson.co.uk
parent 8b00f55a

drivers/gpu/drm/i915/intel_runtime_pm.c

+8 −5
Original line number Diff line number Diff line
@@ -1218,7 +1218,6 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv) 
	u32 phy_control = dev_priv->chv_phy_control;

	u32 phy_status = 0;

	u32 phy_status_mask = 0xffffffff;

	u32 tmp;



	/*

	 * The BIOS can leave the PHY is some weird state
@@ -1306,10 +1305,14 @@ static void assert_chv_phy_status(struct drm_i915_private *dev_priv) 
	 * The PHY may be busy with some initial calibration and whatnot,

	 * so the power state can take a while to actually change.

	 */

	if (wait_for((tmp = I915_READ(DISPLAY_PHY_STATUS) & phy_status_mask) == phy_status, 10))

		WARN(phy_status != tmp,

		     "Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n",

		     tmp, phy_status, dev_priv->chv_phy_control);

	if (intel_wait_for_register(dev_priv,

				    DISPLAY_PHY_STATUS,

				    phy_status_mask,

				    phy_status,

				    10))

		DRM_ERROR("Unexpected PHY_STATUS 0x%08x, expected 0x%08x (PHY_CONTROL=0x%08x)\n",

			  I915_READ(DISPLAY_PHY_STATUS) & phy_status_mask,

			   phy_status, dev_priv->chv_phy_control);

}



#undef BITS_SET