diff options
| author | Liu Ying <b17645@freescale.com> | 2010-01-28 10:19:23 -0500 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-24 11:50:05 +0200 |
| commit | 0477146bb0dd1b6ef18b020f5594e596cfcb16c1 (patch) | |
| tree | ea85194dd88a6d5457894c0533dc046b0fc50ce5 /drivers/media | |
| parent | d2dc0eaa4229261d308a1e218cd0ac31a3060d80 (diff) | |
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 <b17645@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/mxc/capture/ipu_prp_vf_sdc.c | 8 |
1 files 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 75574e94d272..9994012a3176 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; |