This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: subdev: Add checks for subdev features
Author:  Tomi Valkeinen <tomi.valkei...@ideasonboard.com>
Date:    Wed Apr 24 18:39:06 2024 +0300

Add some checks to verify that the subdev driver implements required
features.

A subdevice that supports streams (V4L2_SUBDEV_FL_STREAMS) must do one
of the following:

- Implement neither .enable/disable_streams() nor .s_stream(), if the
  subdev is part of a video driver that uses an internal method to
  enable the subdev.
- Implement only .enable/disable_streams(), if support for legacy
  sink-side subdevices is not needed.
- Implement .enable/disable_streams() and .s_stream(), if support for
  legacy sink-side subdevices is needed.

At the moment the framework doesn't check this requirement. Add the
check.

Reviewed-by: Umang Jain <umang.j...@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
Tested-by: Umang Jain <umang.j...@ideasonboard.com>
Signed-off-by: Tomi Valkeinen <tomi.valkei...@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ai...@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>

 drivers/media/v4l2-core/v4l2-subdev.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

---

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c 
b/drivers/media/v4l2-core/v4l2-subdev.c
index 56df3906eee6..09b4122d9ab7 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1588,6 +1588,33 @@ int __v4l2_subdev_init_finalize(struct v4l2_subdev *sd, 
const char *name,
                                struct lock_class_key *key)
 {
        struct v4l2_subdev_state *state;
+       struct device *dev = sd->dev;
+       bool has_disable_streams;
+       bool has_enable_streams;
+       bool has_s_stream;
+
+       /* Check that the subdevice implements the required features */
+
+       has_s_stream = v4l2_subdev_has_op(sd, video, s_stream);
+       has_enable_streams = v4l2_subdev_has_op(sd, pad, enable_streams);
+       has_disable_streams = v4l2_subdev_has_op(sd, pad, disable_streams);
+
+       if (has_enable_streams != has_disable_streams) {
+               dev_err(dev,
+                       "subdev '%s' must implement both or neither of 
.enable_streams() and .disable_streams()\n",
+                       sd->name);
+               return -EINVAL;
+       }
+
+       if (sd->flags & V4L2_SUBDEV_FL_STREAMS) {
+               if (has_s_stream && !has_enable_streams) {
+                       dev_err(dev,
+                               "subdev '%s' must implement 
.enable/disable_streams()\n",
+                               sd->name);
+
+                       return -EINVAL;
+               }
+       }
 
        state = __v4l2_subdev_state_alloc(sd, name, key);
        if (IS_ERR(state))

Reply via email to