From e603df439ef6294d70bdfaedecd7a4ea9088ba75 Mon Sep 17 00:00:00 2001 From: Liu Ying Date: Thu, 28 Jan 2010 10:19:23 -0500 Subject: [PATCH] ENGR00120500 V4L2 overlay:Unblank overlay fb before enable PRP_VF channel This change makes us get rid of DIx_SYNC_DISP_ERR. The error sometimes causes the backgound framebuffer reinitialized automatically, even if we preview captured video on overlay framebuffer. Signed-off-by: Liu Ying --- drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c b/drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c index 75574e94d27..9994012a317 100644 --- a/drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c +++ b/drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c @@ -96,6 +96,10 @@ static int prpvf_start(void *private) ipu_disp_set_window_pos(MEM_FG_SYNC, cam->win.w.left, cam->win.w.top); + acquire_console_sem(); + fb_blank(fbi, FB_BLANK_UNBLANK); + release_console_sem(); + memset(&vf, 0, sizeof(ipu_channel_params_t)); ipu_csi_get_window_size(&vf.csi_prp_vf_mem.in_width, &vf.csi_prp_vf_mem.in_height, cam->csi); @@ -253,10 +257,6 @@ static int prpvf_start(void *private) ipu_select_buffer(CSI_PRP_VF_MEM, IPU_OUTPUT_BUFFER, 1); } - acquire_console_sem(); - fb_blank(fbi, FB_BLANK_UNBLANK); - release_console_sem(); - cam->overlay_active = true; return err;