media: renesas: vsp1: Fix references to pad config

V4L2 subdev operations have moved from operating on a
v4l2_subdev_pad_config to a v4l2_subdev_state a long time ago. Fix
remaining incorrect references to pad config in function and variable
names.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_brx.c b/drivers/media/platform/renesas/vsp1/vsp1_brx.c
index 95bf7b4ac9b81b48954e6bf1a224388e83728707..758525a032891f98096c14d0956684a38f8f8de0 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_brx.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_brx.c
@@ -136,29 +136,28 @@ static int brx_set_format(struct v4l2_subdev *subdev,
                          struct v4l2_subdev_format *fmt)
 {
        struct vsp1_brx *brx = to_brx(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&brx->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&brx->entity, sd_state,
-                                           fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&brx->entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
-       brx_try_format(brx, config, fmt->pad, &fmt->format);
+       brx_try_format(brx, state, fmt->pad, &fmt->format);
 
-       format = vsp1_entity_get_pad_format(&brx->entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(&brx->entity, state, fmt->pad);
        *format = fmt->format;
 
        /* Reset the compose rectangle. */
        if (fmt->pad != brx->entity.source_pad) {
                struct v4l2_rect *compose;
 
-               compose = brx_get_compose(brx, config, fmt->pad);
+               compose = brx_get_compose(brx, state, fmt->pad);
                compose->left = 0;
                compose->top = 0;
                compose->width = format->width;
@@ -171,7 +170,7 @@ static int brx_set_format(struct v4l2_subdev *subdev,
 
                for (i = 0; i <= brx->entity.source_pad; ++i) {
                        format = vsp1_entity_get_pad_format(&brx->entity,
-                                                           config, i);
+                                                           state, i);
                        format->code = fmt->format.code;
                }
        }
@@ -186,7 +185,7 @@ static int brx_get_selection(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_selection *sel)
 {
        struct vsp1_brx *brx = to_brx(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
 
        if (sel->pad == brx->entity.source_pad)
                return -EINVAL;
@@ -200,13 +199,13 @@ static int brx_get_selection(struct v4l2_subdev *subdev,
                return 0;
 
        case V4L2_SEL_TGT_COMPOSE:
-               config = vsp1_entity_get_pad_config(&brx->entity, sd_state,
-                                                   sel->which);
-               if (!config)
+               state = vsp1_entity_get_state(&brx->entity, sd_state,
+                                             sel->which);
+               if (!state)
                        return -EINVAL;
 
                mutex_lock(&brx->entity.lock);
-               sel->r = *brx_get_compose(brx, config, sel->pad);
+               sel->r = *brx_get_compose(brx, state, sel->pad);
                mutex_unlock(&brx->entity.lock);
                return 0;
 
@@ -220,7 +219,7 @@ static int brx_set_selection(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_selection *sel)
 {
        struct vsp1_brx *brx = to_brx(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *compose;
        int ret = 0;
@@ -233,9 +232,8 @@ static int brx_set_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&brx->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&brx->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&brx->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
@@ -244,7 +242,7 @@ static int brx_set_selection(struct v4l2_subdev *subdev,
         * The compose rectangle top left corner must be inside the output
         * frame.
         */
-       format = vsp1_entity_get_pad_format(&brx->entity, config,
+       format = vsp1_entity_get_pad_format(&brx->entity, state,
                                            brx->entity.source_pad);
        sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);
        sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
@@ -253,11 +251,11 @@ static int brx_set_selection(struct v4l2_subdev *subdev,
         * Scaling isn't supported, the compose rectangle size must be identical
         * to the sink format size.
         */
-       format = vsp1_entity_get_pad_format(&brx->entity, config, sel->pad);
+       format = vsp1_entity_get_pad_format(&brx->entity, state, sel->pad);
        sel->r.width = format->width;
        sel->r.height = format->height;
 
-       compose = brx_get_compose(brx, config, sel->pad);
+       compose = brx_get_compose(brx, state, sel->pad);
        *compose = sel->r;
 
 done:
@@ -293,7 +291,7 @@ static void brx_configure_stream(struct vsp1_entity *entity,
        unsigned int flags;
        unsigned int i;
 
-       format = vsp1_entity_get_pad_format(&brx->entity, brx->entity.config,
+       format = vsp1_entity_get_pad_format(&brx->entity, brx->entity.state,
                                            brx->entity.source_pad);
 
        /*

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_clu.c b/drivers/media/platform/renesas/vsp1/vsp1_clu.c
index c5217fee24f1392d8bca2a1ee05a1f4e98283479..50a5c0dc0e86f3720fdd7d463219364d46ede7c9 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_clu.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_clu.c
@@ -182,8 +182,7 @@ static void clu_configure_stream(struct vsp1_entity *entity,
         * The yuv_mode can't be changed during streaming. Cache it internally
         * for future runtime configuration calls.
         */
-       format = vsp1_entity_get_pad_format(&clu->entity,
-                                           clu->entity.config,
+       format = vsp1_entity_get_pad_format(&clu->entity, clu->entity.state,
                                            CLU_PAD_SINK);
        clu->yuv_mode = format->code == MEDIA_BUS_FMT_AYUV8_1X32;
 }

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_entity.c b/drivers/media/platform/renesas/vsp1/vsp1_entity.c
index d5a49e08a607d340eb4421172859446dd687504b..0280b8ff7ba966a487767491a0f564fbb5b5b32e 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_entity.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_entity.c
@@ -101,27 +101,26 @@ void vsp1_entity_configure_partition(struct vsp1_entity *entity,
  */
 
 /**
- * vsp1_entity_get_pad_config - Get the pad configuration for an entity
+ * vsp1_entity_get_state - Get the subdev state for an entity
  * @entity: the entity
  * @sd_state: the TRY state
- * @which: configuration selector (ACTIVE or TRY)
+ * @which: state selector (ACTIVE or TRY)
  *
  * When called with which set to V4L2_SUBDEV_FORMAT_ACTIVE the caller must hold
  * the entity lock to access the returned configuration.
  *
- * Return the pad configuration requested by the which argument. The TRY
- * configuration is passed explicitly to the function through the cfg argument
- * and simply returned when requested. The ACTIVE configuration comes from the
- * entity structure.
+ * Return the subdev state requested by the which argument. The TRY state is
+ * passed explicitly to the function through the sd_state argument and simply
+ * returned when requested. The ACTIVE state comes from the entity structure.
  */
 struct v4l2_subdev_state *
-vsp1_entity_get_pad_config(struct vsp1_entity *entity,
-                          struct v4l2_subdev_state *sd_state,
-                          enum v4l2_subdev_format_whence which)
+vsp1_entity_get_state(struct vsp1_entity *entity,
+                     struct v4l2_subdev_state *sd_state,
+                     enum v4l2_subdev_format_whence which)
 {
        switch (which) {
        case V4L2_SUBDEV_FORMAT_ACTIVE:
-               return entity->config;
+               return entity->state;
        case V4L2_SUBDEV_FORMAT_TRY:
        default:
                return sd_state;
@@ -174,10 +173,11 @@ vsp1_entity_get_pad_selection(struct vsp1_entity *entity,
 /*
  * vsp1_entity_init_cfg - Initialize formats on all pads
  * @subdev: V4L2 subdevice
- * @cfg: V4L2 subdev pad configuration
+ * @sd_state: V4L2 subdev state
  *
- * Initialize all pad formats with default values in the given pad config. This
- * function can be used as a handler for the subdev pad::init_cfg operation.
+ * Initialize all pad formats with default values in the given subdev state.
+ * This function can be used as a handler for the subdev pad::init_cfg
+ * operation.
  */
 int vsp1_entity_init_cfg(struct v4l2_subdev *subdev,
                         struct v4l2_subdev_state *sd_state)
@@ -200,7 +200,7 @@ int vsp1_entity_init_cfg(struct v4l2_subdev *subdev,
 /*
  * vsp1_subdev_get_pad_format - Subdev pad get_fmt handler
  * @subdev: V4L2 subdevice
- * @cfg: V4L2 subdev pad configuration
+ * @sd_state: V4L2 subdev state
  * @fmt: V4L2 subdev format
  *
  * This function implements the subdev get_fmt pad operation. It can be used as
@@ -211,14 +211,14 @@ int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_format *fmt)
 {
        struct vsp1_entity *entity = to_vsp1_entity(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
 
-       config = vsp1_entity_get_pad_config(entity, sd_state, fmt->which);
-       if (!config)
+       state = vsp1_entity_get_state(entity, sd_state, fmt->which);
+       if (!state)
                return -EINVAL;
 
        mutex_lock(&entity->lock);
-       fmt->format = *vsp1_entity_get_pad_format(entity, config, fmt->pad);
+       fmt->format = *vsp1_entity_get_pad_format(entity, state, fmt->pad);
        mutex_unlock(&entity->lock);
 
        return 0;
@@ -227,7 +227,7 @@ int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,
 /*
  * vsp1_subdev_enum_mbus_code - Subdev pad enum_mbus_code handler
  * @subdev: V4L2 subdevice
- * @cfg: V4L2 subdev pad configuration
+ * @sd_state: V4L2 subdev state
  * @code: Media bus code enumeration
  * @codes: Array of supported media bus codes
  * @ncodes: Number of supported media bus codes
@@ -250,7 +250,7 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,
 
                code->code = codes[code->index];
        } else {
-               struct v4l2_subdev_state *config;
+               struct v4l2_subdev_state *state;
                struct v4l2_mbus_framefmt *format;
 
                /*
@@ -260,13 +260,12 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,
                if (code->index)
                        return -EINVAL;
 
-               config = vsp1_entity_get_pad_config(entity, sd_state,
-                                                   code->which);
-               if (!config)
+               state = vsp1_entity_get_state(entity, sd_state, code->which);
+               if (!state)
                        return -EINVAL;
 
                mutex_lock(&entity->lock);
-               format = vsp1_entity_get_pad_format(entity, config, 0);
+               format = vsp1_entity_get_pad_format(entity, state, 0);
                code->code = format->code;
                mutex_unlock(&entity->lock);
        }
@@ -277,7 +276,7 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,
 /*
  * vsp1_subdev_enum_frame_size - Subdev pad enum_frame_size handler
  * @subdev: V4L2 subdevice
- * @cfg: V4L2 subdev pad configuration
+ * @sd_state: V4L2 subdev state
  * @fse: Frame size enumeration
  * @min_width: Minimum image width
  * @min_height: Minimum image height
@@ -296,15 +295,15 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev,
                                unsigned int max_width, unsigned int max_height)
 {
        struct vsp1_entity *entity = to_vsp1_entity(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
-       config = vsp1_entity_get_pad_config(entity, sd_state, fse->which);
-       if (!config)
+       state = vsp1_entity_get_state(entity, sd_state, fse->which);
+       if (!state)
                return -EINVAL;
 
-       format = vsp1_entity_get_pad_format(entity, config, fse->pad);
+       format = vsp1_entity_get_pad_format(entity, state, fse->pad);
 
        mutex_lock(&entity->lock);
 
@@ -337,7 +336,7 @@ done:
 /*
  * vsp1_subdev_set_pad_format - Subdev pad set_fmt handler
  * @subdev: V4L2 subdevice
- * @cfg: V4L2 subdev pad configuration
+ * @sd_state: V4L2 subdev state
  * @fmt: V4L2 subdev format
  * @codes: Array of supported media bus codes
  * @ncodes: Number of supported media bus codes
@@ -360,7 +359,7 @@ int vsp1_subdev_set_pad_format(struct v4l2_subdev *subdev,
                               unsigned int max_width, unsigned int max_height)
 {
        struct vsp1_entity *entity = to_vsp1_entity(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *selection;
        unsigned int i;
@@ -368,13 +367,13 @@ int vsp1_subdev_set_pad_format(struct v4l2_subdev *subdev,
 
        mutex_lock(&entity->lock);
 
-       config = vsp1_entity_get_pad_config(entity, sd_state, fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
-       format = vsp1_entity_get_pad_format(entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(entity, state, fmt->pad);
 
        if (fmt->pad == entity->source_pad) {
                /* The output format can't be modified. */
@@ -402,18 +401,18 @@ int vsp1_subdev_set_pad_format(struct v4l2_subdev *subdev,
        fmt->format = *format;
 
        /* Propagate the format to the source pad. */
-       format = vsp1_entity_get_pad_format(entity, config, entity->source_pad);
+       format = vsp1_entity_get_pad_format(entity, state, entity->source_pad);
        *format = fmt->format;
 
        /* Reset the crop and compose rectangles. */
-       selection = vsp1_entity_get_pad_selection(entity, config, fmt->pad,
+       selection = vsp1_entity_get_pad_selection(entity, state, fmt->pad,
                                                  V4L2_SEL_TGT_CROP);
        selection->left = 0;
        selection->top = 0;
        selection->width = format->width;
        selection->height = format->height;
 
-       selection = vsp1_entity_get_pad_selection(entity, config, fmt->pad,
+       selection = vsp1_entity_get_pad_selection(entity, state, fmt->pad,
                                                  V4L2_SEL_TGT_COMPOSE);
        selection->left = 0;
        selection->top = 0;
@@ -670,18 +669,18 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
        vsp1_entity_init_cfg(subdev, NULL);
 
        /*
-        * Allocate the pad configuration to store formats and selection
+        * Allocate the subdev state to store formats and selection
         * rectangles.
         */
        /*
         * FIXME: Drop this call, drivers are not supposed to use
         * __v4l2_subdev_state_alloc().
         */
-       entity->config = __v4l2_subdev_state_alloc(&entity->subdev,
-                                                  "vsp1:config->lock", &key);
-       if (IS_ERR(entity->config)) {
+       entity->state = __v4l2_subdev_state_alloc(&entity->subdev,
+                                                 "vsp1:state->lock", &key);
+       if (IS_ERR(entity->state)) {
                media_entity_cleanup(&entity->subdev.entity);
-               return PTR_ERR(entity->config);
+               return PTR_ERR(entity->state);
        }
 
        return 0;
@@ -693,6 +692,6 @@ void vsp1_entity_destroy(struct vsp1_entity *entity)
                entity->ops->destroy(entity);
        if (entity->subdev.ctrl_handler)
                v4l2_ctrl_handler_free(entity->subdev.ctrl_handler);
-       __v4l2_subdev_state_free(entity->config);
+       __v4l2_subdev_state_free(entity->state);
        media_entity_cleanup(&entity->subdev.entity);
 }

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_entity.h b/drivers/media/platform/renesas/vsp1/vsp1_entity.h
index 17f98a6a972e3cece90e676152cc6c1fb5f783f6..8c737cadee81193f525e03fcd7f97d6d424f050f 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_entity.h
+++ b/drivers/media/platform/renesas/vsp1/vsp1_entity.h
@@ -115,9 +115,9 @@ struct vsp1_entity {
        unsigned int sink_pad;
 
        struct v4l2_subdev subdev;
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
 
-       struct mutex lock;      /* Protects the pad config */
+       struct mutex lock;      /* Protects the state */
 };
 
 static inline struct vsp1_entity *to_vsp1_entity(struct v4l2_subdev *subdev)
@@ -135,9 +135,9 @@ int vsp1_entity_link_setup(struct media_entity *entity,
                           const struct media_pad *remote, u32 flags);
 
 struct v4l2_subdev_state *
-vsp1_entity_get_pad_config(struct vsp1_entity *entity,
-                          struct v4l2_subdev_state *sd_state,
-                          enum v4l2_subdev_format_whence which);
+vsp1_entity_get_state(struct vsp1_entity *entity,
+                     struct v4l2_subdev_state *sd_state,
+                     enum v4l2_subdev_format_whence which);
 struct v4l2_mbus_framefmt *
 vsp1_entity_get_pad_format(struct vsp1_entity *entity,
                           struct v4l2_subdev_state *sd_state,

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_hgo.c b/drivers/media/platform/renesas/vsp1/vsp1_hgo.c
index e6492deb0a64fea0c5ddf19a7314149c532a12dc..40c571a987ef90d44ae0f6d41e4b93c9ed902df1 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_hgo.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_hgo.c
@@ -140,9 +140,9 @@ static void hgo_configure_stream(struct vsp1_entity *entity,
        unsigned int hratio;
        unsigned int vratio;
 
-       crop = vsp1_entity_get_pad_selection(entity, entity->config,
+       crop = vsp1_entity_get_pad_selection(entity, entity->state,
                                             HISTO_PAD_SINK, V4L2_SEL_TGT_CROP);
-       compose = vsp1_entity_get_pad_selection(entity, entity->config,
+       compose = vsp1_entity_get_pad_selection(entity, entity->state,
                                                HISTO_PAD_SINK,
                                                V4L2_SEL_TGT_COMPOSE);
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_hgt.c b/drivers/media/platform/renesas/vsp1/vsp1_hgt.c
index aa1c718e04534cd7fe8a66f054a7560406963d1f..8281b86874abade7924da0a5945d2c796129fbd2 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_hgt.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_hgt.c
@@ -139,9 +139,9 @@ static void hgt_configure_stream(struct vsp1_entity *entity,
        u8 upper;
        unsigned int i;
 
-       crop = vsp1_entity_get_pad_selection(entity, entity->config,
+       crop = vsp1_entity_get_pad_selection(entity, entity->state,
                                             HISTO_PAD_SINK, V4L2_SEL_TGT_CROP);
-       compose = vsp1_entity_get_pad_selection(entity, entity->config,
+       compose = vsp1_entity_get_pad_selection(entity, entity->state,
                                                HISTO_PAD_SINK,
                                                V4L2_SEL_TGT_COMPOSE);
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_histo.c b/drivers/media/platform/renesas/vsp1/vsp1_histo.c
index f22449dd654cb51cfcab134755b52fe07bc2fa31..71155282ca1167089def2fc9a3cef6fdf69219d1 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_histo.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_histo.c
@@ -203,7 +203,7 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
        int ret = 0;
@@ -213,9 +213,8 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&histo->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&histo->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&histo->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
@@ -223,7 +222,7 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
        switch (sel->target) {
        case V4L2_SEL_TGT_COMPOSE_BOUNDS:
        case V4L2_SEL_TGT_COMPOSE_DEFAULT:
-               crop = vsp1_entity_get_pad_selection(&histo->entity, config,
+               crop = vsp1_entity_get_pad_selection(&histo->entity, state,
                                                     HISTO_PAD_SINK,
                                                     V4L2_SEL_TGT_CROP);
                sel->r.left = 0;
@@ -234,7 +233,7 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
 
        case V4L2_SEL_TGT_CROP_BOUNDS:
        case V4L2_SEL_TGT_CROP_DEFAULT:
-               format = vsp1_entity_get_pad_format(&histo->entity, config,
+               format = vsp1_entity_get_pad_format(&histo->entity, state,
                                                    HISTO_PAD_SINK);
                sel->r.left = 0;
                sel->r.top = 0;
@@ -244,7 +243,7 @@ static int histo_get_selection(struct v4l2_subdev *subdev,
 
        case V4L2_SEL_TGT_COMPOSE:
        case V4L2_SEL_TGT_CROP:
-               sel->r = *vsp1_entity_get_pad_selection(&histo->entity, config,
+               sel->r = *vsp1_entity_get_pad_selection(&histo->entity, state,
                                                        sel->pad, sel->target);
                break;
 
@@ -346,7 +345,7 @@ static int histo_set_selection(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_selection *sel)
 {
        struct vsp1_histogram *histo = subdev_to_histo(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        int ret;
 
        if (sel->pad != HISTO_PAD_SINK)
@@ -354,17 +353,16 @@ static int histo_set_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&histo->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&histo->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&histo->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
        if (sel->target == V4L2_SEL_TGT_CROP)
-               ret = histo_set_crop(subdev, config, sel);
+               ret = histo_set_crop(subdev, state, sel);
        else if (sel->target == V4L2_SEL_TGT_COMPOSE)
-               ret = histo_set_compose(subdev, config, sel);
+               ret = histo_set_compose(subdev, state, sel);
        else
                ret = -EINVAL;
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_hsit.c b/drivers/media/platform/renesas/vsp1/vsp1_hsit.c
index 361a870380c202542391ae6b1a4886bb3c8925ba..6342ac7bdf546aaa3206639d9c40c57e85da5c01 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_hsit.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_hsit.c
@@ -66,20 +66,19 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
                           struct v4l2_subdev_format *fmt)
 {
        struct vsp1_hsit *hsit = to_hsit(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&hsit->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&hsit->entity, sd_state,
-                                           fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&hsit->entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
-       format = vsp1_entity_get_pad_format(&hsit->entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(&hsit->entity, state, fmt->pad);
 
        if (fmt->pad == HSIT_PAD_SOURCE) {
                /*
@@ -102,7 +101,7 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
        fmt->format = *format;
 
        /* Propagate the format to the source pad. */
-       format = vsp1_entity_get_pad_format(&hsit->entity, config,
+       format = vsp1_entity_get_pad_format(&hsit->entity, state,
                                            HSIT_PAD_SOURCE);
        *format = fmt->format;
        format->code = hsit->inverse ? MEDIA_BUS_FMT_ARGB8888_1X32

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_lif.c b/drivers/media/platform/renesas/vsp1/vsp1_lif.c
index 0ab2e0c7047416d99f5289e82120b41ce47b6f9f..75c24df41a7ab613b89ba137a07b94c87009fbac 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_lif.c
@@ -94,7 +94,7 @@ static void lif_configure_stream(struct vsp1_entity *entity,
        unsigned int obth;
        unsigned int lbth;
 
-       format = vsp1_entity_get_pad_format(&lif->entity, lif->entity.config,
+       format = vsp1_entity_get_pad_format(&lif->entity, lif->entity.state,
                                            LIF_PAD_SOURCE);
 
        switch (entity->vsp1->version & VI6_IP_VERSION_MODEL_MASK) {

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
index ea12c3f12c92a35d811ff2334964bd212a945682..c47579efc65f68f126956a99d8f01b1bc2b8c46a 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
@@ -81,10 +81,10 @@ static void rpf_configure_stream(struct vsp1_entity *entity,
 
        /* Format */
        sink_format = vsp1_entity_get_pad_format(&rpf->entity,
-                                                rpf->entity.config,
+                                                rpf->entity.state,
                                                 RWPF_PAD_SINK);
        source_format = vsp1_entity_get_pad_format(&rpf->entity,
-                                                  rpf->entity.config,
+                                                  rpf->entity.state,
                                                   RWPF_PAD_SOURCE);
 
        infmt = VI6_RPF_INFMT_CIPM
@@ -158,7 +158,7 @@ static void rpf_configure_stream(struct vsp1_entity *entity,
                const struct v4l2_rect *compose;
 
                compose = vsp1_entity_get_pad_selection(pipe->brx,
-                                                       pipe->brx->config,
+                                                       pipe->brx->state,
                                                        rpf->brx_input,
                                                        V4L2_SEL_TGT_COMPOSE);
                left = compose->left;
@@ -302,7 +302,7 @@ static void rpf_configure_partition(struct vsp1_entity *entity,
         * offsets are needed, as planes 2 and 3 always have identical
         * strides.
         */
-       crop = *vsp1_rwpf_get_crop(rpf, rpf->entity.config);
+       crop = *vsp1_rwpf_get_crop(rpf, rpf->entity.state);
 
        /*
         * Partition Algorithm Control

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c b/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
index 6391a503ec97ce1ec1803cb4dca23154ff444aff..cb3ab351b7debc3b6434b59f0524114f0e6c4d76 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
@@ -61,15 +61,14 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
                                struct v4l2_subdev_format *fmt)
 {
        struct vsp1_rwpf *rwpf = to_rwpf(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&rwpf->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&rwpf->entity, sd_state,
-                                           fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&rwpf->entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
@@ -80,7 +79,7 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
 
-       format = vsp1_entity_get_pad_format(&rwpf->entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(&rwpf->entity, state, fmt->pad);
 
        if (fmt->pad == RWPF_PAD_SOURCE) {
                /*
@@ -106,7 +105,7 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
                struct v4l2_rect *crop;
 
                /* Update the sink crop rectangle. */
-               crop = vsp1_rwpf_get_crop(rwpf, config);
+               crop = vsp1_rwpf_get_crop(rwpf, state);
                crop->left = 0;
                crop->top = 0;
                crop->width = fmt->format.width;
@@ -114,7 +113,7 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
        }
 
        /* Propagate the format to the source pad. */
-       format = vsp1_entity_get_pad_format(&rwpf->entity, config,
+       format = vsp1_entity_get_pad_format(&rwpf->entity, state,
                                            RWPF_PAD_SOURCE);
        *format = fmt->format;
 
@@ -133,7 +132,7 @@ static int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev,
                                   struct v4l2_subdev_selection *sel)
 {
        struct vsp1_rwpf *rwpf = to_rwpf(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
@@ -146,20 +145,19 @@ static int vsp1_rwpf_get_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&rwpf->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&rwpf->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&rwpf->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP:
-               sel->r = *vsp1_rwpf_get_crop(rwpf, config);
+               sel->r = *vsp1_rwpf_get_crop(rwpf, state);
                break;
 
        case V4L2_SEL_TGT_CROP_BOUNDS:
-               format = vsp1_entity_get_pad_format(&rwpf->entity, config,
+               format = vsp1_entity_get_pad_format(&rwpf->entity, state,
                                                    RWPF_PAD_SINK);
                sel->r.left = 0;
                sel->r.top = 0;
@@ -182,7 +180,7 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
                                   struct v4l2_subdev_selection *sel)
 {
        struct vsp1_rwpf *rwpf = to_rwpf(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *crop;
        int ret = 0;
@@ -199,15 +197,14 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&rwpf->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&rwpf->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&rwpf->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
        /* Make sure the crop rectangle is entirely contained in the image. */
-       format = vsp1_entity_get_pad_format(&rwpf->entity, config,
+       format = vsp1_entity_get_pad_format(&rwpf->entity, state,
                                            RWPF_PAD_SINK);
 
        /*
@@ -228,11 +225,11 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
        sel->r.height = min_t(unsigned int, sel->r.height,
                              format->height - sel->r.top);
 
-       crop = vsp1_rwpf_get_crop(rwpf, config);
+       crop = vsp1_rwpf_get_crop(rwpf, state);
        *crop = sel->r;
 
        /* Propagate the format to the source pad. */
-       format = vsp1_entity_get_pad_format(&rwpf->entity, config,
+       format = vsp1_entity_get_pad_format(&rwpf->entity, state,
                                            RWPF_PAD_SOURCE);
        format->width = crop->width;
        format->height = crop->height;

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_sru.c b/drivers/media/platform/renesas/vsp1/vsp1_sru.c
index b614a2aea46118d9e1d36939ebc6629f7fe6ba4e..2dd6f8575614416d16982f7e4c9058b373a2214e 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_sru.c
@@ -123,16 +123,15 @@ static int sru_enum_frame_size(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_frame_size_enum *fse)
 {
        struct vsp1_sru *sru = to_sru(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
-       config = vsp1_entity_get_pad_config(&sru->entity, sd_state,
-                                           fse->which);
-       if (!config)
+       state = vsp1_entity_get_state(&sru->entity, sd_state, fse->which);
+       if (!state)
                return -EINVAL;
 
-       format = vsp1_entity_get_pad_format(&sru->entity, config, SRU_PAD_SINK);
+       format = vsp1_entity_get_pad_format(&sru->entity, state, SRU_PAD_SINK);
 
        mutex_lock(&sru->entity.lock);
 
@@ -221,31 +220,30 @@ static int sru_set_format(struct v4l2_subdev *subdev,
                          struct v4l2_subdev_format *fmt)
 {
        struct vsp1_sru *sru = to_sru(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&sru->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&sru->entity, sd_state,
-                                           fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&sru->entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
-       sru_try_format(sru, config, fmt->pad, &fmt->format);
+       sru_try_format(sru, state, fmt->pad, &fmt->format);
 
-       format = vsp1_entity_get_pad_format(&sru->entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(&sru->entity, state, fmt->pad);
        *format = fmt->format;
 
        if (fmt->pad == SRU_PAD_SINK) {
                /* Propagate the format to the source pad. */
-               format = vsp1_entity_get_pad_format(&sru->entity, config,
+               format = vsp1_entity_get_pad_format(&sru->entity, state,
                                                    SRU_PAD_SOURCE);
                *format = fmt->format;
 
-               sru_try_format(sru, config, SRU_PAD_SOURCE, format);
+               sru_try_format(sru, state, SRU_PAD_SOURCE, format);
        }
 
 done:
@@ -280,9 +278,9 @@ static void sru_configure_stream(struct vsp1_entity *entity,
        struct v4l2_mbus_framefmt *output;
        u32 ctrl0;
 
-       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                           SRU_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                            SRU_PAD_SOURCE);
 
        if (input->code == MEDIA_BUS_FMT_ARGB8888_1X32)
@@ -310,9 +308,9 @@ static unsigned int sru_max_width(struct vsp1_entity *entity,
        struct v4l2_mbus_framefmt *input;
        struct v4l2_mbus_framefmt *output;
 
-       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                           SRU_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                            SRU_PAD_SOURCE);
 
        /*
@@ -336,9 +334,9 @@ static void sru_partition(struct vsp1_entity *entity,
        struct v4l2_mbus_framefmt *input;
        struct v4l2_mbus_framefmt *output;
 
-       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       input = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                           SRU_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.config,
+       output = vsp1_entity_get_pad_format(&sru->entity, sru->entity.state,
                                            SRU_PAD_SOURCE);
 
        /* Adapt if SRUx2 is enabled. */

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_uds.c b/drivers/media/platform/renesas/vsp1/vsp1_uds.c
index 1c290cda005a3e2f8af020097462b07df70f372c..59ff4ae46cea9a15970b064458a1ad1c78d1b9ed 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_uds.c
@@ -128,17 +128,15 @@ static int uds_enum_frame_size(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_frame_size_enum *fse)
 {
        struct vsp1_uds *uds = to_uds(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
-       config = vsp1_entity_get_pad_config(&uds->entity, sd_state,
-                                           fse->which);
-       if (!config)
+       state = vsp1_entity_get_state(&uds->entity, sd_state, fse->which);
+       if (!state)
                return -EINVAL;
 
-       format = vsp1_entity_get_pad_format(&uds->entity, config,
-                                           UDS_PAD_SINK);
+       format = vsp1_entity_get_pad_format(&uds->entity, state, UDS_PAD_SINK);
 
        mutex_lock(&uds->entity.lock);
 
@@ -205,31 +203,30 @@ static int uds_set_format(struct v4l2_subdev *subdev,
                          struct v4l2_subdev_format *fmt)
 {
        struct vsp1_uds *uds = to_uds(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
        mutex_lock(&uds->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&uds->entity, sd_state,
-                                           fmt->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&uds->entity, sd_state, fmt->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
-       uds_try_format(uds, config, fmt->pad, &fmt->format);
+       uds_try_format(uds, state, fmt->pad, &fmt->format);
 
-       format = vsp1_entity_get_pad_format(&uds->entity, config, fmt->pad);
+       format = vsp1_entity_get_pad_format(&uds->entity, state, fmt->pad);
        *format = fmt->format;
 
        if (fmt->pad == UDS_PAD_SINK) {
                /* Propagate the format to the source pad. */
-               format = vsp1_entity_get_pad_format(&uds->entity, config,
+               format = vsp1_entity_get_pad_format(&uds->entity, state,
                                                    UDS_PAD_SOURCE);
                *format = fmt->format;
 
-               uds_try_format(uds, config, UDS_PAD_SOURCE, format);
+               uds_try_format(uds, state, UDS_PAD_SOURCE, format);
        }
 
 done:
@@ -269,9 +266,9 @@ static void uds_configure_stream(struct vsp1_entity *entity,
        unsigned int vscale;
        bool multitap;
 
-       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                           UDS_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                            UDS_PAD_SOURCE);
 
        hscale = uds_compute_ratio(input->width, output->width);
@@ -314,7 +311,7 @@ static void uds_configure_partition(struct vsp1_entity *entity,
        struct vsp1_partition *partition = pipe->partition;
        const struct v4l2_mbus_framefmt *output;
 
-       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                            UDS_PAD_SOURCE);
 
        /* Input size clipping. */
@@ -339,9 +336,9 @@ static unsigned int uds_max_width(struct vsp1_entity *entity,
        const struct v4l2_mbus_framefmt *input;
        unsigned int hscale;
 
-       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                           UDS_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                            UDS_PAD_SOURCE);
        hscale = output->width / input->width;
 
@@ -381,9 +378,9 @@ static void uds_partition(struct vsp1_entity *entity,
        partition->uds_sink = *window;
        partition->uds_source = *window;
 
-       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       input = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                           UDS_PAD_SINK);
-       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.config,
+       output = vsp1_entity_get_pad_format(&uds->entity, uds->entity.state,
                                            UDS_PAD_SOURCE);
 
        partition->uds_sink.width = window->width * input->width

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_uif.c b/drivers/media/platform/renesas/vsp1/vsp1_uif.c
index 83d7f17df80e7dad4fb17bc349740bf7f42e5ac7..d84d10f350902d92b20c3e53b28e22327af7c22f 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_uif.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_uif.c
@@ -86,7 +86,7 @@ static int uif_get_selection(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_selection *sel)
 {
        struct vsp1_uif *uif = to_uif(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        int ret = 0;
 
@@ -95,9 +95,8 @@ static int uif_get_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&uif->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&uif->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&uif->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
@@ -105,7 +104,7 @@ static int uif_get_selection(struct v4l2_subdev *subdev,
        switch (sel->target) {
        case V4L2_SEL_TGT_CROP_BOUNDS:
        case V4L2_SEL_TGT_CROP_DEFAULT:
-               format = vsp1_entity_get_pad_format(&uif->entity, config,
+               format = vsp1_entity_get_pad_format(&uif->entity, state,
                                                    UIF_PAD_SINK);
                sel->r.left = 0;
                sel->r.top = 0;
@@ -114,7 +113,7 @@ static int uif_get_selection(struct v4l2_subdev *subdev,
                break;
 
        case V4L2_SEL_TGT_CROP:
-               sel->r = *vsp1_entity_get_pad_selection(&uif->entity, config,
+               sel->r = *vsp1_entity_get_pad_selection(&uif->entity, state,
                                                        sel->pad, sel->target);
                break;
 
@@ -133,7 +132,7 @@ static int uif_set_selection(struct v4l2_subdev *subdev,
                             struct v4l2_subdev_selection *sel)
 {
        struct vsp1_uif *uif = to_uif(subdev);
-       struct v4l2_subdev_state *config;
+       struct v4l2_subdev_state *state;
        struct v4l2_mbus_framefmt *format;
        struct v4l2_rect *selection;
        int ret = 0;
@@ -144,15 +143,14 @@ static int uif_set_selection(struct v4l2_subdev *subdev,
 
        mutex_lock(&uif->entity.lock);
 
-       config = vsp1_entity_get_pad_config(&uif->entity, sd_state,
-                                           sel->which);
-       if (!config) {
+       state = vsp1_entity_get_state(&uif->entity, sd_state, sel->which);
+       if (!state) {
                ret = -EINVAL;
                goto done;
        }
 
        /* The crop rectangle must be inside the input frame. */
-       format = vsp1_entity_get_pad_format(&uif->entity, config, UIF_PAD_SINK);
+       format = vsp1_entity_get_pad_format(&uif->entity, state, UIF_PAD_SINK);
 
        sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);
        sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
@@ -162,7 +160,7 @@ static int uif_set_selection(struct v4l2_subdev *subdev,
                                format->height - sel->r.top);
 
        /* Store the crop rectangle. */
-       selection = vsp1_entity_get_pad_selection(&uif->entity, config,
+       selection = vsp1_entity_get_pad_selection(&uif->entity, state,
                                                  sel->pad, V4L2_SEL_TGT_CROP);
        *selection = sel->r;
 
@@ -206,7 +204,7 @@ static void uif_configure_stream(struct vsp1_entity *entity,
        vsp1_uif_write(uif, dlb, VI6_UIF_DISCOM_DOCMPMR,
                       VI6_UIF_DISCOM_DOCMPMR_SEL(9));
 
-       crop = vsp1_entity_get_pad_selection(entity, entity->config,
+       crop = vsp1_entity_get_pad_selection(entity, entity->state,
                                             UIF_PAD_SINK, V4L2_SEL_TGT_CROP);
 
        left = crop->left;

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_video.c b/drivers/media/platform/renesas/vsp1/vsp1_video.c
index e9d5027761bbc76bb7b851921ce8d2070b24f4c7..5a9cb0e5640ec599902906f368b9a83a07a44644 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_video.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_video.c
@@ -198,7 +198,7 @@ static void vsp1_video_calculate_partition(struct vsp1_pipeline *pipe,
         * at the WPF sink.
         */
        format = vsp1_entity_get_pad_format(&pipe->output->entity,
-                                           pipe->output->entity.config,
+                                           pipe->output->entity.state,
                                            RWPF_PAD_SINK);
 
        /* A single partition simply processes the output size in full. */
@@ -263,7 +263,7 @@ static int vsp1_video_pipeline_setup_partitions(struct vsp1_pipeline *pipe)
         * at the WPF sink.
         */
        format = vsp1_entity_get_pad_format(&pipe->output->entity,
-                                           pipe->output->entity.config,
+                                           pipe->output->entity.state,
                                            RWPF_PAD_SINK);
        div_size = format->width;
 

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
index cab4445eca696e1a3617b0921f81367bacd2b9b8..9693aeab1cac462d5ae39e59a813c48b75d0587a 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_wpf.c
@@ -66,10 +66,10 @@ static int vsp1_wpf_set_rotation(struct vsp1_rwpf *wpf, unsigned int rotation)
        }
 
        sink_format = vsp1_entity_get_pad_format(&wpf->entity,
-                                                wpf->entity.config,
+                                                wpf->entity.state,
                                                 RWPF_PAD_SINK);
        source_format = vsp1_entity_get_pad_format(&wpf->entity,
-                                                  wpf->entity.config,
+                                                  wpf->entity.state,
                                                   RWPF_PAD_SOURCE);
 
        mutex_lock(&wpf->entity.lock);
@@ -246,10 +246,10 @@ static void wpf_configure_stream(struct vsp1_entity *entity,
        int ret;
 
        sink_format = vsp1_entity_get_pad_format(&wpf->entity,
-                                                wpf->entity.config,
+                                                wpf->entity.state,
                                                 RWPF_PAD_SINK);
        source_format = vsp1_entity_get_pad_format(&wpf->entity,
-                                                  wpf->entity.config,
+                                                  wpf->entity.state,
                                                   RWPF_PAD_SOURCE);
 
        /* Format */
@@ -384,7 +384,7 @@ static void wpf_configure_partition(struct vsp1_entity *entity,
        unsigned int i;
 
        sink_format = vsp1_entity_get_pad_format(&wpf->entity,
-                                                wpf->entity.config,
+                                                wpf->entity.state,
                                                 RWPF_PAD_SINK);
        width = sink_format->width;
        height = sink_format->height;