atomisp : Add support from mt9e013 sensor driver to skip frames.

BZ:8545

This patch will support number of frames to skip at stream start
from mt9e013 sensor driver.

Change-Id: Ib2f324fe67ed081b84705e8269f1df7ac4d35670
Signed-off-by: Bian,Guowei <guowei.bian@intel.com>
Reviewed-on: http://android.intel.com:8080/30251
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Toivonen, Tuukka <tuukka.toivonen@intel.com>
Reviewed-by: Gross, Mark <mark.gross@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/media/video/mt9e013.c b/drivers/media/video/mt9e013.c
index c3b8459..013dc0f 100644 (file)
--- a/drivers/media/video/mt9e013.c
+++ b/drivers/media/video/mt9e013.c
@@ -88,6 +88,7 @@ struct mt9e013_resolution mt9e013_res_preview[] = {
                 .regs =        mt9e013_PREVIEW_30fps   ,
                 .bin_factor_x =        2,
                 .bin_factor_y =        2,
+                .skip_frames = 1,
        },
        {
                 .desc =        "WIDE_PREVIEW_30fps"    ,
@@ -100,6 +101,7 @@ struct mt9e013_resolution mt9e013_res_preview[] = {
                 .regs =        mt9e013_WIDE_PREVIEW_30fps      ,
                 .bin_factor_x =        1,
                 .bin_factor_y =        1,
+                .skip_frames = 1,
        },
 
 };
@@ -118,6 +120,7 @@ struct mt9e013_resolution mt9e013_res_still[] = {
                 .regs =        mt9e013_STILL_2M_15fps  ,
                 .bin_factor_x =        1,
                 .bin_factor_y =        1,
+                .skip_frames = 1,
        },
        {
                 .desc =        "STILL_6M_15fps"        ,
@@ -130,6 +133,7 @@ struct mt9e013_resolution mt9e013_res_still[] = {
                 .regs =        mt9e013_STILL_6M_15fps  ,
                 .bin_factor_x =        0,
                 .bin_factor_y =        0,
+                .skip_frames = 1,
        },
        {
                 .desc =        "STILL_8M_15fps"        ,
@@ -142,6 +146,7 @@ struct mt9e013_resolution mt9e013_res_still[] = {
                 .regs =        mt9e013_STILL_8M_15fps  ,
                 .bin_factor_x =        0,
                 .bin_factor_y =        0,
+                .skip_frames = 1,
        },
 };
 
@@ -159,6 +164,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_QCIF_strong_dvs_30fps   ,
                 .bin_factor_x =        2,
                 .bin_factor_y =        2,
+                .skip_frames = 1,
        },
        {
                 .desc =        "QVGA_strong_dvs_30fps" ,
@@ -171,6 +177,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_QVGA_strong_dvs_30fps   ,
                 .bin_factor_x =        2,
                 .bin_factor_y =        2,
+                .skip_frames = 1,
        },
        {
                 .desc =        "VGA_strong_dvs_30fps"  ,
@@ -183,6 +190,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_VGA_strong_dvs_30fps    ,
                 .bin_factor_x =        2,
                 .bin_factor_y =        2,
+                .skip_frames = 1,
        },
        {
                 .desc =        "WVGA_strong_dvs_30fps" ,
@@ -195,6 +203,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_WVGA_strong_dvs_30fps   ,
                 .bin_factor_x =        1,
                 .bin_factor_y =        1,
+                .skip_frames = 1,
        },
        {
                 .desc =        "720p_strong_dvs_30fps" ,
@@ -207,6 +216,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_720p_strong_dvs_30fps   ,
                 .bin_factor_x =        1,
                 .bin_factor_y =        1,
+                .skip_frames = 1,
        },
        {
                 .desc =        "1080p_strong_dvs_30fps",
@@ -219,6 +229,7 @@ struct mt9e013_resolution mt9e013_res_video[] = {
                 .regs =        mt9e013_1080p_strong_dvs_30fps,
                 .bin_factor_x =        0,
                 .bin_factor_y =        0,
+                .skip_frames = 1,
        },
 };
 
@@ -1998,6 +2009,17 @@ mt9e013_g_frame_interval(struct v4l2_subdev *sd,
        return 0;
 }
 
+static int mt9e013_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)
+{
+       struct mt9e013_device *dev = to_mt9e013_sensor(sd);
+
+       if (frames == NULL)
+               return -EINVAL;
+
+       *frames = mt9e013_res[dev->fmt_idx].skip_frames;
+
+       return 0;
+}
 static const struct v4l2_subdev_video_ops mt9e013_video_ops = {
        .s_stream = mt9e013_s_stream,
        .enum_framesizes = mt9e013_enum_framesizes,
@@ -2010,6 +2032,10 @@ static const struct v4l2_subdev_video_ops mt9e013_video_ops = {
        .g_frame_interval = mt9e013_g_frame_interval,
 };
 
+static struct v4l2_subdev_sensor_ops mt9e013_sensor_ops = {
+       .g_skip_frames  = mt9e013_g_skip_frames,
+};
+
 static const struct v4l2_subdev_core_ops mt9e013_core_ops = {
        .g_chip_ident = mt9e013_g_chip_ident,
        .queryctrl = mt9e013_queryctrl,
@@ -2032,6 +2058,7 @@ static const struct v4l2_subdev_ops mt9e013_ops = {
        .core = &mt9e013_core_ops,
        .video = &mt9e013_video_ops,
        .pad = &mt9e013_pad_ops,
+       .sensor = &mt9e013_sensor_ops,
 };
 
 static const struct media_entity_operations mt9e013_entity_ops = {

diff --git a/drivers/media/video/mt9e013.h b/drivers/media/video/mt9e013.h
index 9f82749..691f20c 100644 (file)
--- a/drivers/media/video/mt9e013.h
+++ b/drivers/media/video/mt9e013.h
@@ -349,6 +349,7 @@ struct mt9e013_resolution {
        const struct mt9e013_reg *regs;
        u8 bin_factor_x;
        u8 bin_factor_y;
+       unsigned short skip_frames;
 };
 
 struct mt9e013_format {