| Message ID | 20191125093151.22706-1-heiko@sntech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,RESEND] drm/bridge/synopsys: dsi: driver-specific configuration of phy timings | expand |
Hi, On 25/11/2019 10:31, Heiko Stuebner wrote: > From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> > > 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 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 > > Suggested-by: Philippe Cornu <philippe.cornu@st.com> > Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> > Reviewed-by: Philippe Cornu <philippe.cornu@st.com> > Tested-by: Yannick Fertre <yannick.fertre@st.com> > --- > Resend because I seem to have forgotten to Cc mailing lists > > 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(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > index c214c6389918..b8b112278690 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > @@ -727,7 +727,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 > @@ -740,16 +748,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) > @@ -999,7 +1011,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); > } > diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig > index 6f4222f8beeb..4b7a276994ce 100644 > --- a/drivers/gpu/drm/rockchip/Kconfig > +++ b/drivers/gpu/drm/rockchip/Kconfig > @@ -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 > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > index 13858f377a0c..f04b5064974d 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > @@ -606,11 +606,89 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, > return 0; > } > > +struct hstt { > + unsigned int maxfreq; > + struct dw_mipi_dsi_dphy_timing timing; > +}; > + > +#define HSTT(_maxfreq, _c_lp2hs, _c_hs2lp, _d_lp2hs, _d_hs2lp) \ > +{ \ > + .maxfreq = _maxfreq, \ > + .timing = { \ > + .clk_lp2hs = _c_lp2hs, \ > + .clk_hs2lp = _c_hs2lp, \ > + .data_lp2hs = _d_lp2hs, \ > + .data_hs2lp = _d_hs2lp, \ > + } \ > +} > + > +/* Table A-3 High-Speed Transition Times */ > +struct hstt hstt_table[] = { > + HSTT( 90, 32, 20, 26, 13), > + HSTT( 100, 35, 23, 28, 14), > + HSTT( 110, 32, 22, 26, 13), > + HSTT( 130, 31, 20, 27, 13), > + HSTT( 140, 33, 22, 26, 14), > + HSTT( 150, 33, 21, 26, 14), > + HSTT( 170, 32, 20, 27, 13), > + HSTT( 180, 36, 23, 30, 15), > + HSTT( 200, 40, 22, 33, 15), > + HSTT( 220, 40, 22, 33, 15), > + HSTT( 240, 44, 24, 36, 16), > + HSTT( 250, 48, 24, 38, 17), > + HSTT( 270, 48, 24, 38, 17), > + HSTT( 300, 50, 27, 41, 18), > + HSTT( 330, 56, 28, 45, 18), > + HSTT( 360, 59, 28, 48, 19), > + HSTT( 400, 61, 30, 50, 20), > + HSTT( 450, 67, 31, 55, 21), > + HSTT( 500, 73, 31, 59, 22), > + HSTT( 550, 79, 36, 63, 24), > + HSTT( 600, 83, 37, 68, 25), > + HSTT( 650, 90, 38, 73, 27), > + HSTT( 700, 95, 40, 77, 28), > + HSTT( 750, 102, 40, 84, 28), > + HSTT( 800, 106, 42, 87, 30), > + HSTT( 850, 113, 44, 93, 31), > + HSTT( 900, 118, 47, 98, 32), > + HSTT( 950, 124, 47, 102, 34), > + HSTT(1000, 130, 49, 107, 35), > + HSTT(1050, 135, 51, 111, 37), > + HSTT(1100, 139, 51, 114, 38), > + HSTT(1150, 146, 54, 120, 40), > + HSTT(1200, 153, 57, 125, 41), > + HSTT(1250, 158, 58, 130, 42), > + HSTT(1300, 163, 58, 135, 44), > + HSTT(1350, 168, 60, 140, 45), > + HSTT(1400, 172, 64, 144, 47), > + HSTT(1450, 176, 65, 148, 48), > + HSTT(1500, 181, 66, 153, 50) > +}; > + > +static int > +dw_mipi_dsi_phy_get_timing(void *priv_data, unsigned int lane_mbps, > + struct dw_mipi_dsi_dphy_timing *timing) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(hstt_table); i++) > + if (lane_mbps < hstt_table[i].maxfreq) > + break; > + > + if (i == ARRAY_SIZE(hstt_table)) > + i--; > + > + *timing = hstt_table[i].timing; > + > + return 0; > +} > + > static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_rockchip_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 void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi, > diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > index a03a642c147c..5c97e09bbfa0 100644 > --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > @@ -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, It doesn't apply at all on drm-misc-next due to missing "dw-mipi-dsi support for Rockchip px30" serie. Neil > .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 = { > diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h > index 94cc64a342e1..b0e390b3288e 100644 > --- a/include/drm/bridge/dw_mipi_dsi.h > +++ b/include/drm/bridge/dw_mipi_dsi.h > @@ -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 { >
Am Montag, 25. November 2019, 11:09:39 CET schrieb Neil Armstrong: > Hi, > > On 25/11/2019 10:31, Heiko Stuebner wrote: > > From: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> > > > > 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 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 > > > > Suggested-by: Philippe Cornu <philippe.cornu@st.com> > > Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com> > > Reviewed-by: Philippe Cornu <philippe.cornu@st.com> > > Tested-by: Yannick Fertre <yannick.fertre@st.com> > > --- > > Resend because I seem to have forgotten to Cc mailing lists > > > > 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(-) > > > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > > index c214c6389918..b8b112278690 100644 > > --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > > +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c > > @@ -727,7 +727,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 > > @@ -740,16 +748,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) > > @@ -999,7 +1011,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); > > } > > diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig > > index 6f4222f8beeb..4b7a276994ce 100644 > > --- a/drivers/gpu/drm/rockchip/Kconfig > > +++ b/drivers/gpu/drm/rockchip/Kconfig > > @@ -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 > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > index 13858f377a0c..f04b5064974d 100644 > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > @@ -606,11 +606,89 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, > > return 0; > > } > > > > +struct hstt { > > + unsigned int maxfreq; > > + struct dw_mipi_dsi_dphy_timing timing; > > +}; > > + > > +#define HSTT(_maxfreq, _c_lp2hs, _c_hs2lp, _d_lp2hs, _d_hs2lp) \ > > +{ \ > > + .maxfreq = _maxfreq, \ > > + .timing = { \ > > + .clk_lp2hs = _c_lp2hs, \ > > + .clk_hs2lp = _c_hs2lp, \ > > + .data_lp2hs = _d_lp2hs, \ > > + .data_hs2lp = _d_hs2lp, \ > > + } \ > > +} > > + > > +/* Table A-3 High-Speed Transition Times */ > > +struct hstt hstt_table[] = { > > + HSTT( 90, 32, 20, 26, 13), > > + HSTT( 100, 35, 23, 28, 14), > > + HSTT( 110, 32, 22, 26, 13), > > + HSTT( 130, 31, 20, 27, 13), > > + HSTT( 140, 33, 22, 26, 14), > > + HSTT( 150, 33, 21, 26, 14), > > + HSTT( 170, 32, 20, 27, 13), > > + HSTT( 180, 36, 23, 30, 15), > > + HSTT( 200, 40, 22, 33, 15), > > + HSTT( 220, 40, 22, 33, 15), > > + HSTT( 240, 44, 24, 36, 16), > > + HSTT( 250, 48, 24, 38, 17), > > + HSTT( 270, 48, 24, 38, 17), > > + HSTT( 300, 50, 27, 41, 18), > > + HSTT( 330, 56, 28, 45, 18), > > + HSTT( 360, 59, 28, 48, 19), > > + HSTT( 400, 61, 30, 50, 20), > > + HSTT( 450, 67, 31, 55, 21), > > + HSTT( 500, 73, 31, 59, 22), > > + HSTT( 550, 79, 36, 63, 24), > > + HSTT( 600, 83, 37, 68, 25), > > + HSTT( 650, 90, 38, 73, 27), > > + HSTT( 700, 95, 40, 77, 28), > > + HSTT( 750, 102, 40, 84, 28), > > + HSTT( 800, 106, 42, 87, 30), > > + HSTT( 850, 113, 44, 93, 31), > > + HSTT( 900, 118, 47, 98, 32), > > + HSTT( 950, 124, 47, 102, 34), > > + HSTT(1000, 130, 49, 107, 35), > > + HSTT(1050, 135, 51, 111, 37), > > + HSTT(1100, 139, 51, 114, 38), > > + HSTT(1150, 146, 54, 120, 40), > > + HSTT(1200, 153, 57, 125, 41), > > + HSTT(1250, 158, 58, 130, 42), > > + HSTT(1300, 163, 58, 135, 44), > > + HSTT(1350, 168, 60, 140, 45), > > + HSTT(1400, 172, 64, 144, 47), > > + HSTT(1450, 176, 65, 148, 48), > > + HSTT(1500, 181, 66, 153, 50) > > +}; > > + > > +static int > > +dw_mipi_dsi_phy_get_timing(void *priv_data, unsigned int lane_mbps, > > + struct dw_mipi_dsi_dphy_timing *timing) > > +{ > > + int i; > > + > > + for (i = 0; i < ARRAY_SIZE(hstt_table); i++) > > + if (lane_mbps < hstt_table[i].maxfreq) > > + break; > > + > > + if (i == ARRAY_SIZE(hstt_table)) > > + i--; > > + > > + *timing = hstt_table[i].timing; > > + > > + return 0; > > +} > > + > > static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_rockchip_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 void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi, > > diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > > index a03a642c147c..5c97e09bbfa0 100644 > > --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > > +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c > > @@ -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, > > It doesn't apply at all on drm-misc-next due to missing "dw-mipi-dsi support for Rockchip px30" serie. fun with in-flight patches I guess ... sorry about that. I've prepared a v4, with correct ordering and re-did another compile-check on drm-misc-next for good measure. Heiko
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c index c214c6389918..b8b112278690 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c @@ -727,7 +727,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 @@ -740,16 +748,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) @@ -999,7 +1011,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); } diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig index 6f4222f8beeb..4b7a276994ce 100644 --- a/drivers/gpu/drm/rockchip/Kconfig +++ b/drivers/gpu/drm/rockchip/Kconfig @@ -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 diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index 13858f377a0c..f04b5064974d 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c @@ -606,11 +606,89 @@ dw_mipi_dsi_get_lane_mbps(void *priv_data, const struct drm_display_mode *mode, return 0; } +struct hstt { + unsigned int maxfreq; + struct dw_mipi_dsi_dphy_timing timing; +}; + +#define HSTT(_maxfreq, _c_lp2hs, _c_hs2lp, _d_lp2hs, _d_hs2lp) \ +{ \ + .maxfreq = _maxfreq, \ + .timing = { \ + .clk_lp2hs = _c_lp2hs, \ + .clk_hs2lp = _c_hs2lp, \ + .data_lp2hs = _d_lp2hs, \ + .data_hs2lp = _d_hs2lp, \ + } \ +} + +/* Table A-3 High-Speed Transition Times */ +struct hstt hstt_table[] = { + HSTT( 90, 32, 20, 26, 13), + HSTT( 100, 35, 23, 28, 14), + HSTT( 110, 32, 22, 26, 13), + HSTT( 130, 31, 20, 27, 13), + HSTT( 140, 33, 22, 26, 14), + HSTT( 150, 33, 21, 26, 14), + HSTT( 170, 32, 20, 27, 13), + HSTT( 180, 36, 23, 30, 15), + HSTT( 200, 40, 22, 33, 15), + HSTT( 220, 40, 22, 33, 15), + HSTT( 240, 44, 24, 36, 16), + HSTT( 250, 48, 24, 38, 17), + HSTT( 270, 48, 24, 38, 17), + HSTT( 300, 50, 27, 41, 18), + HSTT( 330, 56, 28, 45, 18), + HSTT( 360, 59, 28, 48, 19), + HSTT( 400, 61, 30, 50, 20), + HSTT( 450, 67, 31, 55, 21), + HSTT( 500, 73, 31, 59, 22), + HSTT( 550, 79, 36, 63, 24), + HSTT( 600, 83, 37, 68, 25), + HSTT( 650, 90, 38, 73, 27), + HSTT( 700, 95, 40, 77, 28), + HSTT( 750, 102, 40, 84, 28), + HSTT( 800, 106, 42, 87, 30), + HSTT( 850, 113, 44, 93, 31), + HSTT( 900, 118, 47, 98, 32), + HSTT( 950, 124, 47, 102, 34), + HSTT(1000, 130, 49, 107, 35), + HSTT(1050, 135, 51, 111, 37), + HSTT(1100, 139, 51, 114, 38), + HSTT(1150, 146, 54, 120, 40), + HSTT(1200, 153, 57, 125, 41), + HSTT(1250, 158, 58, 130, 42), + HSTT(1300, 163, 58, 135, 44), + HSTT(1350, 168, 60, 140, 45), + HSTT(1400, 172, 64, 144, 47), + HSTT(1450, 176, 65, 148, 48), + HSTT(1500, 181, 66, 153, 50) +}; + +static int +dw_mipi_dsi_phy_get_timing(void *priv_data, unsigned int lane_mbps, + struct dw_mipi_dsi_dphy_timing *timing) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(hstt_table); i++) + if (lane_mbps < hstt_table[i].maxfreq) + break; + + if (i == ARRAY_SIZE(hstt_table)) + i--; + + *timing = hstt_table[i].timing; + + return 0; +} + static const struct dw_mipi_dsi_phy_ops dw_mipi_dsi_rockchip_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 void dw_mipi_dsi_rockchip_config(struct dw_mipi_dsi_rockchip *dsi, diff --git a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c index a03a642c147c..5c97e09bbfa0 100644 --- a/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c +++ b/drivers/gpu/drm/stm/dw_mipi_dsi-stm.c @@ -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 = { diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h index 94cc64a342e1..b0e390b3288e 100644 --- a/include/drm/bridge/dw_mipi_dsi.h +++ b/include/drm/bridge/dw_mipi_dsi.h @@ -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 {