diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-19 23:28:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-19 23:28:11 -0700 |
| commit | 6fa5e2492296c7e179d834f24108c311bfd5eaf8 (patch) | |
| tree | 055f7c56eb17793ce1d7382a323a99dadd2dd0e2 | |
| parent | 95185399396b38baf5e11c5157f2b5dedc3dc17e (diff) | |
| parent | fdc9315942182ee25cd1f8256485143b2f9ba137 (diff) | |
Merge "msm: mdss: wait for kickoff before executing mode switch changes"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index e0f1a37ac84e..50c7015c6731 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -4664,6 +4664,9 @@ static int mdss_fb_mode_switch(struct msm_fb_data_type *mfd, u32 mode) if (!mfd || !mfd->panel_info) return -EINVAL; + /* make sure that we are idle while switching */ + mdss_fb_wait_for_kickoff(mfd); + pinfo = mfd->panel_info; if (pinfo->mipi.dms_mode == DYNAMIC_MODE_SWITCH_SUSPEND_RESUME) { ret = mdss_fb_blanking_mode_switch(mfd, mode); |