drm/bridge/synopsys: dsi: Add 1.31 version support
Subsystems (4)
PATCH v2 1/1 drm/bridge/synopsys: dsi: Add 1.31 version support
Add support for the Synopsys DesignWare MIPI DSI version 1.31 Two registers need to be updated/added for supporting 1.31:
* PHY_TMR_CFG 0x9c (updated)
1.30 [31:24] phy_hs2lp_time
[23:16] phy_lp2hs_time
[14: 0] max_rd_time 1.31 [25:16] phy_hs2lp_time
[ 9: 0] phy_lp2hs_time
* PHY_TMR_RD_CFG 0xf4 (new)
1.31 [14: 0] max_rd_time
---
Modified in v2: Simplify the code thanks to comments from Andrzej Hajda & Archit Taneja.
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c +20 -3
@@ -25,7 +25,10 @@#include <drm/bridge/dw_mipi_dsi.h> #include <video/mipi_display.h> +#define HWVER_131 0x31333100/* IP version 1.31 */ +#define DSI_VERSION 0x00 +#define VERSION GENMASK(31, 8)#define DSI_PWR_UP 0x04#define RESET 0
@@ -161,11 +164,12 @@#define PHY_CLKHS2LP_TIME (lbcc) (((lbcc) & 0x3ff) << 16)#define PHY_CLKLP2HS_TIME (lbcc) ((lbcc) & 0x3ff) -/* TODO Next register is slightly different between 1.30 & 1.31 IP version */ #define DSI_PHY_TMR_CFG 0x9c#define PHY_HS2LP_TIME (lbcc) (((lbcc) & 0xff) << 24)#define PHY_LP2HS_TIME (lbcc) (((lbcc) & 0xff) << 16)#define MAX_RD_TIME (lbcc) ((lbcc) & 0x7fff) +#define PHY_HS2LP_TIME_V131 (lbcc) (((lbcc) & 0x3ff) << 16) +#define PHY_LP2HS_TIME_V131 (lbcc) ((lbcc) & 0x3ff)#define DSI_PHY_RSTZ 0xa0#define PHY_DISFORCEPLL 0
@@ -204,7 +208,9 @@#define DSI_INT_ST1 0xc0#define DSI_INT_MSK0 0xc4#define DSI_INT_MSK1 0xc8 +#define DSI_PHY_TMR_RD_CFG 0xf4 +#define MAX_RD_TIME_V131 (lbcc) ((lbcc) & 0x7fff)#define PHY_STATUS_TIMEOUT_US 10000#define CMD_PKT_STATUS_TIMEOUT_US 20000
@@ -623,6 +629,8 @@ 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) { +u32 hw_version; +/* * TODO dw drv improvements * data & clock lane timers should be computed according to panel
@@ -630,8 +638,17 @@ static void dw_mipi_dsi_dphy_timing_config(struct dw_mipi_dsi *dsi)* note: DSI_PHY_TMR_CFG.MAX_RD_TIME should be in line with * DSI_CMD_MODE_CFG.MAX_RD_PKT_SIZE_LP (see CMD_MODE_ALL_LP) */ -dsi_write (dsi,DSI_PHY_TMR_CFG ,PHY_HS2LP_TIME (0x40 ) - |PHY_LP2HS_TIME (0x40 ) |MAX_RD_TIME (10000 )); + + 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_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_LPCLK_CFG ,PHY_CLKHS2LP_TIME (0x40 ) |PHY_CLKLP2HS_TIME (0x40 ));
Signature · 1 line
2.15.1
Quoted 7 lines · Philippe Cornu
Add support for the Synopsys DesignWare MIPI DSI version 1.31 Two registers need to be updated/added for supporting 1.31:
*PHY_TMR_CFG0x9c(updated)
1.30 [31:24]phy_hs2lp_time[23:16] phy_lp2hs_time [14: 0] max_rd_time
Quoted 7 lines
1.31 [25:16]
phy_hs2lp_time[ 9: 0] phy_lp2hs_time*
PHY_TMR_RD_CFG0xf4(new)
1.31 [14: 0]max_rd_timeSigned-off-by Philippe Cornu <[email protected]>
If there will be no objections I will merge it this week.
?--
Regards
Andrzej
Quoted 7 lines · Philippe Cornu
Add support for the Synopsys DesignWare MIPI DSI version 1.31 Two registers need to be updated/added for supporting 1.31:
*PHY_TMR_CFG0x9c(updated)
1.30 [31:24]phy_hs2lp_time[23:16] phy_lp2hs_time [14: 0] max_rd_time
Quoted 7 lines
1.31 [25:16]
phy_hs2lp_time[ 9: 0] phy_lp2hs_time*
PHY_TMR_RD_CFG0xf4(new)
1.31 [14: 0]max_rd_timeSigned-off-by Philippe Cornu <[email protected]>
Queued to drm-misc-next.
--
Regards
Andrzej
Many thanks
Philippe :-)
Quoted 20 lines · Andrzej Hajda
Quoted 7 lines · Philippe Cornu
Add support for the Synopsys DesignWare MIPI DSI version 1.31 Two registers need to be updated/added for supporting 1.31:
*PHY_TMR_CFG0x9c(updated)
1.30 [31:24]phy_hs2lp_time[23:16] phy_lp2hs_time [14: 0] max_rd_timeQuoted 7 lines
1.31 [25:16] phy_hs2lp_time [ 9: 0] phy_lp2hs_time*
PHY_TMR_RD_CFG0xf4(new)
1.31 [14: 0]max_rd_timeSigned-off-by Philippe Cornu <[email protected]>Queued to drm-misc-next.
--
Regards
Andrzej