tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+10
-4
+10
-4
drivers/gpu/drm/i915/display/intel_pch_refclk.c
+10
-4
drivers/gpu/drm/i915/display/intel_pch_refclk.c
···
17
17
18
18
static void lpt_fdi_reset_mphy(struct intel_display *display)
19
19
{
20
+
int ret;
21
+
20
22
intel_de_rmw(display, SOUTH_CHICKEN2, 0, FDI_MPHY_IOSFSB_RESET_CTL);
21
23
22
-
if (wait_for_us(intel_de_read(display, SOUTH_CHICKEN2) &
23
-
FDI_MPHY_IOSFSB_RESET_STATUS, 100))
24
+
ret = intel_de_wait_custom(display, SOUTH_CHICKEN2,
25
+
FDI_MPHY_IOSFSB_RESET_STATUS, FDI_MPHY_IOSFSB_RESET_STATUS,
26
+
100, 0, NULL);
27
+
if (ret)
24
28
drm_err(display->drm, "FDI mPHY reset assert timeout\n");
25
29
26
30
intel_de_rmw(display, SOUTH_CHICKEN2, FDI_MPHY_IOSFSB_RESET_CTL, 0);
27
31
28
-
if (wait_for_us((intel_de_read(display, SOUTH_CHICKEN2) &
29
-
FDI_MPHY_IOSFSB_RESET_STATUS) == 0, 100))
32
+
ret = intel_de_wait_custom(display, SOUTH_CHICKEN2,
33
+
FDI_MPHY_IOSFSB_RESET_STATUS, 0,
34
+
100, 0, NULL);
35
+
if (ret)
30
36
drm_err(display->drm, "FDI mPHY reset de-assert timeout\n");
31
37
}
32
38