diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2024-03-20 18:01:23 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2024-03-26 09:56:19 +0200 |
| commit | 1a8864822a90eedc3185d4775070a1fb47f54524 (patch) | |
| tree | e59e088018aac83b6249cb5e5cfa206d86c715dc | |
| parent | b2e0059bcd6ed4636a6476ddb83fb6a947c01abc (diff) | |
| download | linux-1a8864822a90eedc3185d4775070a1fb47f54524.tar.gz linux-1a8864822a90eedc3185d4775070a1fb47f54524.tar.bz2 linux-1a8864822a90eedc3185d4775070a1fb47f54524.zip | |
drm/i915/display: prefer intel_de_wait*() functions over uncore ones
Prefer the intel_de_wait*() functions over the uncore interface.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240320160123.2904609-2-jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dpio_phy.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dpio_phy.c b/drivers/gpu/drm/i915/display/intel_dpio_phy.c index 4ca910874a4f..2d7a71c8c69c 100644 --- a/drivers/gpu/drm/i915/display/intel_dpio_phy.c +++ b/drivers/gpu/drm/i915/display/intel_dpio_phy.c @@ -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); diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index 9edac27bab26..d5ed4c7dfbc0 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -369,9 +369,9 @@ 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, - HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE, - 10, 1, &val); + ret = intel_de_wait_custom(i915, HDCP_KEY_STATUS, + HDCP_KEY_LOAD_DONE, HDCP_KEY_LOAD_DONE, + 10, 1, &val); if (ret) return ret; else if (!(val & HDCP_KEY_LOAD_STATUS)) |