ENGR00162701 mxc_vout: fix potential deadlock of fb_blank
add FBINFO_MISC_USEREVENT flag before calling fb_blank
Signed-off-by: Jason Chen <b02280@freescale.com>
diff --git a/drivers/media/video/mxc/output/mxc_vout.c b/drivers/media/video/mxc/output/mxc_vout.c
index 661487e..c08f2fd 100644
--- a/drivers/media/video/mxc/output/mxc_vout.c
+++ b/drivers/media/video/mxc/output/mxc_vout.c
@@ -1351,7 +1351,9 @@
vout->disp_bufs[i] = fbi->fix.smem_start + i * display_buf_size;
console_lock();
+ fbi->flags |= FBINFO_MISC_USEREVENT;
ret = fb_blank(fbi, FB_BLANK_UNBLANK);
+ fbi->flags &= ~FBINFO_MISC_USEREVENT;
console_unlock();
return ret;
@@ -1363,7 +1365,9 @@
struct mxcfb_pos pos;
console_lock();
+ fbi->flags |= FBINFO_MISC_USEREVENT;
fb_blank(fbi, FB_BLANK_POWERDOWN);
+ fbi->flags &= ~FBINFO_MISC_USEREVENT;
console_unlock();
/* restore pos to 0,0 avoid fb pan display hang? */
@@ -1380,7 +1384,9 @@
if (get_ipu_channel(fbi) == MEM_BG_SYNC) {
console_lock();
+ fbi->flags |= FBINFO_MISC_USEREVENT;
fb_blank(fbi, FB_BLANK_UNBLANK);
+ fbi->flags &= ~FBINFO_MISC_USEREVENT;
console_unlock();
}
}