[media] s5p-fimc: Honour sizeimage in VIDIOC_S_FMT (d547ab66) · Commits · 戴 / test

drivers/media/video/s5p-fimc/fimc-capture.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -350,7 +350,8 @@ static int queue_setup(struct vb2_queue vq, const struct v4l2_format pfmt,
		if (pixm)
		sizes[i] = max(size, pixm->plane_fmt[i].sizeimage);
		else
		sizes[i] = size;
		sizes[i] = max_t(u32, size, frame->payload[i]);

		allocators[i] = ctx->fimc_dev->alloc_ctx;
		}

		@@ -924,10 +925,10 @@ static int fimc_capture_set_format(struct fimc_dev fimc, struct v4l2_format f)
		pix->width = mf->width;
		pix->height = mf->height;
		}

		fimc_adjust_mplane_format(ff->fmt, pix->width, pix->height, pix);
		for (i = 0; i < ff->fmt->colplanes; i++)
		ff->payload[i] =
		(pix->width * pix->height * ff->fmt->depth[i]) / 8;
		ff->payload[i] = pix->plane_fmt[i].sizeimage;

		set_frame_bounds(ff, pix->width, pix->height);
		/* Reset the composition rectangle if not yet configured */

+5 −4

Original line number	Diff line number	Diff line
		@@ -741,8 +741,8 @@ void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,
		pix->width = width;

		for (i = 0; i < pix->num_planes; ++i) {
		u32 bpl = pix->plane_fmt[i].bytesperline;
		u32 *sizeimage = &pix->plane_fmt[i].sizeimage;
		struct v4l2_plane_pix_format *plane_fmt = &pix->plane_fmt[i];
		u32 bpl = plane_fmt->bytesperline;

		if (fmt->colplanes > 1 && (bpl == 0 \|\| bpl < pix->width))
		bpl = pix->width; /* Planar */
		@@ -754,8 +754,9 @@ void fimc_adjust_mplane_format(struct fimc_fmt *fmt, u32 width, u32 height,
		if (i == 0) /* Same bytesperline for each plane. */
		bytesperline = bpl;

		pix->plane_fmt[i].bytesperline = bytesperline;
		sizeimage = (pix->width pix->height * fmt->depth[i]) / 8;
		plane_fmt->bytesperline = bytesperline;
		plane_fmt->sizeimage = max((pix->width * pix->height *
		fmt->depth[i]) / 8, plane_fmt->sizeimage);
		}
		}