ENGR00182271-1 V4L2 capture: Add IPU2 overlay support

Add 3 overlay output item for IPU2: DISP4 BG, DISP4 BG - DI1,
DISP4 FG.

Signed-off-by: Yuxi Sun <b36102@freescale.com>

diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
index 7f3b869b161006fdd0fc4eefdaa807aa50e532a8..e8643ab72007c78bf7ce2474b7f2724d75780961 100644 (file)
--- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
@@ -47,7 +47,7 @@
 static int video_nr = -1;
 
 /*! This data is used for the output to the display. */
-#define MXC_V4L2_CAPTURE_NUM_OUTPUTS   3
+#define MXC_V4L2_CAPTURE_NUM_OUTPUTS   6
 #define MXC_V4L2_CAPTURE_NUM_INPUTS    2
 static struct v4l2_output mxc_capture_outputs[MXC_V4L2_CAPTURE_NUM_OUTPUTS] = {
        {
@@ -74,6 +74,30 @@ static struct v4l2_output mxc_capture_outputs[MXC_V4L2_CAPTURE_NUM_OUTPUTS] = {
         .modulator = 0,
         .std = V4L2_STD_UNKNOWN,
         },
+       {
+        .index = 3,
+        .name = "DISP4 BG",
+        .type = V4L2_OUTPUT_TYPE_ANALOG,
+        .audioset = 0,
+        .modulator = 0,
+        .std = V4L2_STD_UNKNOWN,
+        },
+       {
+        .index = 4,
+        .name = "DISP4 BG - DI1",
+        .type = V4L2_OUTPUT_TYPE_ANALOG,
+        .audioset = 0,
+        .modulator = 0,
+        .std = V4L2_STD_UNKNOWN,
+        },
+       {
+        .index = 5,
+        .name = "DISP4 FG",
+        .type = V4L2_OUTPUT_TYPE_ANALOG,
+        .audioset = 0,
+        .modulator = 0,
+        .std = V4L2_STD_UNKNOWN,
+        },
 };
 
 static struct v4l2_input mxc_capture_inputs[MXC_V4L2_CAPTURE_NUM_INPUTS] = {
@@ -492,7 +516,7 @@ static int verify_preview(cam_data *cam, struct v4l2_window *win)
        int *width, *height;
        unsigned int ipu_ch = CHAN_NONE;
        struct fb_info *bg_fbi = NULL, *fbi = NULL;
-       bool foregound_fb;
+       bool foregound_fb = false;
        mm_segment_t old_fs;
 
        pr_debug("In MVC: verify_preview\n");
@@ -505,7 +529,8 @@ static int verify_preview(cam_data *cam, struct v4l2_window *win)
                }
 
                /* Which DI supports 2 layers? */
-               if (strncmp(fbi->fix.id, "DISP3 BG", 8) == 0) {
+               if (((strncmp(fbi->fix.id, "DISP3 BG", 8) == 0) && (cam->output < 3)) ||
+                       ((strncmp(fbi->fix.id, "DISP4 BG", 8) == 0) && (cam->output >= 3))) {
                        if (fbi->fbops->fb_ioctl) {
                                old_fs = get_fs();
                                set_fs(KERNEL_DS);
@@ -522,7 +547,8 @@ static int verify_preview(cam_data *cam, struct v4l2_window *win)
                /* Found the frame buffer to preview on. */
                if (strcmp(fbi->fix.id,
                            mxc_capture_outputs[cam->output].name) == 0) {
-                       if (strcmp(fbi->fix.id, "DISP3 FG") == 0)
+                       if (((strcmp(fbi->fix.id, "DISP3 FG") == 0) && (cam->output < 3)) ||
+                               ((strcmp(fbi->fix.id, "DISP4 FG") == 0) && (cam->output >= 3)))
                                foregound_fb = true;
 
                        cam->overlay_fb = fbi;