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

Commit 71d5e7af authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap_vout: Drop overlay format enumeration 



Enumerating formats for output overlays doesn't make sense, as the pixel
format is defined by the display API, not the V4L2 API. Drop the
vidioc_enum_fmt_vid_overlay ioctl operation.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 05ad6fc1

drivers/media/platform/omap/omap_vout.c

+0 −16
Original line number Diff line number Diff line
@@ -1232,21 +1232,6 @@ static int vidioc_s_fmt_vid_overlay(struct file *file, void *fh, 
	return ret;

}



static int vidioc_enum_fmt_vid_overlay(struct file *file, void *fh,

			struct v4l2_fmtdesc *fmt)

{

	int index = fmt->index;



	if (index >= NUM_OUTPUT_FORMATS)

		return -EINVAL;



	fmt->flags = omap_formats[index].flags;

	strlcpy(fmt->description, omap_formats[index].description,

			sizeof(fmt->description));

	fmt->pixelformat = omap_formats[index].pixelformat;

	return 0;

}



static int vidioc_g_fmt_vid_overlay(struct file *file, void *fh,

			struct v4l2_format *f)

{
@@ -1862,7 +1847,6 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = { 
	.vidioc_s_ctrl       			= vidioc_s_ctrl,

	.vidioc_try_fmt_vid_overlay 		= vidioc_try_fmt_vid_overlay,

	.vidioc_s_fmt_vid_overlay		= vidioc_s_fmt_vid_overlay,

	.vidioc_enum_fmt_vid_overlay		= vidioc_enum_fmt_vid_overlay,

	.vidioc_g_fmt_vid_overlay		= vidioc_g_fmt_vid_overlay,

	.vidioc_cropcap				= vidioc_cropcap,

	.vidioc_g_crop				= vidioc_g_crop,