Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+8
-4
+8
-4
drivers/gpu/drm/i915/display/intel_cdclk.c
+8
-4
drivers/gpu/drm/i915/display/intel_cdclk.c
···
903
903
* According to the spec, it should be enough to poll for this 1 us.
904
904
* However, extensive testing shows that this can take longer.
905
905
*/
906
-
if (wait_for_us(intel_de_read(display, LCPLL_CTL) &
907
-
LCPLL_CD_SOURCE_FCLK_DONE, 100))
906
+
ret = intel_de_wait_custom(display, LCPLL_CTL,
907
+
LCPLL_CD_SOURCE_FCLK_DONE, LCPLL_CD_SOURCE_FCLK_DONE,
908
+
100, 0, NULL);
909
+
if (ret)
908
910
drm_err(display->drm, "Switching to FCLK failed\n");
909
911
910
912
intel_de_rmw(display, LCPLL_CTL,
···
915
913
intel_de_rmw(display, LCPLL_CTL,
916
914
LCPLL_CD_SOURCE_FCLK, 0);
917
915
918
-
if (wait_for_us((intel_de_read(display, LCPLL_CTL) &
919
-
LCPLL_CD_SOURCE_FCLK_DONE) == 0, 1))
916
+
ret = intel_de_wait_custom(display, LCPLL_CTL,
917
+
LCPLL_CD_SOURCE_FCLK_DONE, 0,
918
+
1, 0, NULL);
919
+
if (ret)
920
920
drm_err(display->drm, "Switching back to LCPLL failed\n");
921
921
922
922
intel_pcode_write(display->drm, HSW_PCODE_DE_WRITE_FREQ_REQ,