media: Revert "media: staging/intel-ipu3: make imgu use fixed running mode"

This reverts commit e878742c83ec26ef256ebb6b36a4d44644548f25.

Imgu should still keep the capability and flexibility to allow user to
run 2 video pipes, as the user may use the video pipe to capture still
frames with less system load and power than still pipe.

Suggested-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Bingbu Cao <bingbu.cao@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/Documentation/media/v4l-drivers/ipu3.rst b/Documentation/media/v4l-drivers/ipu3.rst
index 50bd264a34081324028a8c69d94ec2b3ee938643..e4904ab44e60da6a9d27b5f7293aa94bbc2a3f3a 100644 (file)
--- a/Documentation/media/v4l-drivers/ipu3.rst
+++ b/Documentation/media/v4l-drivers/ipu3.rst
@@ -234,9 +234,9 @@ The IPU3 ImgU pipelines can be configured using the Media Controller, defined at
 Firmware binary selection
 -------------------------
 
-The firmware binary is selected according to the running mode of imgu. There are
-2 modes are available - "video" and "still". "ipu3-imgu video" are running under
-"video" mode and "ipu3-imgu still" is running under "still" mode.
+The firmware binary is selected using the V4L2_CID_INTEL_IPU3_MODE, currently
+defined in drivers/staging/media/ipu3/include/intel-ipu3.h . "VIDEO" and "STILL"
+modes are available.
 
 Processing the image in raw Bayer format
 ----------------------------------------

diff --git a/drivers/staging/media/ipu3/include/intel-ipu3.h b/drivers/staging/media/ipu3/include/intel-ipu3.h
index 37afb8d596d0b2f015cfffec1462417c7401e7c5..1c9c3ba4d518dae30d63e387e0b97b9316dd887e 100644 (file)
--- a/drivers/staging/media/ipu3/include/intel-ipu3.h
+++ b/drivers/staging/media/ipu3/include/intel-ipu3.h
@@ -12,6 +12,10 @@
 #define V4L2_META_FMT_IPU3_PARAMS      v4l2_fourcc('i', 'p', '3', 'p') /* IPU3 processing parameters */
 #define V4L2_META_FMT_IPU3_STAT_3A     v4l2_fourcc('i', 'p', '3', 's') /* IPU3 3A statistics */
 
+/* from include/uapi/linux/v4l2-controls.h */
+#define V4L2_CID_INTEL_IPU3_BASE       (V4L2_CID_USER_BASE + 0x10c0)
+#define V4L2_CID_INTEL_IPU3_MODE       (V4L2_CID_INTEL_IPU3_BASE + 1)
+
 /******************* ipu3_uapi_stats_3a *******************/
 
 #define IPU3_UAPI_MAX_STRIPES                          2

diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
index 45de77baf08034c921929868bfa397e681c8535b..569e27b824c855db852bd8733243c08262734f60 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3-v4l2.c
+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
@@ -67,6 +67,8 @@ static int imgu_subdev_s_stream(struct v4l2_subdev *sd, int enable)
        struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
 
        dev_dbg(dev, "%s %d for pipe %u", __func__, enable, pipe);
+       /* grab ctrl after streamon and return after off */
+       v4l2_ctrl_grab(imgu_sd->ctrl, enable);
 
        if (!enable) {
                imgu_sd->active = false;
@@ -94,7 +96,7 @@ static int imgu_subdev_s_stream(struct v4l2_subdev *sd, int enable)
        if (imgu_pipe->nodes[IMGU_NODE_VF].enabled)
                css_pipe->vf_output_en = true;
 
-       if (imgu_sd->running_mode == IPU3_RUNNING_MODE_VIDEO)
+       if (atomic_read(&imgu_sd->running_mode) == IPU3_RUNNING_MODE_VIDEO)
                css_pipe->pipe_id = IPU3_CSS_PIPE_ID_VIDEO;
        else
                css_pipe->pipe_id = IPU3_CSS_PIPE_ID_CAPTURE;
@@ -666,7 +668,7 @@ static int imgu_fmt(struct imgu_device *imgu, unsigned int pipe, int node,
        if (imgu_pipe->nodes[IMGU_NODE_VF].enabled)
                css_pipe->vf_output_en = true;
 
-       if (imgu_sd->running_mode == IPU3_RUNNING_MODE_VIDEO)
+       if (atomic_read(&imgu_sd->running_mode) == IPU3_RUNNING_MODE_VIDEO)
                css_pipe->pipe_id = IPU3_CSS_PIPE_ID_VIDEO;
        else
                css_pipe->pipe_id = IPU3_CSS_PIPE_ID_CAPTURE;
@@ -897,6 +899,11 @@ static struct v4l2_subdev_internal_ops imgu_subdev_internal_ops = {
        .open = imgu_subdev_open,
 };
 
+static const struct v4l2_subdev_core_ops imgu_subdev_core_ops = {
+       .subscribe_event = v4l2_ctrl_subdev_subscribe_event,
+       .unsubscribe_event = v4l2_event_subdev_unsubscribe,
+};
+
 static const struct v4l2_subdev_video_ops imgu_subdev_video_ops = {
        .s_stream = imgu_subdev_s_stream,
 };
@@ -910,6 +917,7 @@ static const struct v4l2_subdev_pad_ops imgu_subdev_pad_ops = {
 };
 
 static const struct v4l2_subdev_ops imgu_subdev_ops = {
+       .core = &imgu_subdev_core_ops,
        .video = &imgu_subdev_video_ops,
        .pad = &imgu_subdev_pad_ops,
 };
@@ -1003,6 +1011,44 @@ static const struct v4l2_ioctl_ops imgu_v4l2_meta_ioctl_ops = {
        .vidioc_expbuf = vb2_ioctl_expbuf,
 };
 
+static int imgu_sd_s_ctrl(struct v4l2_ctrl *ctrl)
+{
+       struct imgu_v4l2_subdev *imgu_sd =
+               container_of(ctrl->handler, struct imgu_v4l2_subdev, ctrl_handler);
+       struct imgu_device *imgu = v4l2_get_subdevdata(&imgu_sd->subdev);
+       struct device *dev = &imgu->pci_dev->dev;
+
+       dev_dbg(dev, "set val %d to ctrl 0x%8x for subdev %u",
+               ctrl->val, ctrl->id, imgu_sd->pipe);
+
+       switch (ctrl->id) {
+       case V4L2_CID_INTEL_IPU3_MODE:
+               atomic_set(&imgu_sd->running_mode, ctrl->val);
+               return 0;
+       default:
+               return -EINVAL;
+       }
+}
+
+static const struct v4l2_ctrl_ops imgu_subdev_ctrl_ops = {
+       .s_ctrl = imgu_sd_s_ctrl,
+};
+
+static const char * const imgu_ctrl_mode_strings[] = {
+       "Video mode",
+       "Still mode",
+};
+
+static const struct v4l2_ctrl_config imgu_subdev_ctrl_mode = {
+       .ops = &imgu_subdev_ctrl_ops,
+       .id = V4L2_CID_INTEL_IPU3_MODE,
+       .name = "IPU3 Pipe Mode",
+       .type = V4L2_CTRL_TYPE_MENU,
+       .max = ARRAY_SIZE(imgu_ctrl_mode_strings) - 1,
+       .def = IPU3_RUNNING_MODE_VIDEO,
+       .qmenu = imgu_ctrl_mode_strings,
+};
+
 /******************** Framework registration ********************/
 
 /* helper function to config node's video properties */
@@ -1048,6 +1094,7 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
                                     unsigned int pipe)
 {
        int i, r;
+       struct v4l2_ctrl_handler *hdl = &imgu_sd->ctrl_handler;
        struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe];
 
        /* Initialize subdev media entity */
@@ -1068,12 +1115,21 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
        v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops);
        imgu_sd->subdev.entity.function = MEDIA_ENT_F_PROC_VIDEO_STATISTICS;
        imgu_sd->subdev.internal_ops = &imgu_subdev_internal_ops;
-       imgu_sd->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE;
+       imgu_sd->subdev.flags = V4L2_SUBDEV_FL_HAS_DEVNODE |
+                               V4L2_SUBDEV_FL_HAS_EVENTS;
        snprintf(imgu_sd->subdev.name, sizeof(imgu_sd->subdev.name),
-                "%s %s", IMGU_NAME, pipe ? "still" : "video");
+                "%s %u", IMGU_NAME, pipe);
        v4l2_set_subdevdata(&imgu_sd->subdev, imgu);
-       imgu_sd->running_mode =
-               pipe ? IPU3_RUNNING_MODE_STILL : IPU3_RUNNING_MODE_VIDEO;
+       atomic_set(&imgu_sd->running_mode, IPU3_RUNNING_MODE_VIDEO);
+       v4l2_ctrl_handler_init(hdl, 1);
+       imgu_sd->subdev.ctrl_handler = hdl;
+       imgu_sd->ctrl = v4l2_ctrl_new_custom(hdl, &imgu_subdev_ctrl_mode, NULL);
+       if (hdl->error) {
+               r = hdl->error;
+               dev_err(&imgu->pci_dev->dev,
+                       "failed to create subdev v4l2 ctrl with err %d", r);
+               goto fail_subdev;
+       }
        r = v4l2_device_register_subdev(&imgu->v4l2_dev, &imgu_sd->subdev);
        if (r) {
                dev_err(&imgu->pci_dev->dev,
@@ -1085,6 +1141,7 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu,
        return 0;
 
 fail_subdev:
+       v4l2_ctrl_handler_free(imgu_sd->subdev.ctrl_handler);
        media_entity_cleanup(&imgu_sd->subdev.entity);
 
        return r;
@@ -1179,8 +1236,8 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe,
        }
 
        /* Initialize vdev */
-       snprintf(vdev->name, sizeof(vdev->name), "%s %s %s",
-                IMGU_NAME, pipe ? "still" : "video", node->name);
+       snprintf(vdev->name, sizeof(vdev->name), "%s %u %s",
+                IMGU_NAME, pipe, node->name);
        vdev->release = video_device_release_empty;
        vdev->fops = &imgu_v4l2_fops;
        vdev->lock = &node->lock;
@@ -1255,6 +1312,7 @@ static void imgu_v4l2_subdev_cleanup(struct imgu_device *imgu, unsigned int i)
        struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[i];
 
        v4l2_device_unregister_subdev(&imgu_pipe->imgu_sd.subdev);
+       v4l2_ctrl_handler_free(imgu_pipe->imgu_sd.subdev.ctrl_handler);
        media_entity_cleanup(&imgu_pipe->imgu_sd.subdev.entity);
 }
 

diff --git a/drivers/staging/media/ipu3/ipu3.h b/drivers/staging/media/ipu3/ipu3.h
index de02a244732e722fb96569c606632be4e10dcc16..73b123b2b8a2d9faca81d82839f777acfdda7a8c 100644 (file)
--- a/drivers/staging/media/ipu3/ipu3.h
+++ b/drivers/staging/media/ipu3/ipu3.h
@@ -7,6 +7,7 @@
 #include <linux/iova.h>
 #include <linux/pci.h>
 
+#include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
 #include <media/videobuf2-dma-sg.h>
 
@@ -95,7 +96,9 @@ struct imgu_v4l2_subdev {
                struct v4l2_rect bds; /* bayer-domain scaled resolution*/
                struct v4l2_rect gdc; /* gdc output resolution */
        } rect;
-       unsigned int running_mode;
+       struct v4l2_ctrl_handler ctrl_handler;
+       struct v4l2_ctrl *ctrl;
+       atomic_t running_mode;
        bool active;
 };