drm/bridge: cdns-dsi: Fix the clock variable for mode_valid()

commit 132bdcec399be6ae947582249a134b38cf56731c upstream.

The crtc_* mode parameters do not get generated (duplicated in this
case) from the regular parameters before the mode validation phase
begins.

The rest of the code conditionally uses the crtc_* parameters only
during the bridge enable phase, but sticks to the regular parameters
for mode validation. In this singular instance, however, the driver
tries to use the crtc_clock parameter even during the mode validation,
causing the validation to fail.

Allow the D-Phy config checks to use mode->clock instead of
mode->crtc_clock during mode_valid checks, like everywhere else in the
driver.

Fixes: fced5a364dee ("drm/bridge: cdns: Convert to phy framework")
Cc: stable@vger.kernel.org
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
Signed-off-by: Aradhya Bhatia <aradhya.bhatia@linux.dev>
Link: https://lore.kernel.org/r/20250329113925.68204-4-aradhya.bhatia@linux.dev
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c
index 9c3f9110895e8d056890032d850ce526cca29a0f..a843cefa00c1e4daf9ab302b0799eaffb17ad335 100644 (file)
--- a/drivers/gpu/drm/bridge/cdns-dsi.c
+++ b/drivers/gpu/drm/bridge/cdns-dsi.c
@@ -609,13 +609,14 @@ static int cdns_dsi_check_conf(struct cdns_dsi *dsi,
        struct phy_configure_opts_mipi_dphy *phy_cfg = &output->phy_opts.mipi_dphy;
        unsigned long dsi_hss_hsa_hse_hbp;
        unsigned int nlanes = output->dev->lanes;
+       int mode_clock = (mode_valid_check ? mode->clock : mode->crtc_clock);
        int ret;
 
        ret = cdns_dsi_mode2cfg(dsi, mode, dsi_cfg, mode_valid_check);
        if (ret)
                return ret;
 
-       phy_mipi_dphy_get_default_config(mode->crtc_clock * 1000,
+       phy_mipi_dphy_get_default_config(mode_clock * 1000,
                                         mipi_dsi_pixel_format_to_bpp(output->dev->format),
                                         nlanes, phy_cfg);