Merge "msm: mdss: Don't call pan_idle for MSMFB_OVERLAY_PREPARE ioctl" (35f923cc) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_fb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2353,7 +2353,8 @@ int mdss_fb_do_ioctl(struct fb_info *info, unsigned int cmd,
		mdss_fb_power_setting_idle(mfd);
		if ((cmd != MSMFB_VSYNC_CTRL) && (cmd != MSMFB_OVERLAY_VSYNC_CTRL) &&
		(cmd != MSMFB_ASYNC_BLIT) && (cmd != MSMFB_BLIT) &&
		(cmd != MSMFB_NOTIFY_UPDATE)) {
		(cmd != MSMFB_NOTIFY_UPDATE) &&
		(cmd != MSMFB_OVERLAY_PREPARE)) {
		ret = mdss_fb_pan_idle(mfd);
		if (ret) {
		pr_debug("Shutdown pending. Aborting operation %x\n",