diff options
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index cf0f319e7eaf..dca29923119b 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -3986,18 +3986,13 @@ static int __ioctl_wait_idle(struct msm_fb_data_type *mfd, u32 cmd) ((cmd == MSMFB_OVERLAY_PREPARE) || (cmd == MSMFB_BUFFER_SYNC) || (cmd == MSMFB_OVERLAY_PLAY) || + (cmd == MSMFB_CURSOR) || + (cmd == MSMFB_METADATA_GET) || + (cmd == MSMFB_METADATA_SET) || + (cmd == MSMFB_OVERLAY_GET) || (cmd == MSMFB_OVERLAY_UNSET) || (cmd == MSMFB_OVERLAY_SET))) { ret = mdss_fb_wait_for_kickoff(mfd); - } else if ((cmd != MSMFB_VSYNC_CTRL) && - (cmd != MSMFB_OVERLAY_VSYNC_CTRL) && - (cmd != MSMFB_ASYNC_BLIT) && - (cmd != MSMFB_BLIT) && - (cmd != MSMFB_DISPLAY_COMMIT) && - (cmd != MSMFB_NOTIFY_UPDATE) && - (cmd != MSMFB_ATOMIC_COMMIT) && - (cmd != MSMFB_OVERLAY_PREPARE)) { - ret = mdss_fb_pan_idle(mfd); } if (ret && (ret != -ESHUTDOWN)) |