media: vsp1: Fix offset calculation for plane cropping

The vertical subsampling factor is currently not considered in the
offset calculation for plane cropping done in rpf_configure_partition.
This causes a distortion (shift of the color plane) when formats with
the vsub factor larger than 1 are used (e.g. NV12, see
vsp1_video_formats in vsp1_pipe.c). This commit considers vsub factor
for all planes except plane 0 (luminance).

Drop generalization of the offset calculation to reduce the binary size.

Fixes: ac6496a7b3c2 ("[media] v4l: vsp1: Add cropping support")
Signed-off-by: Michael Rodin <mrodin@de.adit-jv.com>
Signed-off-by: LUU HOAI <hoai.luu.ub@renesas.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
index 85587c1b6a37320cac7a974eeaba4611858a794e..75083cb234fe35f7a4f74409b420ae88012d1c05 100644 (file)
--- a/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/renesas/vsp1/vsp1_rpf.c
@@ -291,11 +291,11 @@ static void rpf_configure_partition(struct vsp1_entity *entity,
                     + crop.left * fmtinfo->bpp[0] / 8;
 
        if (format->num_planes > 1) {
+               unsigned int bpl = format->plane_fmt[1].bytesperline;
                unsigned int offset;
 
-               offset = crop.top * format->plane_fmt[1].bytesperline
-                      + crop.left / fmtinfo->hsub
-                      * fmtinfo->bpp[1] / 8;
+               offset = crop.top / fmtinfo->vsub * bpl
+                      + crop.left / fmtinfo->hsub * fmtinfo->bpp[1] / 8;
                mem.addr[1] += offset;
                mem.addr[2] += offset;
        }