Commit 4e1e0eb0 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: v4l2-ioctl: Zero v4l2_plane_pix_format reserved fields 



Make the core set the reserved fields to zero in
vv4l2_pix_format_mplane.4l2_plane_pix_format,
for _MPLANE queue types.

Moving this to the core avoids having to do so in each
and every driver.

Suggested-by: default avatarTomasz Figa <tfiga@chromium.org>
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 8f4c20cb

drivers/media/v4l2-core/v4l2-ioctl.c

+10 −0
Original line number Diff line number Diff line
@@ -1513,6 +1513,7 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
	struct v4l2_format *p = arg;

	struct video_device *vfd = video_devdata(file);

	int ret = check_fmt(file, p->type);

	unsigned int i;



	if (ret)

		return ret;
@@ -1537,6 +1538,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
		if (unlikely(!ops->vidioc_s_fmt_vid_cap_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		for (i = 0; i < p->fmt.pix_mp.num_planes; i++)

			CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline);

		return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OVERLAY:

		if (unlikely(!ops->vidioc_s_fmt_vid_overlay))
@@ -1565,6 +1568,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, 
		if (unlikely(!ops->vidioc_s_fmt_vid_out_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		for (i = 0; i < p->fmt.pix_mp.num_planes; i++)

			CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline);

		return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:

		if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay))
@@ -1605,6 +1610,7 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
{

	struct v4l2_format *p = arg;

	int ret = check_fmt(file, p->type);

	unsigned int i;



	if (ret)

		return ret;
@@ -1624,6 +1630,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
		if (unlikely(!ops->vidioc_try_fmt_vid_cap_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		for (i = 0; i < p->fmt.pix_mp.num_planes; i++)

			CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline);

		return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OVERLAY:

		if (unlikely(!ops->vidioc_try_fmt_vid_overlay))
@@ -1652,6 +1660,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, 
		if (unlikely(!ops->vidioc_try_fmt_vid_out_mplane))

			break;

		CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func);

		for (i = 0; i < p->fmt.pix_mp.num_planes; i++)

			CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline);

		return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg);

	case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY:

		if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay))