V4L/DVB: v4l2: hook up the new control framework into the core framework

Add the calls needed to automatically merge subdev controls into a bridge
control handler.

Hook up the control framework in __video_ioctl2 and video_register_device.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 33 insertions, 13 deletions

diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 0eeceae50329..dd9283fcb564 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -26,6 +26,7 @@
 #endif
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-chip-ident.h>
@@ -1259,9 +1260,12 @@ static long __video_do_ioctl(struct file *file,
         {
                 struct v4l2_queryctrl *p = arg;
 
-                if (!ops->vidioc_queryctrl)
+                if (vfd->ctrl_handler)
+                        ret = v4l2_queryctrl(vfd->ctrl_handler, p);
+                else if (ops->vidioc_queryctrl)
+                        ret = ops->vidioc_queryctrl(file, fh, p);
+                else
                         break;
-                ret = ops->vidioc_queryctrl(file, fh, p);
                 if (!ret)
                         dbgarg(cmd, "id=0x%x, type=%d, name=%s, min/max=%d/%d, "
                                         "step=%d, default=%d, flags=0x%08x\n",
@@ -1276,7 +1280,9 @@ static long __video_do_ioctl(struct file *file,
         {
                 struct v4l2_control *p = arg;
 
-                if (ops->vidioc_g_ctrl)
+                if (vfd->ctrl_handler)
+                        ret = v4l2_g_ctrl(vfd->ctrl_handler, p);
+                else if (ops->vidioc_g_ctrl)
                         ret = ops->vidioc_g_ctrl(file, fh, p);
                 else if (ops->vidioc_g_ext_ctrls) {
                         struct v4l2_ext_controls ctrls;
@@ -1306,11 +1312,16 @@ static long __video_do_ioctl(struct file *file,
                 struct v4l2_ext_controls ctrls;
                 struct v4l2_ext_control ctrl;
 
-                if (!ops->vidioc_s_ctrl && !ops->vidioc_s_ext_ctrls)
+                if (!vfd->ctrl_handler &&
+                        !ops->vidioc_s_ctrl && !ops->vidioc_s_ext_ctrls)
                         break;
 
                 dbgarg(cmd, "id=0x%x, value=%d\n", p->id, p->value);
 
+                if (vfd->ctrl_handler) {
+                        ret = v4l2_s_ctrl(vfd->ctrl_handler, p);
+                        break;
+                }
                 if (ops->vidioc_s_ctrl) {
                         ret = ops->vidioc_s_ctrl(file, fh, p);
                         break;
@@ -1332,10 +1343,12 @@ static long __video_do_ioctl(struct file *file,
                 struct v4l2_ext_controls *p = arg;
 
                 p->error_idx = p->count;
-                if (!ops->vidioc_g_ext_ctrls)
-                        break;
-                if (check_ext_ctrls(p, 0))
+                if (vfd->ctrl_handler)
+                        ret = v4l2_g_ext_ctrls(vfd->ctrl_handler, p);
+                else if (ops->vidioc_g_ext_ctrls && check_ext_ctrls(p, 0))
                         ret = ops->vidioc_g_ext_ctrls(file, fh, p);
+                else
+                        break;
                 v4l_print_ext_ctrls(cmd, vfd, p, !ret);
                 break;
         }
@@ -1344,10 +1357,12 @@ static long __video_do_ioctl(struct file *file,
                 struct v4l2_ext_controls *p = arg;
 
                 p->error_idx = p->count;
-                if (!ops->vidioc_s_ext_ctrls)
+                if (!vfd->ctrl_handler && !ops->vidioc_s_ext_ctrls)
                         break;
                 v4l_print_ext_ctrls(cmd, vfd, p, 1);
-                if (check_ext_ctrls(p, 0))
+                if (vfd->ctrl_handler)
+                        ret = v4l2_s_ext_ctrls(vfd->ctrl_handler, p);
+                else if (check_ext_ctrls(p, 0))
                         ret = ops->vidioc_s_ext_ctrls(file, fh, p);
                 break;
         }
@@ -1356,10 +1371,12 @@ static long __video_do_ioctl(struct file *file,
                 struct v4l2_ext_controls *p = arg;
 
                 p->error_idx = p->count;
-                if (!ops->vidioc_try_ext_ctrls)
+                if (!vfd->ctrl_handler && !ops->vidioc_try_ext_ctrls)
                         break;
                 v4l_print_ext_ctrls(cmd, vfd, p, 1);
-                if (check_ext_ctrls(p, 0))
+                if (vfd->ctrl_handler)
+                        ret = v4l2_try_ext_ctrls(vfd->ctrl_handler, p);
+                else if (check_ext_ctrls(p, 0))
                         ret = ops->vidioc_try_ext_ctrls(file, fh, p);
                 break;
         }
@@ -1367,9 +1384,12 @@ static long __video_do_ioctl(struct file *file,
         {
                 struct v4l2_querymenu *p = arg;
 
-                if (!ops->vidioc_querymenu)
+                if (vfd->ctrl_handler)
+                        ret = v4l2_querymenu(vfd->ctrl_handler, p);
+                else if (ops->vidioc_querymenu)
+                        ret = ops->vidioc_querymenu(file, fh, p);
+                else
                         break;
-                ret = ops->vidioc_querymenu(file, fh, p);
                 if (!ret)
                         dbgarg(cmd, "id=0x%x, index=%d, name=%s\n",
                                 p->id, p->index, p->name);