drm/i915/cdclk: 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/fadd74e9450afff5e32bf921b192f19ea1629fff.1753956266.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c
index 228aa64c1349be86af87578b7f93bcbe51efd46e..2a2d6714e4f47d3d4c73ca8b64a7cfd2f0ca66ae 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_cdclk.c
+++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
@@ -903,8 +903,10 @@ static void bdw_set_cdclk(struct intel_display *display,
         * According to the spec, it should be enough to poll for this 1 us.
         * However, extensive testing shows that this can take longer.
         */
-       if (wait_for_us(intel_de_read(display, LCPLL_CTL) &
-                       LCPLL_CD_SOURCE_FCLK_DONE, 100))
+       ret = intel_de_wait_custom(display, LCPLL_CTL,
+                                  LCPLL_CD_SOURCE_FCLK_DONE, LCPLL_CD_SOURCE_FCLK_DONE,
+                                  100, 0, NULL);
+       if (ret)
                drm_err(display->drm, "Switching to FCLK failed\n");
 
        intel_de_rmw(display, LCPLL_CTL,
@@ -913,8 +915,10 @@ static void bdw_set_cdclk(struct intel_display *display,
        intel_de_rmw(display, LCPLL_CTL,
                     LCPLL_CD_SOURCE_FCLK, 0);
 
-       if (wait_for_us((intel_de_read(display, LCPLL_CTL) &
-                        LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
+       ret = intel_de_wait_custom(display, LCPLL_CTL,
+                                  LCPLL_CD_SOURCE_FCLK_DONE, 0,
+                                  1, 0, NULL);
+       if (ret)
                drm_err(display->drm, "Switching back to LCPLL failed\n");
 
        intel_pcode_write(display->drm, HSW_PCODE_DE_WRITE_FREQ_REQ,