summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/v4l2-common.h
diff options
context:
space:
mode:
authorHans Verkuil2014-03-04 11:46:47 +0100
committerMauro Carvalho Chehab2014-03-11 14:05:53 +0100
commit254a47770163f9322333660ebdabf99ba49873da (patch)
treeb7bf53f4662fe1d3e827d811b4fa42f329849597 /include/uapi/linux/v4l2-common.h
parent[media] v4l2-compat-ioctl32: fix wrong VIDIOC_SUBDEV_G/S_EDID32 support (diff)
downloadkernel-qcow2-linux-254a47770163f9322333660ebdabf99ba49873da.tar.gz
kernel-qcow2-linux-254a47770163f9322333660ebdabf99ba49873da.tar.xz
kernel-qcow2-linux-254a47770163f9322333660ebdabf99ba49873da.zip
[media] v4l2: allow v4l2_subdev_edid to be used with video nodes
Struct v4l2_subdev_edid and the VIDIOC_SUBDEV_G/S_EDID ioctls were specific for subdevices, but for hardware with a simple video pipeline you do not need/want to create subdevice nodes to just get/set the EDID. Move the v4l2_subdev_edid struct to v4l2-common.h and rename as v4l2_edid. Add the same ioctls to videodev2.h as well, thus allowing this API to be used with both video nodes and v4l-subdev nodes. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/uapi/linux/v4l2-common.h')
-rw-r--r--include/uapi/linux/v4l2-common.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h
index 4f0667e010dd..270db8914c01 100644
--- a/include/uapi/linux/v4l2-common.h
+++ b/include/uapi/linux/v4l2-common.h
@@ -68,4 +68,12 @@
#define V4L2_SUBDEV_SEL_FLAG_SIZE_LE V4L2_SEL_FLAG_LE
#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
+struct v4l2_edid {
+ __u32 pad;
+ __u32 start_block;
+ __u32 blocks;
+ __u32 reserved[5];
+ __u8 __user *edid;
+};
+
#endif /* __V4L2_COMMON__ */