[media] v4l: vsp1: Make vsp1_entity_get_pad_compose() more generic

Turn the helper into a function that can retrieve crop and compose
selection rectangles.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
index f60d7926d53fdd02dced62bd713b6b6d2a38e7d4..fd20c0d8aeeaad0f5bf893c9defb5e7f21fe0c58 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_entity.c
+++ b/drivers/media/platform/vsp1/vsp1_entity.c
@@ -87,12 +87,30 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity,
        return v4l2_subdev_get_try_format(&entity->subdev, cfg, pad);
 }
 
+/**
+ * vsp1_entity_get_pad_selection - Get a pad selection from storage for entity
+ * @entity: the entity
+ * @cfg: the configuration storage
+ * @pad: the pad number
+ * @target: the selection target
+ *
+ * Return the selection rectangle stored in the given configuration for an
+ * entity's pad. The configuration can be an ACTIVE or TRY configuration. The
+ * selection target can be COMPOSE or CROP.
+ */
 struct v4l2_rect *
-vsp1_entity_get_pad_compose(struct vsp1_entity *entity,
-                           struct v4l2_subdev_pad_config *cfg,
-                           unsigned int pad)
+vsp1_entity_get_pad_selection(struct vsp1_entity *entity,
+                             struct v4l2_subdev_pad_config *cfg,
+                             unsigned int pad, unsigned int target)
 {
-       return v4l2_subdev_get_try_compose(&entity->subdev, cfg, pad);
+       switch (target) {
+       case V4L2_SEL_TGT_COMPOSE:
+               return v4l2_subdev_get_try_compose(&entity->subdev, cfg, pad);
+       case V4L2_SEL_TGT_CROP:
+               return v4l2_subdev_get_try_crop(&entity->subdev, cfg, pad);
+       default:
+               return NULL;
+       }
 }
 
 /*

diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/platform/vsp1/vsp1_entity.h
index aaab05f4952ccd7b1e2ae0e3f708000c4d1df4d9..a240fc1c59a639ad8d09f4555a95b10ad20a409f 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_entity.h
+++ b/drivers/media/platform/vsp1/vsp1_entity.h
@@ -122,9 +122,9 @@ vsp1_entity_get_pad_format(struct vsp1_entity *entity,
                           struct v4l2_subdev_pad_config *cfg,
                           unsigned int pad);
 struct v4l2_rect *
-vsp1_entity_get_pad_compose(struct vsp1_entity *entity,
-                           struct v4l2_subdev_pad_config *cfg,
-                           unsigned int pad);
+vsp1_entity_get_pad_selection(struct vsp1_entity *entity,
+                             struct v4l2_subdev_pad_config *cfg,
+                             unsigned int pad, unsigned int target);
 int vsp1_entity_init_cfg(struct v4l2_subdev *subdev,
                         struct v4l2_subdev_pad_config *cfg);
 

diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
index 49168db3f52936583e2c2598f7f5490216453958..64dfbddf2abac96135c1e43385df9c752db821b4 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rpf.c
@@ -130,9 +130,10 @@ static void rpf_configure(struct vsp1_entity *entity,
        if (pipe->bru) {
                const struct v4l2_rect *compose;
 
-               compose = vsp1_entity_get_pad_compose(pipe->bru,
-                                                     pipe->bru->config,
-                                                     rpf->bru_input);
+               compose = vsp1_entity_get_pad_selection(pipe->bru,
+                                                       pipe->bru->config,
+                                                       rpf->bru_input,
+                                                       V4L2_SEL_TGT_COMPOSE);
                left = compose->left;
                top = compose->top;
        }