Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
---
drivers/media/video/cpia2/cpia2.h | 1 +
drivers/media/video/ivtv/ivtv-driver.h | 2 -
drivers/media/video/ivtv/ivtv-fileops.c | 2 -
drivers/media/video/ivtv/ivtv-ioctl.c | 41 ----------
drivers/media/video/v4l2-common.c | 60 ---------------
drivers/media/video/v4l2-dev.c | 3 +-
drivers/media/video/v4l2-ioctl.c | 124 +++++++++++++++++++++++++++++--
include/media/v4l2-common.h | 15 ----
include/media/v4l2-device.h | 2 +-
include/media/v4l2-ioctl.h | 26 +++++--
10 files changed, 141 insertions(+), 135 deletions(-)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 0395b1c..f3aa8cb 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -27,6 +27,7 @@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-fh.h>
#include <media/v4l2-event.h>
+#include <media/v4l2-device.h>
#include <media/v4l2-chip-ident.h>
#define dbgarg(cmd, fmt, arg...) \
@@ -611,6 +672,7 @@ static long __video_do_ioctl(struct file *file,
{
struct video_device *vfd = video_devdata(file);
const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
+ enum v4l2_priority prio = V4L2_PRIORITY_UNSET;
void *fh = file->private_data;
long ret = -EINVAL;
@@ -640,6 +702,40 @@ static long __video_do_ioctl(struct file *file,
printk(KERN_CONT "\n");
}
+ if (test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags))
+ prio = ((struct v4l2_fh *)fh)->prio;
+ else if (test_bit(V4L2_FL_USES_V4L2_PRIO, &vfd->flags))
+ prio = (enum v4l2_priority)fh;
+ if (prio != V4L2_PRIORITY_UNSET) {
+ switch (cmd) {
+ case VIDIOC_S_CTRL:
+ case VIDIOC_S_STD:
+ case VIDIOC_S_INPUT:
+ case VIDIOC_S_OUTPUT:
+ case VIDIOC_S_TUNER:
+ case VIDIOC_S_FREQUENCY:
+ case VIDIOC_S_FMT:
+ case VIDIOC_S_CROP:
+ case VIDIOC_S_AUDIO:
+ case VIDIOC_S_AUDOUT:
+ case VIDIOC_S_EXT_CTRLS:
+ case VIDIOC_S_FBUF:
+ case VIDIOC_S_PRIORITY:
+ case VIDIOC_S_DV_PRESET:
+ case VIDIOC_S_DV_TIMINGS:
+ case VIDIOC_S_JPEGCOMP:
+ case VIDIOC_S_MODULATOR:
+ case VIDIOC_S_PARM:
+ case VIDIOC_S_HW_FREQ_SEEK:
+ case VIDIOC_ENCODER_CMD:
+ case VIDIOC_OVERLAY:
+ ret = v4l2_prio_check(&vfd->v4l2_dev->prio, prio);
+ if (ret)
+ goto exit_prio;
+ break;
+ }
+ }
+
switch (cmd) {
#ifdef CONFIG_VIDEO_V4L1_COMPAT
@@ -689,9 +785,14 @@ static long __video_do_ioctl(struct file *file,
{
enum v4l2_priority *p = arg;
- if (!ops->vidioc_g_priority)
- break;
- ret = ops->vidioc_g_priority(file, fh, p);
+ if (!ops->vidioc_g_priority) {
+ if (prio == V4L2_PRIORITY_UNSET)
+ break;
+ *p = v4l2_prio_max(&vfd->v4l2_dev->prio);
+ ret = 0;
+ } else {
+ ret = ops->vidioc_g_priority(file, fh, p);
+ }
if (!ret)
dbgarg(cmd, "priority is %d\n", *p);
break;
@@ -700,10 +801,20 @@ static long __video_do_ioctl(struct file *file,
{
enum v4l2_priority *p = arg;
- if (!ops->vidioc_s_priority)
- break;
+ if (!ops->vidioc_s_priority && prio == V4L2_PRIORITY_UNSET)
+ break;
dbgarg(cmd, "setting priority to %d\n", *p);
- ret = ops->vidioc_s_priority(file, fh, *p);
+ if (ops->vidioc_s_priority) {
+ ret = ops->vidioc_s_priority(file, fh, *p);
+ } else {
+ ret = v4l2_prio_change(&vfd->v4l2_dev->prio, &prio, *p);
+ if (!ret) {
+ if (test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags))
+ ((struct v4l2_fh *)fh)->prio = prio;
+ else
+ file->private_data = (void *)prio;
+ }
+ }
break;
}
@@ -2010,6 +2121,7 @@ static long __video_do_ioctl(struct file *file,
}
} /* switch */
+exit_prio:
if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {
if (ret < 0) {
v4l_print_ioctl(vfd->name, cmd);
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
