media: renesas: vsp1: Store RPF partition configuration per RPF instance

The vsp1_partition structure stores the RPF partition configuration in a
single field for all RPF instances, while each RPF can have its own
configuration. Fix it by storing the configuration separately for each
RPF instance.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Fixes: ab45e8585182 ("media: v4l: vsp1: Allow entities to participate in the partition algorithm")
Reviewed-by: Jacopo Mondi <jacopo.mondi+renesas@ideasonboard.com>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_pipe.h b/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
index 02e98d8437303a770ffed102982241c299b820ab..840fd3288efb02f30604a6dcb117721853f29292 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
+++ b/drivers/media/platform/renesas/vsp1/vsp1_pipe.h
@@ -73,7 +73,7 @@ struct vsp1_partition_window {
  * @wpf: The WPF partition window configuration
  */
 struct vsp1_partition {
-       struct vsp1_partition_window rpf;
+       struct vsp1_partition_window rpf[VSP1_MAX_RPF];
        struct vsp1_partition_window uds_sink;
        struct vsp1_partition_window uds_source;
        struct vsp1_partition_window sru;

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
index 3e62638fdce606ff4380a0da009b7e8b942766a2..42b0c5655404149d65f00cf56df4cc6a2f1e09f6 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
@@ -311,8 +311,8 @@ static void rpf_configure_partition(struct vsp1_entity *entity,
         * 'width' need to be adjusted.
         */
        if (pipe->partitions > 1) {
-               crop.width = pipe->partition->rpf.width;
-               crop.left += pipe->partition->rpf.left;
+               crop.width = pipe->partition->rpf[rpf->entity.index].width;
+               crop.left += pipe->partition->rpf[rpf->entity.index].left;
        }
 
        if (pipe->interlaced) {
@@ -367,7 +367,9 @@ static void rpf_partition(struct vsp1_entity *entity,
                          unsigned int partition_idx,
                          struct vsp1_partition_window *window)
 {
-       partition->rpf = *window;
+       struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev);
+
+       partition->rpf[rpf->entity.index] = *window;
 }
 
 static const struct vsp1_entity_operations rpf_entity_ops = {