summaryrefslogtreecommitdiff
path: root/include/media/v4l2-ioctl.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-07 07:18:37 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:54:57 +0900
commit34b57b13d8e43413b481d89f1436171cb5c959fd (patch)
tree76798f25ea5d61408026b92a22050bf263b5fa43 /include/media/v4l2-ioctl.h
parentb5fe5c40b01b92a17e340cfb799dbc2e5fa2cd9d (diff)
downloadlinux-3.10-34b57b13d8e43413b481d89f1436171cb5c959fd.tar.gz
linux-3.10-34b57b13d8e43413b481d89f1436171cb5c959fd.tar.bz2
linux-3.10-34b57b13d8e43413b481d89f1436171cb5c959fd.zip
upstream: [media] v4l2: add VIDIOC_G/S_EDID support to the v4l2 core
Support this ioctl as part of the v4l2 core. Use the new ioctl name and struct v4l2_edid type in the existing core code. 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/media/v4l2-ioctl.h')
-rw-r--r--include/media/v4l2-ioctl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
index 931652f0e2a..4f6d7e32b64 100644
--- a/include/media/v4l2-ioctl.h
+++ b/include/media/v4l2-ioctl.h
@@ -267,6 +267,8 @@ struct v4l2_ioctl_ops {
struct v4l2_enum_dv_timings *timings);
int (*vidioc_dv_timings_cap) (struct file *file, void *fh,
struct v4l2_dv_timings_cap *cap);
+ int (*vidioc_g_edid) (struct file *file, void *fh, struct v4l2_edid *edid);
+ int (*vidioc_s_edid) (struct file *file, void *fh, struct v4l2_edid *edid);
int (*vidioc_subscribe_event) (struct v4l2_fh *fh,
const struct v4l2_event_subscription *sub);