On Thu, 2025-08-28 at 15:20 +0300, Jani Nikula wrote:
> Prefer generic poll helpers over i915 custom helpers.
>
> The functional change is losing the exponentially growing sleep of
> wait_for(), which used to be 10, 20, 40, ..., 640, and 1280 us.
>
> Use an arbitrary constant 200 us sleep for the 5 ms timeout, and 1000
> us
> sleep for the 500 ms timeout. The timeouts remain the same.
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
Reviewed-by: Jouni Högander <jouni.hogan...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_tc.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c
> b/drivers/gpu/drm/i915/display/intel_tc.c
> index 583fed5a386d..8974ffe2aabf 100644
> --- a/drivers/gpu/drm/i915/display/intel_tc.c
> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <linux/iopoll.h>
> +
> #include <drm/drm_print.h>
>
> #include "i915_reg.h"
> @@ -1047,8 +1049,13 @@ static bool
> xelpdp_tc_phy_wait_for_tcss_power(struct intel_tc_port *tc, bool
> enabled)
> {
> struct intel_display *display = to_intel_display(tc-
> >dig_port);
> + bool is_enabled;
> + int ret;
>
> - if (wait_for(xelpdp_tc_phy_tcss_power_is_enabled(tc) ==
> enabled, 5)) {
> + ret = poll_timeout_us(is_enabled =
> xelpdp_tc_phy_tcss_power_is_enabled(tc),
> + is_enabled == enabled,
> + 200, 5000, false);
> + if (ret) {
> drm_dbg_kms(display->drm,
> "Port %s: timeout waiting for TCSS power
> to get %s\n",
> str_enabled_disabled(enabled),
> @@ -1329,8 +1336,13 @@ static bool tc_phy_is_connected(struct
> intel_tc_port *tc,
> static bool tc_phy_wait_for_ready(struct intel_tc_port *tc)
> {
> struct intel_display *display = to_intel_display(tc-
> >dig_port);
> + bool is_ready;
> + int ret;
>
> - if (wait_for(tc_phy_is_ready(tc), 500)) {
> + ret = poll_timeout_us(is_ready = tc_phy_is_ready(tc),
> + is_ready,
> + 1000, 500 * 1000, false);
> + if (ret) {
> drm_err(display->drm, "Port %s: timeout waiting for
> PHY ready\n",
> tc->port_name);
>
