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

Commit 7208507e authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-tv: Report only multi-plane capabilities in vidioc_querycap 



The mixer video node supports only multi-planar API so the driver
should not be setting V4L2_CAP_VIDEO_OUTPUT flags. Fix this and
also switch to device_caps. Additionally fix the VIDIOC_ENUM_FMT
ioctl handler which now works for V4L2_BUF_TYPE_CAPTURE, rather
than expected V4L2_BUF_TYPE_CAPTURE_MPLANE.

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 81c9bcfb

drivers/media/platform/s5p-tv/mixer_video.c

+3 −4
Original line number Diff line number Diff line
@@ -164,9 +164,8 @@ static int mxr_querycap(struct file *file, void *priv, 
	strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof cap->driver);

	strlcpy(cap->card, layer->vfd.name, sizeof cap->card);

	sprintf(cap->bus_info, "%d", layer->idx);

	cap->version = KERNEL_VERSION(0, 1, 0);

	cap->capabilities = V4L2_CAP_STREAMING |

		V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE;

	cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE;

	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;



	return 0;

}
@@ -718,7 +717,7 @@ static int mxr_streamoff(struct file *file, void *priv, enum v4l2_buf_type i) 
static const struct v4l2_ioctl_ops mxr_ioctl_ops = {

	.vidioc_querycap = mxr_querycap,

	/* format handling */

	.vidioc_enum_fmt_vid_out = mxr_enum_fmt,

	.vidioc_enum_fmt_vid_out_mplane = mxr_enum_fmt,

	.vidioc_s_fmt_vid_out_mplane = mxr_s_fmt,

	.vidioc_g_fmt_vid_out_mplane = mxr_g_fmt,

	/* buffer control */