drm/msm/dsi: Implement reset correctly
PATCH v2 1/1 drm/msm/dsi: Implement reset correctly
On msm8998, vblank timeouts are observed because the DSI controller is not reset properly, which ends up stalling the MDP. This is because the reset logic is not correct per the hardware documentation.
The documentation states that after asserting reset, software should wait some time (no indication of how long), or poll the status register until it returns 0 before deasserting reset.
wmb() is insufficient for this purpose since it just ensures ordering, not timing between writes. Since asserting and deasserting reset occurs on the same register, ordering is already guaranteed by the architecture, making the wmb extraneous.
Since we would define a timeout for polling the status register to avoid a possible infinite loop, lets just use a static delay of 20 ms, since 16.666 ms is the time available to process one frame at 60 fps.
---
v2:
-make a DEFINE for the delay
drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -2
@@ -26,6 +26,8 @@#include "dsi_cfg.h" #include "msm_kms.h" +#define RESET_DELAY 20 +static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {u32 ver;
@@ -986,7 +988,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host)wmb ();/* clocks need to be enabled before reset */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (RESET_DELAY );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 ); }
@@ -1396,7 +1398,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)/* dsi controller can only be reset while clocks are running */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (RESET_DELAY );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 );wmb ();/* controller out of reset */ dsi_write (msm_host,REG_DSI_CTRL , data0);
Signature · 1 line
2.17.1
Quoted 13 lines · Jeffrey Hugo
On msm8998, vblank timeouts are observed because the DSI controller is not reset properly, which ends up stalling the MDP. This is because the reset logic is not correct per the hardware documentation.
The documentation states that after asserting reset, software should wait some time (no indication of how long), or poll the status register until it returns 0 before deasserting reset.
wmb()is insufficient for this purpose since it just ensures ordering, not timing between writes. Since asserting and deasserting reset occurs on the same register, ordering is already guaranteed by the architecture, making the wmb extraneous.
Quoted 6 lines
Since we would define a timeout for polling the status register to avoid a possible infinite loop, lets just use a static delay of 20 ms, since 16.666 ms is the time available to process one frame at 60 fps.
Fixes a689554ba6ed (drm/msm: Initial add DSI connector support)Signed-off-by Jeffrey Hugo <[email protected]>
Pushed to drm-misc-fixes for 5.4
Thanks!
Sean
Quoted 43 lines
Reviewed-by Sean Paul <[email protected]>---
v2:
(quoted diff) +0
-1-make a DEFINE for the delay drivers/gpu/drm/msm/dsi/dsi_host.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/dsi/dsi_host.c +4
-2@@ -26,6 +26,8 @@#include "dsi_cfg.h" #include "msm_kms.h" +#define RESET_DELAY 20 +static int dsi_get_version (const void __iomem *base,u32 *major,u32 *minor) {u32 ver;@@ -986,7 +988,7 @@ static void dsi_sw_reset(struct msm_dsi_host *msm_host)wmb ();/* clocks need to be enabled before reset */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (RESET_DELAY );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 ); }@@ -1396,7 +1398,7 @@ static void dsi_sw_reset_restore(struct msm_dsi_host *msm_host)/* dsi controller can only be reset while clocks are running */ dsi_write (msm_host,REG_DSI_RESET ,1 ); -wmb ();/* make sure reset happen */ +msleep (RESET_DELAY );/* make sure reset happen */ dsi_write (msm_host,REG_DSI_RESET ,0 );wmb ();/* controller out of reset */ dsi_write (msm_host,REG_DSI_CTRL , data0);Signature · 1 line
2.17.1
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno