media: v4l: vsp1: Move vsp1_video_pipeline_setup_partitions() function

Separate the code change from the function move so that code changes can
be clearly identified. This commit has no functional change.

The partition algorithm functions will be changed, and
vsp1_video_pipeline_setup_partitions() will call vsp1_video_partition().
To prepare for that, move the function without any code change.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index fdb135e45fea7517ccaf89ee7b04fe0a9191fa28..e4c0bfa0f8643c5fcaed55eb03883df6b43f36ad 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -182,43 +182,6 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
  * VSP1 Partition Algorithm support
  */
 
-static void vsp1_video_pipeline_setup_partitions(struct vsp1_pipeline *pipe)
-{
-       struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
-       const struct v4l2_mbus_framefmt *format;
-       struct vsp1_entity *entity;
-       unsigned int div_size;
-
-       /*
-        * Partitions are computed on the size before rotation, use the format
-        * at the WPF sink.
-        */
-       format = vsp1_entity_get_pad_format(&pipe->output->entity,
-                                           pipe->output->entity.config,
-                                           RWPF_PAD_SINK);
-       div_size = format->width;
-
-       /* Gen2 hardware doesn't require image partitioning. */
-       if (vsp1->info->gen == 2) {
-               pipe->div_size = div_size;
-               pipe->partitions = 1;
-               return;
-       }
-
-       list_for_each_entry(entity, &pipe->entities, list_pipe) {
-               unsigned int entity_max = VSP1_VIDEO_MAX_WIDTH;
-
-               if (entity->ops->max_width) {
-                       entity_max = entity->ops->max_width(entity, pipe);
-                       if (entity_max)
-                               div_size = min(div_size, entity_max);
-               }
-       }
-
-       pipe->div_size = div_size;
-       pipe->partitions = DIV_ROUND_UP(format->width, div_size);
-}
-
 /**
  * vsp1_video_partition - Calculate the active partition output window
  *
@@ -293,6 +256,43 @@ static struct v4l2_rect vsp1_video_partition(struct vsp1_pipeline *pipe,
        return partition;
 }
 
+static void vsp1_video_pipeline_setup_partitions(struct vsp1_pipeline *pipe)
+{
+       struct vsp1_device *vsp1 = pipe->output->entity.vsp1;
+       const struct v4l2_mbus_framefmt *format;
+       struct vsp1_entity *entity;
+       unsigned int div_size;
+
+       /*
+        * Partitions are computed on the size before rotation, use the format
+        * at the WPF sink.
+        */
+       format = vsp1_entity_get_pad_format(&pipe->output->entity,
+                                           pipe->output->entity.config,
+                                           RWPF_PAD_SINK);
+       div_size = format->width;
+
+       /* Gen2 hardware doesn't require image partitioning. */
+       if (vsp1->info->gen == 2) {
+               pipe->div_size = div_size;
+               pipe->partitions = 1;
+               return;
+       }
+
+       list_for_each_entry(entity, &pipe->entities, list_pipe) {
+               unsigned int entity_max = VSP1_VIDEO_MAX_WIDTH;
+
+               if (entity->ops->max_width) {
+                       entity_max = entity->ops->max_width(entity, pipe);
+                       if (entity_max)
+                               div_size = min(div_size, entity_max);
+               }
+       }
+
+       pipe->div_size = div_size;
+       pipe->partitions = DIV_ROUND_UP(format->width, div_size);
+}
+
 /* -----------------------------------------------------------------------------
  * Pipeline Management
  */