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

Commit 91707b8b authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-fimc: Fix G_FMT ioctl handler 



Use pix_mp member of struct v4l2_format to return a format
description rather than pix. Also fill in the plane_fmt array.
This is a missing bit of conversion to the multiplanar API.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1e004695

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

+23 −4
Original line number Diff line number Diff line
@@ -804,15 +804,33 @@ int fimc_vidioc_g_fmt_mplane(struct file *file, void *priv, 
{

	struct fimc_ctx *ctx = priv;

	struct fimc_frame *frame;

	struct v4l2_pix_format_mplane *pixm;

	int i;



	frame = ctx_get_frame(ctx, f->type);

	if (IS_ERR(frame))

		return PTR_ERR(frame);



	f->fmt.pix.width	= frame->width;

	f->fmt.pix.height	= frame->height;

	f->fmt.pix.field	= V4L2_FIELD_NONE;

	f->fmt.pix.pixelformat	= frame->fmt->fourcc;

	pixm = &f->fmt.pix_mp;



	pixm->width		= frame->width;

	pixm->height		= frame->height;

	pixm->field		= V4L2_FIELD_NONE;

	pixm->pixelformat	= frame->fmt->fourcc;

	pixm->colorspace	= V4L2_COLORSPACE_JPEG;

	pixm->num_planes	= frame->fmt->memplanes;



	for (i = 0; i < pixm->num_planes; ++i) {

		int bpl = frame->o_width;



		if (frame->fmt->colplanes == 1) /* packed formats */

			bpl = (bpl * frame->fmt->depth[0]) / 8;



		pixm->plane_fmt[i].bytesperline = bpl;



		pixm->plane_fmt[i].sizeimage = (frame->o_width *

			frame->o_height * frame->fmt->depth[i]) / 8;

	}



	return 0;

}
@@ -907,6 +925,7 @@ int fimc_vidioc_try_fmt_mplane(struct file *file, void *priv, 
		&pix->height, 8, variant->pix_limit->scaler_dis_w, mod_y, 0);



	pix->num_planes = fmt->memplanes;

	pix->colorspace	= V4L2_COLORSPACE_JPEG;



	for (i = 0; i < pix->num_planes; ++i) {

		int bpl = pix->plane_fmt[i].bytesperline;