Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/ddi: use intel_de_wait_custom() instead of wait_for_us()
Prefer the register read specific wait function over i915 wait_for_us().
v2: Wait for bits to clear in mtl_ddi_disable_d2d()
Reviewed-by: Gustavo Sousa <gustavo.sousa@intel.com>
Link: https://lore.kernel.org/r/232a554db6a327974c06f2491311b28f865467b9.1753956266.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+12
-2
+12
-2
drivers/gpu/drm/i915/display/intel_ddi.c
+12
-2
drivers/gpu/drm/i915/display/intel_ddi.c
···
2561
2561
enum port port = encoder->port;
2562
2562
i915_reg_t reg;
2563
2563
u32 set_bits, wait_bits;
2564
+
int ret;
2564
2565
2565
2566
if (DISPLAY_VER(display) < 14)
2566
2567
return;
···
2577
2576
}
2578
2577
2579
2578
intel_de_rmw(display, reg, 0, set_bits);
2580
-
if (wait_for_us(intel_de_read(display, reg) & wait_bits, 100)) {
2579
+
2580
+
ret = intel_de_wait_custom(display, reg,
2581
+
wait_bits, wait_bits,
2582
+
100, 0, NULL);
2583
+
if (ret) {
2581
2584
drm_err(display->drm, "Timeout waiting for D2D Link enable for DDI/PORT_BUF_CTL %c\n",
2582
2585
port_name(port));
2583
2586
}
···
3063
3058
enum port port = encoder->port;
3064
3059
i915_reg_t reg;
3065
3060
u32 clr_bits, wait_bits;
3061
+
int ret;
3066
3062
3067
3063
if (DISPLAY_VER(display) < 14)
3068
3064
return;
···
3079
3073
}
3080
3074
3081
3075
intel_de_rmw(display, reg, clr_bits, 0);
3082
-
if (wait_for_us(!(intel_de_read(display, reg) & wait_bits), 100))
3076
+
3077
+
ret = intel_de_wait_custom(display, reg,
3078
+
wait_bits, 0,
3079
+
100, 0, NULL);
3080
+
if (ret)
3083
3081
drm_err(display->drm, "Timeout waiting for D2D Link disable for DDI/PORT_BUF_CTL %c\n",
3084
3082
port_name(port));
3085
3083
}