media: v4l2-subdev: add subdev-wide state struct

[linux-2.6-microblaze.git] / drivers / media / platform / omap3isp / ispccdc.c

diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 4e8905e..108b5e9 100644 (file)
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -29,7 +29,8 @@
 #define CCDC_MIN_HEIGHT                32
 
 static struct v4l2_mbus_framefmt *
-__ccdc_get_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg,
+__ccdc_get_format(struct isp_ccdc_device *ccdc,
+                 struct v4l2_subdev_state *sd_state,
                  unsigned int pad, enum v4l2_subdev_format_whence which);
 
 static const unsigned int ccdc_fmts[] = {
@@ -1936,21 +1937,25 @@ static int ccdc_set_stream(struct v4l2_subdev *sd, int enable)
 }
 
 static struct v4l2_mbus_framefmt *
-__ccdc_get_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg,
+__ccdc_get_format(struct isp_ccdc_device *ccdc,
+                 struct v4l2_subdev_state *sd_state,
                  unsigned int pad, enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_format(&ccdc->subdev, cfg, pad);
+               return v4l2_subdev_get_try_format(&ccdc->subdev, sd_state,
+                                                 pad);
        else
                return &ccdc->formats[pad];
 }
 
 static struct v4l2_rect *
-__ccdc_get_crop(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg,
+__ccdc_get_crop(struct isp_ccdc_device *ccdc,
+               struct v4l2_subdev_state *sd_state,
                enum v4l2_subdev_format_whence which)
 {
        if (which == V4L2_SUBDEV_FORMAT_TRY)
-               return v4l2_subdev_get_try_crop(&ccdc->subdev, cfg, CCDC_PAD_SOURCE_OF);
+               return v4l2_subdev_get_try_crop(&ccdc->subdev, sd_state,
+                                               CCDC_PAD_SOURCE_OF);
        else
                return &ccdc->crop;
 }
@@ -1963,7 +1968,8 @@ __ccdc_get_crop(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg
  * @fmt: Format
  */
 static void
-ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg,
+ccdc_try_format(struct isp_ccdc_device *ccdc,
+               struct v4l2_subdev_state *sd_state,
                unsigned int pad, struct v4l2_mbus_framefmt *fmt,
                enum v4l2_subdev_format_whence which)
 {
@@ -1999,7 +2005,8 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg
        case CCDC_PAD_SOURCE_OF:
                pixelcode = fmt->code;
                field = fmt->field;
-               *fmt = *__ccdc_get_format(ccdc, cfg, CCDC_PAD_SINK, which);
+               *fmt = *__ccdc_get_format(ccdc, sd_state, CCDC_PAD_SINK,
+                                         which);
 
                /* In SYNC mode the bridge converts YUV formats from 2X8 to
                 * 1X16. In BT.656 no such conversion occurs. As we don't know
@@ -2024,7 +2031,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg
                }
 
                /* Hardcode the output size to the crop rectangle size. */
-               crop = __ccdc_get_crop(ccdc, cfg, which);
+               crop = __ccdc_get_crop(ccdc, sd_state, which);
                fmt->width = crop->width;
                fmt->height = crop->height;
 
@@ -2041,7 +2048,8 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_pad_config *cfg
                break;
 
        case CCDC_PAD_SOURCE_VP:
-               *fmt = *__ccdc_get_format(ccdc, cfg, CCDC_PAD_SINK, which);
+               *fmt = *__ccdc_get_format(ccdc, sd_state, CCDC_PAD_SINK,
+                                         which);
 
                /* The video port interface truncates the data to 10 bits. */
                info = omap3isp_video_format_info(fmt->code);
@@ -2118,7 +2126,7 @@ static void ccdc_try_crop(struct isp_ccdc_device *ccdc,
  * return -EINVAL or zero on success
  */
 static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_pad_config *cfg,
+                              struct v4l2_subdev_state *sd_state,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
@@ -2133,7 +2141,7 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
                break;
 
        case CCDC_PAD_SOURCE_OF:
-               format = __ccdc_get_format(ccdc, cfg, code->pad,
+               format = __ccdc_get_format(ccdc, sd_state, code->pad,
                                           code->which);
 
                if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
@@ -2164,7 +2172,7 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
                if (code->index != 0)
                        return -EINVAL;
 
-               format = __ccdc_get_format(ccdc, cfg, code->pad,
+               format = __ccdc_get_format(ccdc, sd_state, code->pad,
                                           code->which);
 
                /* A pixel code equal to 0 means that the video port doesn't
@@ -2184,7 +2192,7 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
 }
 
 static int ccdc_enum_frame_size(struct v4l2_subdev *sd,
-                               struct v4l2_subdev_pad_config *cfg,
+                               struct v4l2_subdev_state *sd_state,
                                struct v4l2_subdev_frame_size_enum *fse)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
@@ -2196,7 +2204,7 @@ static int ccdc_enum_frame_size(struct v4l2_subdev *sd,
        format.code = fse->code;
        format.width = 1;
        format.height = 1;
-       ccdc_try_format(ccdc, cfg, fse->pad, &format, fse->which);
+       ccdc_try_format(ccdc, sd_state, fse->pad, &format, fse->which);
        fse->min_width = format.width;
        fse->min_height = format.height;
 
@@ -2206,7 +2214,7 @@ static int ccdc_enum_frame_size(struct v4l2_subdev *sd,
        format.code = fse->code;
        format.width = -1;
        format.height = -1;
-       ccdc_try_format(ccdc, cfg, fse->pad, &format, fse->which);
+       ccdc_try_format(ccdc, sd_state, fse->pad, &format, fse->which);
        fse->max_width = format.width;
        fse->max_height = format.height;
 
@@ -2224,7 +2232,8 @@ static int ccdc_enum_frame_size(struct v4l2_subdev *sd,
  *
  * Return 0 on success or a negative error code otherwise.
  */
-static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
+static int ccdc_get_selection(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_state *sd_state,
                              struct v4l2_subdev_selection *sel)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
@@ -2240,12 +2249,13 @@ static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
                sel->r.width = INT_MAX;
                sel->r.height = INT_MAX;
 
-               format = __ccdc_get_format(ccdc, cfg, CCDC_PAD_SINK, sel->which);
+               format = __ccdc_get_format(ccdc, sd_state, CCDC_PAD_SINK,
+                                          sel->which);
                ccdc_try_crop(ccdc, format, &sel->r);
                break;
 
        case V4L2_SEL_TGT_CROP:
-               sel->r = *__ccdc_get_crop(ccdc, cfg, sel->which);
+               sel->r = *__ccdc_get_crop(ccdc, sd_state, sel->which);
                break;
 
        default:
@@ -2266,7 +2276,8 @@ static int ccdc_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
  *
  * Return 0 on success or a negative error code otherwise.
  */
-static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
+static int ccdc_set_selection(struct v4l2_subdev *sd,
+                             struct v4l2_subdev_state *sd_state,
                              struct v4l2_subdev_selection *sel)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
@@ -2285,17 +2296,19 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
         * rectangle.
         */
        if (sel->flags & V4L2_SEL_FLAG_KEEP_CONFIG) {
-               sel->r = *__ccdc_get_crop(ccdc, cfg, sel->which);
+               sel->r = *__ccdc_get_crop(ccdc, sd_state, sel->which);
                return 0;
        }
 
-       format = __ccdc_get_format(ccdc, cfg, CCDC_PAD_SINK, sel->which);
+       format = __ccdc_get_format(ccdc, sd_state, CCDC_PAD_SINK, sel->which);
        ccdc_try_crop(ccdc, format, &sel->r);
-       *__ccdc_get_crop(ccdc, cfg, sel->which) = sel->r;
+       *__ccdc_get_crop(ccdc, sd_state, sel->which) = sel->r;
 
        /* Update the source format. */
-       format = __ccdc_get_format(ccdc, cfg, CCDC_PAD_SOURCE_OF, sel->which);
-       ccdc_try_format(ccdc, cfg, CCDC_PAD_SOURCE_OF, format, sel->which);
+       format = __ccdc_get_format(ccdc, sd_state, CCDC_PAD_SOURCE_OF,
+                                  sel->which);
+       ccdc_try_format(ccdc, sd_state, CCDC_PAD_SOURCE_OF, format,
+                       sel->which);
 
        return 0;
 }
@@ -2309,13 +2322,14 @@ static int ccdc_set_selection(struct v4l2_subdev *sd, struct v4l2_subdev_pad_con
  * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
  * to the format type.
  */
-static int ccdc_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
+static int ccdc_get_format(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state,
                           struct v4l2_subdev_format *fmt)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format;
 
-       format = __ccdc_get_format(ccdc, cfg, fmt->pad, fmt->which);
+       format = __ccdc_get_format(ccdc, sd_state, fmt->pad, fmt->which);
        if (format == NULL)
                return -EINVAL;
 
@@ -2332,24 +2346,25 @@ static int ccdc_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config
  * Return 0 on success or -EINVAL if the pad is invalid or doesn't correspond
  * to the format type.
  */
-static int ccdc_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg,
+static int ccdc_set_format(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state,
                           struct v4l2_subdev_format *fmt)
 {
        struct isp_ccdc_device *ccdc = v4l2_get_subdevdata(sd);
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
 
-       format = __ccdc_get_format(ccdc, cfg, fmt->pad, fmt->which);
+       format = __ccdc_get_format(ccdc, sd_state, fmt->pad, fmt->which);
        if (format == NULL)
                return -EINVAL;
 
-       ccdc_try_format(ccdc, cfg, fmt->pad, &fmt->format, fmt->which);
+       ccdc_try_format(ccdc, sd_state, fmt->pad, &fmt->format, fmt->which);
        *format = fmt->format;
 
        /* Propagate the format from sink to source */
        if (fmt->pad == CCDC_PAD_SINK) {
                /* Reset the crop rectangle. */
-               crop = __ccdc_get_crop(ccdc, cfg, fmt->which);
+               crop = __ccdc_get_crop(ccdc, sd_state, fmt->which);
                crop->left = 0;
                crop->top = 0;
                crop->width = fmt->format.width;
@@ -2358,16 +2373,16 @@ static int ccdc_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config
                ccdc_try_crop(ccdc, &fmt->format, crop);
 
                /* Update the source formats. */
-               format = __ccdc_get_format(ccdc, cfg, CCDC_PAD_SOURCE_OF,
+               format = __ccdc_get_format(ccdc, sd_state, CCDC_PAD_SOURCE_OF,
                                           fmt->which);
                *format = fmt->format;
-               ccdc_try_format(ccdc, cfg, CCDC_PAD_SOURCE_OF, format,
+               ccdc_try_format(ccdc, sd_state, CCDC_PAD_SOURCE_OF, format,
                                fmt->which);
 
-               format = __ccdc_get_format(ccdc, cfg, CCDC_PAD_SOURCE_VP,
+               format = __ccdc_get_format(ccdc, sd_state, CCDC_PAD_SOURCE_VP,
                                           fmt->which);
                *format = fmt->format;
-               ccdc_try_format(ccdc, cfg, CCDC_PAD_SOURCE_VP, format,
+               ccdc_try_format(ccdc, sd_state, CCDC_PAD_SOURCE_VP, format,
                                fmt->which);
        }
 
@@ -2454,7 +2469,7 @@ static int ccdc_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
        format.format.width = 4096;
        format.format.height = 4096;
-       ccdc_set_format(sd, fh ? fh->pad : NULL, &format);
+       ccdc_set_format(sd, fh ? fh->state : NULL, &format);
 
        return 0;
 }