diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-24 12:12:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-24 12:12:56 -0700 |
| commit | ba4b8bd054e245bf196512e79b0a7b4bcdefd1cd (patch) | |
| tree | ef71ff42a43dacb6d0c30233e68564062de74386 | |
| parent | b606e151e5596825f714d4c9e62bd490edcad960 (diff) | |
| parent | 04ee7723d77f8d0f497dbf87e6dae9c174d75754 (diff) | |
Merge "msm: mdss: ensure proper state transition during ULPS exit"
| -rw-r--r-- | drivers/video/fbdev/msm/msm_mdss_io_8974.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/msm_mdss_io_8974.c b/drivers/video/fbdev/msm/msm_mdss_io_8974.c index 0e0d2621496e..3efa2c4cb913 100644 --- a/drivers/video/fbdev/msm/msm_mdss_io_8974.c +++ b/drivers/video/fbdev/msm/msm_mdss_io_8974.c @@ -1863,8 +1863,10 @@ static int mdss_dsi_ulps_config_default(struct mdss_dsi_ctrl_pdata *ctrl, * to be in stop state. */ MIPI_OUTP(ctrl->ctrl_base + 0x0AC, active_lanes << 16); + wmb(); /* ensure lanes are put to stop state */ MIPI_OUTP(ctrl->ctrl_base + 0x0AC, 0x0); + wmb(); /* ensure lanes are in proper state */ lane_status = MIPI_INP(ctrl->ctrl_base + 0xA8); } |