Commit 1a886482 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: prefer intel_de_wait*() functions over uncore ones 



Prefer the intel_de_wait*() functions over the uncore interface.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarGustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240320160123.2904609-2-jani.nikula@intel.com
parent b2e0059b

drivers/gpu/drm/i915/display/intel_dpio_phy.c

+2 −5
Original line number Diff line number Diff line
@@ -399,11 +399,8 @@ static void _bxt_ddi_phy_init(struct drm_i915_private *dev_priv, 
	 * The flag should get set in 100us according to the HW team, but

	 * use 1ms due to occasional timeouts observed with that.

	 */

	if (intel_wait_for_register_fw(&dev_priv->uncore,

				       BXT_PORT_CL1CM_DW0(phy),

				       PHY_RESERVED | PHY_POWER_GOOD,

				       PHY_POWER_GOOD,

				       1))

	if (intel_de_wait_fw(dev_priv, BXT_PORT_CL1CM_DW0(phy),

			     PHY_RESERVED | PHY_POWER_GOOD, PHY_POWER_GOOD, 1))

		drm_err(&dev_priv->drm, "timeout during PHY%d power on\n",

			phy);

drivers/gpu/drm/i915/display/intel_hdcp.c

+3 −3
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static int intel_hdcp_load_keys(struct drm_i915_private *i915) 
	}



	/* Wait for the keys to load (500us) */

	ret = __intel_wait_for_register(&i915->uncore, HDCP_KEY_STATUS,

	ret = intel_de_wait_custom(i915, HDCP_KEY_STATUS,

				   HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE,

				   10, 1, &val);

	if (ret)