drm/bridge/synopsys: dsi: driver-specific configuration of phy timings
Subsystems (7)
Heiko Stuebner
maintainerPATCH v4 1/1 drm/bridge/synopsys: dsi: driver-specific configuration of phy timings
From: Heiko Stuebner <[email protected]>
The timing values for dw-dsi are often dependent on the used display and according to Philippe Cornu will most likely also depend on the used phy technology in the soc-specific implementation.
To solve this and allow specific implementations to define them as needed add a new get_timing callback to phy_ops and call this from the dphy_timing function to retrieve the necessary values for the specific mode.
Right now this handles the hs2lp + lp2hs where Rockchip SoCs need handling according to the phy speed, while STM seems to be ok with static values.
changes in v4:
- rebase to make it directly fit on top of drm-misc-next after all
changes in v3:
- check existence of phy_ops->get_timing in __dw_mipi_dsi_probe()
- emit actual error when get_timing() call fails
- add tags from Philippe and Yannick
changes in v2:
- add driver-specific handling, don't force all bridge users to use the same timings, as suggested by Philippe
--- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 27 +++++-- drivers/gpu/drm/rockchip/Kconfig | 1 + .../gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 78 +++++++++++++++++++ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 13 ++++ include/drm/bridge/dw_mipi_dsi.h | 9 +++ 5 files changed, 121 insertions(+), 7 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +20 -7
@@ -718,7 +718,15 @@ static void dw_mipi_dsi_vertical_timing_config(struct dw_mipi_dsi *dsi,static void dw_mipi_dsi_dphy_timing_config (struct dw_mipi_dsi *dsi) { +const struct dw_mipi_dsi_phy_ops *phy_ops = dsi->plat_data->phy_ops; +struct dw_mipi_dsi_dphy_timing timing;u32 hw_version; +int ret; + + ret = phy_ops->get_timing (dsi->plat_data->priv_data, + dsi->lane_mbps, &timing); +if (ret) +DRM_DEV_ERROR (dsi->dev,"Retrieving phy timings failed\n" );/* * TODO dw drv improvements
@@ -731,16 +739,20 @@ static void dw_mipi_dsi_dphy_timing_config(struct dw_mipi_dsi *dsi) hw_version =dsi_read (dsi,DSI_VERSION ) &VERSION ;if (hw_version >=HWVER_131 ) { -dsi_write (dsi,DSI_PHY_TMR_CFG ,PHY_HS2LP_TIME_V131 (0x40 ) | -PHY_LP2HS_TIME_V131 (0x40 )); +dsi_write (dsi,DSI_PHY_TMR_CFG , +PHY_HS2LP_TIME_V131 (timing.data_hs2lp) | +PHY_LP2HS_TIME_V131 (timing.data_lp2hs));dsi_write (dsi,DSI_PHY_TMR_RD_CFG ,MAX_RD_TIME_V131 (10000 )); }else { -dsi_write (dsi,DSI_PHY_TMR_CFG ,PHY_HS2LP_TIME (0x40 ) | -PHY_LP2HS_TIME (0x40 ) |MAX_RD_TIME (10000 )); +dsi_write (dsi,DSI_PHY_TMR_CFG , +PHY_HS2LP_TIME (timing.data_hs2lp) | +PHY_LP2HS_TIME (timing.data_lp2hs) | +MAX_RD_TIME (10000 )); } -dsi_write (dsi,DSI_PHY_TMR_LPCLK_CFG ,PHY_CLKHS2LP_TIME (0x40 ) - |PHY_CLKLP2HS_TIME (0x40 )); +dsi_write (dsi,DSI_PHY_TMR_LPCLK_CFG , +PHY_CLKHS2LP_TIME (timing.clk_hs2lp) | +PHY_CLKLP2HS_TIME (timing.clk_lp2hs)); }static void dw_mipi_dsi_dphy_interface_config (struct dw_mipi_dsi *dsi)
@@ -990,7 +1002,8 @@ __dw_mipi_dsi_probe(struct platform_device *pdev, dsi->dev = dev; dsi->plat_data = plat_data; -if (!plat_data->phy_ops->init || !plat_data->phy_ops->get_lane_mbps) { +if (!plat_data->phy_ops->init || !plat_data->phy_ops->get_lane_mbps || + !plat_data->phy_ops->get_timing) {DRM_ERROR ("Phy not properly configured\n" );return ERR_PTR (-ENODEV ); }
drivers/gpu/drm/rockchip/Kconfig +1 -0
@@ -46,6 +46,7 @@ config ROCKCHIP_DW_HDMI config ROCKCHIP_DW_MIPI_DSI bool "Rockchip specific extensions for Synopsys DW MIPI DSI" + select GENERIC_PHY_MIPI_DPHY help This selects support for Rockchip SoC specific extensions for the Synopsys DesignWare HDMI driver. If you want to
drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +78 -0
87 lines not on this page · raw message
drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +13 -0
@@ -306,11 +306,24 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode,return 0 ; } +static int +dw_mipi_dsi_phy_get_timing (void *priv_data,unsigned int lane_mbps, +struct dw_mipi_dsi_dphy_timing *timing) +{ + timing->clk_hs2lp =0x40 ; + timing->clk_lp2hs =0x40 ; + timing->data_hs2lp =0x40 ; + timing->data_lp2hs =0x40 ; + +return 0 ; +} +static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_stm_phy_ops = { .init = dw_mipi_dsi_phy_init, .power_on = dw_mipi_dsi_phy_power_on, .power_off = dw_mipi_dsi_phy_power_off, .get_lane_mbps = dw_mipi_dsi_get_lane_mbps, + .get_timing = dw_mipi_dsi_phy_get_timing, };static struct dw_mipi_dsi_plat_data dw_mipi_dsi_stm_plat_data = {
include/drm/bridge/dw_mipi_dsi.h +9 -0
@@ -19,6 +19,13 @@ struct dw_mipi_dsi;struct mipi_dsi_device ;struct platform_device ; +struct dw_mipi_dsi_dphy_timing { +u16 data_hs2lp; +u16 data_lp2hs; +u16 clk_hs2lp; +u16 clk_lp2hs; +}; +struct dw_mipi_dsi_phy_ops {int (*init)(void *priv_data);void (*power_on)(void *priv_data);
@@ -27,6 +34,8 @@ struct dw_mipi_dsi_phy_ops {const struct drm_display_mode *mode, unsigned long mode_flags, u32 lanes, u32 format, unsigned int *lane_mbps); +int (*get_timing)(void *priv_data,unsigned int lane_mbps, +struct dw_mipi_dsi_dphy_timing *timing); };struct dw_mipi_dsi_host_ops {
Signature · 6 lines
2.24.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel