Skip to content

Commit 2f73f89

Browse files
committed
drm/bridge: cdns-dsi: Tune adjusted_mode->clock according to dsi needs
The driver currently expects the pixel clock and the HS clock to be compatible, but the DPHY PLL doesn't give very finely grained rates. This often leads to the situation where the pipeline just fails, as the resulting HS clock is just too off. We could change the driver to do a better job on adjusting the DSI blanking values, hopefully getting a working pipeline even if the pclk and HS clocks are not exactly compatible. But that is a bigger work. What we can do easily is to see in .atomic_check() what HS clock rate we can get, based on the pixel clock rate, and then convert the HS clock rate back to pixel clock rate and ask that rate from the crtc. If the crtc has a good PLL (which is the case for TI K3 SoCs), this will fix any issues wrt. the clock rates. If the crtc cannot provide the requested clock, well, we're no worse off with this patch than what we have at the moment. Tested-by: Parth Pancholi <parth.pancholi@toradex.com> Tested-by: Jayesh Choudhary <j-choudhary@ti.com> Reviewed-by: Devarsh Thakkar <devarsht@ti.com> Link: https://lore.kernel.org/r/20250723-cdns-dsi-impro-v5-14-e61cc06074c2@ideasonboard.com Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
1 parent ca3e6fc commit 2f73f89

1 file changed

Lines changed: 37 additions & 0 deletions

File tree

drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,28 @@ static u32 *cdns_dsi_bridge_get_input_bus_fmts(struct drm_bridge *bridge,
915915
return input_fmts;
916916
}
917917

918+
static long cdns_dsi_round_pclk(struct cdns_dsi *dsi, unsigned long pclk)
919+
{
920+
struct cdns_dsi_output *output = &dsi->output;
921+
unsigned int nlanes = output->dev->lanes;
922+
union phy_configure_opts phy_opts = { 0 };
923+
u32 bitspp;
924+
int ret;
925+
926+
bitspp = mipi_dsi_pixel_format_to_bpp(output->dev->format);
927+
928+
ret = phy_mipi_dphy_get_default_config(pclk, bitspp, nlanes,
929+
&phy_opts.mipi_dphy);
930+
if (ret)
931+
return ret;
932+
933+
ret = phy_validate(dsi->dphy, PHY_MODE_MIPI_DPHY, 0, &phy_opts);
934+
if (ret)
935+
return ret;
936+
937+
return div_u64((u64)phy_opts.mipi_dphy.hs_clk_rate * nlanes, bitspp);
938+
}
939+
918940
static int cdns_dsi_bridge_atomic_check(struct drm_bridge *bridge,
919941
struct drm_bridge_state *bridge_state,
920942
struct drm_crtc_state *crtc_state,
@@ -926,11 +948,26 @@ static int cdns_dsi_bridge_atomic_check(struct drm_bridge *bridge,
926948
struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;
927949
struct cdns_dsi_cfg *dsi_cfg = &dsi_state->dsi_cfg;
928950
struct videomode vm;
951+
long pclk;
929952

930953
/* cdns-dsi requires negative syncs */
931954
adjusted_mode->flags &= ~(DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);
932955
adjusted_mode->flags |= DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC;
933956

957+
/*
958+
* The DPHY PLL has quite a coarsely grained clock rate options. See
959+
* what hsclk rate we can achieve based on the pixel clock, convert it
960+
* back to pixel clock, set that to the adjusted_mode->clock. This is
961+
* all in hopes that the CRTC will be able to provide us the requested
962+
* clock, as otherwise the DPI and DSI clocks will be out of sync.
963+
*/
964+
965+
pclk = cdns_dsi_round_pclk(dsi, adjusted_mode->clock * 1000);
966+
if (pclk < 0)
967+
return (int)pclk;
968+
969+
adjusted_mode->clock = pclk / 1000;
970+
934971
drm_display_mode_to_videomode(adjusted_mode, &vm);
935972

936973
return cdns_dsi_check_conf(dsi, &vm, dsi_cfg);

0 commit comments

Comments
 (0)