Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af449da4 authored by Michael Rodin's avatar Michael Rodin Committed by Greg Kroah-Hartman
Browse files

media: vsp1: Fix offset calculation for plane cropping 



[ Upstream commit 5f25abec8f21b7527c1223a354d23c270befddb3 ]

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: e5ad37b6 ("[media] v4l: vsp1: Add cropping support")
Signed-off-by: default avatarMichael Rodin <mrodin@de.adit-jv.com>
Signed-off-by: default avatarLUU HOAI <hoai.luu.ub@renesas.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a3660e06

drivers/media/platform/vsp1/vsp1_rpf.c

+3 −3
Original line number Diff line number Diff line
@@ -290,11 +290,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;

	}