drm/i915/pch: use intel_de_wait_custom() instead of wait_for_us()

Prefer the register read specific wait function over i915 wait_for_us().

Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/67e0afa2c0c5ad39b9108af15d0496394e674518.1753956266.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_pch_refclk.c b/drivers/gpu/drm/i915/display/intel_pch_refclk.c
index d3c5255bf1a88aeaf223949d8ed19bc2ced8daff..9ae53679a041774ee76004f8d879b896b02910f3 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_pch_refclk.c
+++ b/drivers/gpu/drm/i915/display/intel_pch_refclk.c
@@ -17,16 +17,22 @@
 
 static void lpt_fdi_reset_mphy(struct intel_display *display)
 {
+       int ret;
+
        intel_de_rmw(display, SOUTH_CHICKEN2, 0, FDI_MPHY_IOSFSB_RESET_CTL);
 
-       if (wait_for_us(intel_de_read(display, SOUTH_CHICKEN2) &
-                       FDI_MPHY_IOSFSB_RESET_STATUS, 100))
+       ret = intel_de_wait_custom(display, SOUTH_CHICKEN2,
+                                  FDI_MPHY_IOSFSB_RESET_STATUS, FDI_MPHY_IOSFSB_RESET_STATUS,
+                                  100, 0, NULL);
+       if (ret)
                drm_err(display->drm, "FDI mPHY reset assert timeout\n");
 
        intel_de_rmw(display, SOUTH_CHICKEN2, FDI_MPHY_IOSFSB_RESET_CTL, 0);
 
-       if (wait_for_us((intel_de_read(display, SOUTH_CHICKEN2) &
-                        FDI_MPHY_IOSFSB_RESET_STATUS) == 0, 100))
+       ret = intel_de_wait_custom(display, SOUTH_CHICKEN2,
+                                  FDI_MPHY_IOSFSB_RESET_STATUS, 0,
+                                  100, 0, NULL);
+       if (ret)
                drm_err(display->drm, "FDI mPHY reset de-assert timeout\n");
 }