On Sat, Nov 14, 2026 at 06:00:39AM +0100, Sebastian Reichel wrote:
> The DP AUX transfer method uses a completion triggered by an interrupt,
> which can timeout. If the function runs into the timeout and the
> interrupt fires afterwards, the following DP aux transfer completion
> would trigger immediately without waiting for the interrupt. This in
> turn means the next one would also be broken and so on.
> 
> Fix this potential issue by re-initializing the completion directly
> before sending the AUX command.
> 
> As this is racy (the interrupt might arrive between the completion
> re-init and the new command being programmed), also reset the AUX
> controller on timeouts and synchronize pending interrupts to guarantee
> that there are no pending AUX transfers when the dw_dp_aux_transfer()
> returns.
> 
> Due to lack of a sink, which generates AUX timeouts, this change is
> effectively untested.
> 
> Reported-by: Sashiko <[email protected]>
> Fixes: 86eecc3a9c2e ("drm/bridge: synopsys: Add DW DPTX Controller support 
> library")
> Tested-by: Igor Paunovic <[email protected]> # Orange Pi 5+
> Signed-off-by: Sebastian Reichel <[email protected]>
> ---
>  drivers/gpu/drm/bridge/synopsys/dw-dp.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-dp.c 
> b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> index 7351b70bdac9..df0b98cbbaab 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-dp.c
> @@ -1465,6 +1465,8 @@ static ssize_t dw_dp_aux_transfer(struct drm_dp_aux 
> *aux,
>       if (WARN_ON(msg->size > 16))
>               return -E2BIG;
>  
> +     reinit_completion(&dp->complete);
> +
>       switch (msg->request & ~DP_AUX_I2C_MOT) {
>       case DP_AUX_NATIVE_WRITE:
>       case DP_AUX_I2C_WRITE:
> @@ -1491,6 +1493,12 @@ static ssize_t dw_dp_aux_transfer(struct drm_dp_aux 
> *aux,
>       status = wait_for_completion_timeout(&dp->complete, timeout);
>       if (!status) {
>               dev_err(dp->dev, "timeout waiting for AUX reply\n");
> +             regmap_update_bits(dp->regmap, DW_DP_SOFT_RESET_CTRL,
> +                                AUX_RESET, FIELD_PREP(AUX_RESET, 1));

As this is just one bit, I'd find

                regmap_update_bits(dp->regmap, DW_DP_SOFT_RESET_CTRL,
                                   AUX_RESET, AUX_RESET);

more readable. Same below with s/AUX_RESET);/);0/. Up to you.

> +             usleep_range(10, 20);

fsleep() uses udelay() for delays up to 10µs included. Is there a
particular reason to sleep ?

Please also document somewhere (the commit message is fine) where the
value of the delay comes from.

> +             regmap_update_bits(dp->regmap, DW_DP_SOFT_RESET_CTRL,
> +                                AUX_RESET, FIELD_PREP(AUX_RESET, 0));
> +             synchronize_irq(dp->irq);
>               return -ETIMEDOUT;
>       }
>  

-- 
Regards,

Laurent Pinchart

Reply via email to