Commit 5964c90a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Hans Verkuil
Browse files

media: rkisp1: Fix line stride calculation 



The line stride is expressed in the hardware as a number of pixels for
the first plane. The bytesperline must thus be a multiple of the first
plane's bpp value. Enforce this constraint.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 1f3ba4b8

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c

+13 −7
Original line number Diff line number Diff line
@@ -1101,14 +1101,20 @@ rkisp1_fill_pixfmt(struct v4l2_pix_format_mplane *pixm, 
	memset(pixm->plane_fmt, 0, sizeof(pixm->plane_fmt));

	info = v4l2_format_info(pixm->pixelformat);

	pixm->num_planes = info->mem_planes;

	stride = info->bpp[0] * pixm->width;

	/* Self path supports custom stride but Main path doesn't */

	if (id == RKISP1_MAINPATH || plane_y->bytesperline < stride)

		plane_y->bytesperline = stride;

	plane_y->sizeimage = plane_y->bytesperline * pixm->height;



	/* normalize stride to pixels per line */

	stride = DIV_ROUND_UP(plane_y->bytesperline, info->bpp[0]);

	/*

	 * The SP supports custom strides, expressed as a number of pixels for

	 * the Y plane. Clamp the stride to a reasonable value to avoid integer

	 * overflows when calculating the bytesperline and sizeimage values.

	 */

	if (id == RKISP1_SELFPATH)

		stride = clamp(DIV_ROUND_UP(plane_y->bytesperline, info->bpp[0]),

			       pixm->width, 65536U);

	else

		stride = pixm->width;



	plane_y->bytesperline = stride * info->bpp[0];

	plane_y->sizeimage = plane_y->bytesperline * pixm->height;



	for (i = 1; i < info->comp_planes; i++) {

		struct v4l2_plane_pix_format *plane = &pixm->plane_fmt[i];