There is no need to re-compute the dsi lane capability because it only depends on dsi hw version. Since dsi hw version is detected at probe(), move there also the assignment of dsi lane capability. Signed-off-by: Antonio Borneo <antonio.borneo@xxxxxxxxxxx> --- To: David Airlie <airlied@xxxxxxxx> To: Daniel Vetter <daniel@xxxxxxxx> To: Andrzej Hajda <a.hajda@xxxxxxxxxxx> To: Neil Armstrong <narmstrong@xxxxxxxxxxxx> To: Robert Foss <robert.foss@xxxxxxxxxx> To: Laurent Pinchart <Laurent.pinchart@xxxxxxxxxxxxxxxx> To: Jonas Karlman <jonas@xxxxxxxxx> To: Jernej Skrabec <jernej.skrabec@xxxxxxxxx> To: Yannick Fertre <yannick.fertre@xxxxxxxxxxx> To: Philippe Cornu <philippe.cornu@xxxxxxxxxxx> To: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxx> To: Maxime Coquelin <mcoquelin.stm32@xxxxxxxxx> To: Alexandre Torgue <alexandre.torgue@xxxxxxxxxxx> To: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> To: dri-devel@xxxxxxxxxxxxxxxxxxxxx To: linux-stm32@xxxxxxxxxxxxxxxxxxxxxxxxxxxx To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx --- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index 32cb41b2202f..480fdf256f01 100644 --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -247,14 +247,6 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, int ret, bpp; u32 val; - /* Update lane capabilities according to hw version */ - dsi->lane_min_kbps = LANE_MIN_KBPS; - dsi->lane_max_kbps = LANE_MAX_KBPS; - if (dsi->hw_version == HWVER_131) { - dsi->lane_min_kbps *= 2; - dsi->lane_max_kbps *= 2; - } - pll_in_khz = (unsigned int)(clk_get_rate(dsi->pllref_clk) / 1000); /* Compute requested pll out */ @@ -417,6 +409,14 @@ static int dw_mipi_dsi_stm_probe(struct platform_device *pdev) goto err_dsi_probe; } + /* set lane capabilities according to hw version */ + dsi->lane_min_kbps = LANE_MIN_KBPS; + dsi->lane_max_kbps = LANE_MAX_KBPS; + if (dsi->hw_version == HWVER_131) { + dsi->lane_min_kbps *= 2; + dsi->lane_max_kbps *= 2; + } + dw_mipi_dsi_stm_plat_data.base = dsi->base; dw_mipi_dsi_stm_plat_data.priv_data = dsi; base-commit: 70704fbf67ddc07ffc81073a3af1f7b2171697eb -- 2.34.1