Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / media / platform / vsp1 / vsp1_rpf.c

diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
index 3888389..b2e34a8 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rpf.c
@@ -46,34 +46,22 @@ static const struct v4l2_subdev_ops rpf_ops = {
  * VSP1 Entity Operations
  */
 
-static void rpf_set_memory(struct vsp1_entity *entity, struct vsp1_dl_list *dl)
-{
-       struct vsp1_rwpf *rpf = entity_to_rwpf(entity);
-
-       vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_Y,
-                      rpf->mem.addr[0] + rpf->offsets[0]);
-       vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C0,
-                      rpf->mem.addr[1] + rpf->offsets[1]);
-       vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C1,
-                      rpf->mem.addr[2] + rpf->offsets[1]);
-}
-
 static void rpf_configure(struct vsp1_entity *entity,
                          struct vsp1_pipeline *pipe,
-                         struct vsp1_dl_list *dl, bool full)
+                         struct vsp1_dl_list *dl,
+                         enum vsp1_entity_params params)
 {
        struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev);
        const struct vsp1_format_info *fmtinfo = rpf->fmtinfo;
        const struct v4l2_pix_format_mplane *format = &rpf->format;
        const struct v4l2_mbus_framefmt *source_format;
        const struct v4l2_mbus_framefmt *sink_format;
-       const struct v4l2_rect *crop;
        unsigned int left = 0;
        unsigned int top = 0;
        u32 pstride;
        u32 infmt;
 
-       if (!full) {
+       if (params == VSP1_ENTITY_PARAMS_RUNTIME) {
                vsp1_rpf_write(rpf, dl, VI6_RPF_VRTCOL_SET,
                               rpf->alpha << VI6_RPF_VRTCOL_SET_LAYA_SHIFT);
                vsp1_rpf_write(rpf, dl, VI6_RPF_MULT_ALPHA, rpf->mult_alpha |
@@ -83,34 +71,80 @@ static void rpf_configure(struct vsp1_entity *entity,
                return;
        }
 
-       /* Source size, stride and crop offsets.
-        *
-        * The crop offsets correspond to the location of the crop rectangle top
-        * left corner in the plane buffer. Only two offsets are needed, as
-        * planes 2 and 3 always have identical strides.
-        */
-       crop = vsp1_rwpf_get_crop(rpf, rpf->entity.config);
+       if (params == VSP1_ENTITY_PARAMS_PARTITION) {
+               unsigned int offsets[2];
+               struct v4l2_rect crop;
+
+               /*
+                * Source size and crop offsets.
+                *
+                * The crop offsets correspond to the location of the crop
+                * rectangle top left corner in the plane buffer. Only two
+                * offsets are needed, as planes 2 and 3 always have identical
+                * strides.
+                */
+               crop = *vsp1_rwpf_get_crop(rpf, rpf->entity.config);
+
+               /*
+                * Partition Algorithm Control
+                *
+                * The partition algorithm can split this frame into multiple
+                * slices. We must scale our partition window based on the pipe
+                * configuration to match the destination partition window.
+                * To achieve this, we adjust our crop to provide a 'sub-crop'
+                * matching the expected partition window. Only 'left' and
+                * 'width' need to be adjusted.
+                */
+               if (pipe->partitions > 1) {
+                       const struct v4l2_mbus_framefmt *output;
+                       struct vsp1_entity *wpf = &pipe->output->entity;
+                       unsigned int input_width = crop.width;
+
+                       /*
+                        * Scale the partition window based on the configuration
+                        * of the pipeline.
+                        */
+                       output = vsp1_entity_get_pad_format(wpf, wpf->config,
+                                                           RWPF_PAD_SOURCE);
 
-       vsp1_rpf_write(rpf, dl, VI6_RPF_SRC_BSIZE,
-                      (crop->width << VI6_RPF_SRC_BSIZE_BHSIZE_SHIFT) |
-                      (crop->height << VI6_RPF_SRC_BSIZE_BVSIZE_SHIFT));
-       vsp1_rpf_write(rpf, dl, VI6_RPF_SRC_ESIZE,
-                      (crop->width << VI6_RPF_SRC_ESIZE_EHSIZE_SHIFT) |
-                      (crop->height << VI6_RPF_SRC_ESIZE_EVSIZE_SHIFT));
+                       crop.width = pipe->partition.width * input_width
+                                  / output->width;
+                       crop.left += pipe->partition.left * input_width
+                                  / output->width;
+               }
+
+               vsp1_rpf_write(rpf, dl, VI6_RPF_SRC_BSIZE,
+                              (crop.width << VI6_RPF_SRC_BSIZE_BHSIZE_SHIFT) |
+                              (crop.height << VI6_RPF_SRC_BSIZE_BVSIZE_SHIFT));
+               vsp1_rpf_write(rpf, dl, VI6_RPF_SRC_ESIZE,
+                              (crop.width << VI6_RPF_SRC_ESIZE_EHSIZE_SHIFT) |
+                              (crop.height << VI6_RPF_SRC_ESIZE_EVSIZE_SHIFT));
+
+               offsets[0] = crop.top * format->plane_fmt[0].bytesperline
+                          + crop.left * fmtinfo->bpp[0] / 8;
+
+               if (format->num_planes > 1)
+                       offsets[1] = crop.top * format->plane_fmt[1].bytesperline
+                                  + crop.left / fmtinfo->hsub
+                                  * fmtinfo->bpp[1] / 8;
+               else
+                       offsets[1] = 0;
+
+               vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_Y,
+                              rpf->mem.addr[0] + offsets[0]);
+               vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C0,
+                              rpf->mem.addr[1] + offsets[1]);
+               vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C1,
+                              rpf->mem.addr[2] + offsets[1]);
+               return;
+       }
 
-       rpf->offsets[0] = crop->top * format->plane_fmt[0].bytesperline
-                       + crop->left * fmtinfo->bpp[0] / 8;
+       /* Stride */
        pstride = format->plane_fmt[0].bytesperline
                << VI6_RPF_SRCM_PSTRIDE_Y_SHIFT;
-
-       if (format->num_planes > 1) {
-               rpf->offsets[1] = crop->top * format->plane_fmt[1].bytesperline
-                               + crop->left * fmtinfo->bpp[1] / 8;
+       if (format->num_planes > 1)
                pstride |= format->plane_fmt[1].bytesperline
                        << VI6_RPF_SRCM_PSTRIDE_C_SHIFT;
-       } else {
-               rpf->offsets[1] = 0;
-       }
 
        vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_PSTRIDE, pstride);
 
@@ -215,7 +249,6 @@ static void rpf_configure(struct vsp1_entity *entity,
 }
 
 static const struct vsp1_entity_operations rpf_entity_ops = {
-       .set_memory = rpf_set_memory,
        .configure = rpf_configure,
 };