Re: [RFC/PATCH v4 11/11] v4l: Make v4l2_subdev inherit from media_entity
Hi Mauro,
On Thursday 09 September 2010 03:25:38 Mauro Carvalho Chehab wrote:
Em 20-08-2010 12:29, Laurent Pinchart escreveu:
V4L2 subdevices are media entities. As such they need to inherit from
(include) the media_entity structure.
When registering/unregistering the subdevice, the media entity is
automatically registered/unregistered. The entity is acquired on device
open and released on device close.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
Signed-off-by: Sakari Ailus sakari.ai...@maxwell.research.nokia.com
---
Documentation/video4linux/v4l2-framework.txt | 23 ++
drivers/media/video/v4l2-device.c| 32
+- drivers/media/video/v4l2-subdev.c
| 27 +- include/media/v4l2-subdev.h
|7 +
4 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/Documentation/video4linux/v4l2-framework.txt
b/Documentation/video4linux/v4l2-framework.txt index 7ff4016..3416d93
100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -263,6 +263,26 @@ A sub-device driver initializes the v4l2_subdev
struct using:
Afterwards you need to initialize subdev-name with a unique name and
set the module owner. This is done for you if you use the i2c helper
functions.
+If integration with the media framework is needed, you must initialize
the +media_entity struct embedded in the v4l2_subdev struct (entity
field) by +calling media_entity_init():
+
+ struct media_pad *pads = my_sd-pads;
+ int err;
+
+ err = media_entity_init(sd-entity, npads, pads, 0);
+
+The pads array must have been previously initialized. There is no need
to +manually set the struct media_entity type and name fields, but the
revision +field must be initialized if needed.
+
+A reference to the entity will be automatically acquired/released when
the +subdev device node (if any) is opened/closed.
+
+Don't forget to cleanup the media entity before the sub-device is
destroyed: +
+ media_entity_cleanup(sd-entity);
+
A device (bridge) driver needs to register the v4l2_subdev with the
v4l2_device:
@@ -272,6 +292,9 @@ This can fail if the subdev module disappeared before
it could be registered.
After this function was called successfully the subdev-dev field points
to the v4l2_device.
+If the v4l2_device parent device has a non-NULL mdev field, the
sub-device +entity will be automatically registered with the media
device.
+
You can unregister a sub-device using:
v4l2_device_unregister_subdev(sd);
diff --git a/drivers/media/video/v4l2-device.c
b/drivers/media/video/v4l2-device.c index 91452cd..4f74d01 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -114,10 +114,11 @@ void v4l2_device_unregister(struct v4l2_device
*v4l2_dev)
EXPORT_SYMBOL_GPL(v4l2_device_unregister);
int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
- struct v4l2_subdev *sd)
+ struct v4l2_subdev *sd)
{
+ struct media_entity *entity = sd-entity;
struct video_device *vdev;
- int ret = 0;
+ int ret;
/* Check for valid input */
if (v4l2_dev == NULL || sd == NULL || !sd-name[0])
@@ -129,6 +130,15 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (!try_module_get(sd-owner))
return -ENODEV;
+ /* Register the entity. */
+ if (v4l2_dev-mdev) {
+ ret = media_device_register_entity(v4l2_dev-mdev, entity);
+ if (ret 0) {
+ module_put(sd-owner);
+ return ret;
+ }
+ }
+
sd-v4l2_dev = v4l2_dev;
spin_lock(v4l2_dev-lock);
list_add_tail(sd-list, v4l2_dev-subdevs);
@@ -143,26 +153,36 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (sd-flags V4L2_SUBDEV_FL_HAS_DEVNODE) {
ret = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
sd-owner);
- if (ret 0)
+ if (ret 0) {
v4l2_device_unregister_subdev(sd);
+ return ret;
+ }
}
- return ret;
+ entity-v4l.major = VIDEO_MAJOR;
+ entity-v4l.minor = vdev-minor;
Hmm... it needs to check if entity is not null.
Entity is set to
struct media_entity *entity = sd-entity;
It can't be NULL.
+ return 0;
}
EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
{
+ struct v4l2_device *v4l2_dev;
+
/* return if it isn't registered */
if (sd == NULL ||
Re: [RFC/PATCH v4 11/11] v4l: Make v4l2_subdev inherit from media_entity
Em 20-08-2010 12:29, Laurent Pinchart escreveu:
V4L2 subdevices are media entities. As such they need to inherit from
(include) the media_entity structure.
When registering/unregistering the subdevice, the media entity is
automatically registered/unregistered. The entity is acquired on device
open and released on device close.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
Signed-off-by: Sakari Ailus sakari.ai...@maxwell.research.nokia.com
---
Documentation/video4linux/v4l2-framework.txt | 23 ++
drivers/media/video/v4l2-device.c| 32
+-
drivers/media/video/v4l2-subdev.c| 27 +-
include/media/v4l2-subdev.h |7 +
4 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/Documentation/video4linux/v4l2-framework.txt
b/Documentation/video4linux/v4l2-framework.txt
index 7ff4016..3416d93 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -263,6 +263,26 @@ A sub-device driver initializes the v4l2_subdev struct
using:
Afterwards you need to initialize subdev-name with a unique name and set the
module owner. This is done for you if you use the i2c helper functions.
+If integration with the media framework is needed, you must initialize the
+media_entity struct embedded in the v4l2_subdev struct (entity field) by
+calling media_entity_init():
+
+ struct media_pad *pads = my_sd-pads;
+ int err;
+
+ err = media_entity_init(sd-entity, npads, pads, 0);
+
+The pads array must have been previously initialized. There is no need to
+manually set the struct media_entity type and name fields, but the revision
+field must be initialized if needed.
+
+A reference to the entity will be automatically acquired/released when the
+subdev device node (if any) is opened/closed.
+
+Don't forget to cleanup the media entity before the sub-device is destroyed:
+
+ media_entity_cleanup(sd-entity);
+
A device (bridge) driver needs to register the v4l2_subdev with the
v4l2_device:
@@ -272,6 +292,9 @@ This can fail if the subdev module disappeared before it
could be registered.
After this function was called successfully the subdev-dev field points to
the v4l2_device.
+If the v4l2_device parent device has a non-NULL mdev field, the sub-device
+entity will be automatically registered with the media device.
+
You can unregister a sub-device using:
v4l2_device_unregister_subdev(sd);
diff --git a/drivers/media/video/v4l2-device.c
b/drivers/media/video/v4l2-device.c
index 91452cd..4f74d01 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -114,10 +114,11 @@ void v4l2_device_unregister(struct v4l2_device
*v4l2_dev)
EXPORT_SYMBOL_GPL(v4l2_device_unregister);
int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
- struct v4l2_subdev *sd)
+ struct v4l2_subdev *sd)
{
+ struct media_entity *entity = sd-entity;
struct video_device *vdev;
- int ret = 0;
+ int ret;
/* Check for valid input */
if (v4l2_dev == NULL || sd == NULL || !sd-name[0])
@@ -129,6 +130,15 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (!try_module_get(sd-owner))
return -ENODEV;
+ /* Register the entity. */
+ if (v4l2_dev-mdev) {
+ ret = media_device_register_entity(v4l2_dev-mdev, entity);
+ if (ret 0) {
+ module_put(sd-owner);
+ return ret;
+ }
+ }
+
sd-v4l2_dev = v4l2_dev;
spin_lock(v4l2_dev-lock);
list_add_tail(sd-list, v4l2_dev-subdevs);
@@ -143,26 +153,36 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (sd-flags V4L2_SUBDEV_FL_HAS_DEVNODE) {
ret = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
sd-owner);
- if (ret 0)
+ if (ret 0) {
v4l2_device_unregister_subdev(sd);
+ return ret;
+ }
}
- return ret;
+ entity-v4l.major = VIDEO_MAJOR;
+ entity-v4l.minor = vdev-minor;
Hmm... it needs to check if entity is not null.
+ return 0;
}
EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
{
+ struct v4l2_device *v4l2_dev;
+
/* return if it isn't registered */
if (sd == NULL || sd-v4l2_dev == NULL)
return;
- spin_lock(sd-v4l2_dev-lock);
+ v4l2_dev = sd-v4l2_dev;
+
+ spin_lock(v4l2_dev-lock);
list_del(sd-list);
- spin_unlock(sd-v4l2_dev-lock);
+ spin_unlock(v4l2_dev-lock);
sd-v4l2_dev = NULL;
[RFC/PATCH v4 11/11] v4l: Make v4l2_subdev inherit from media_entity
V4L2 subdevices are media entities. As such they need to inherit from
(include) the media_entity structure.
When registering/unregistering the subdevice, the media entity is
automatically registered/unregistered. The entity is acquired on device
open and released on device close.
Signed-off-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
Signed-off-by: Sakari Ailus sakari.ai...@maxwell.research.nokia.com
---
Documentation/video4linux/v4l2-framework.txt | 23 ++
drivers/media/video/v4l2-device.c| 32 +-
drivers/media/video/v4l2-subdev.c| 27 +-
include/media/v4l2-subdev.h |7 +
4 files changed, 82 insertions(+), 7 deletions(-)
diff --git a/Documentation/video4linux/v4l2-framework.txt
b/Documentation/video4linux/v4l2-framework.txt
index 7ff4016..3416d93 100644
--- a/Documentation/video4linux/v4l2-framework.txt
+++ b/Documentation/video4linux/v4l2-framework.txt
@@ -263,6 +263,26 @@ A sub-device driver initializes the v4l2_subdev struct
using:
Afterwards you need to initialize subdev-name with a unique name and set the
module owner. This is done for you if you use the i2c helper functions.
+If integration with the media framework is needed, you must initialize the
+media_entity struct embedded in the v4l2_subdev struct (entity field) by
+calling media_entity_init():
+
+ struct media_pad *pads = my_sd-pads;
+ int err;
+
+ err = media_entity_init(sd-entity, npads, pads, 0);
+
+The pads array must have been previously initialized. There is no need to
+manually set the struct media_entity type and name fields, but the revision
+field must be initialized if needed.
+
+A reference to the entity will be automatically acquired/released when the
+subdev device node (if any) is opened/closed.
+
+Don't forget to cleanup the media entity before the sub-device is destroyed:
+
+ media_entity_cleanup(sd-entity);
+
A device (bridge) driver needs to register the v4l2_subdev with the
v4l2_device:
@@ -272,6 +292,9 @@ This can fail if the subdev module disappeared before it
could be registered.
After this function was called successfully the subdev-dev field points to
the v4l2_device.
+If the v4l2_device parent device has a non-NULL mdev field, the sub-device
+entity will be automatically registered with the media device.
+
You can unregister a sub-device using:
v4l2_device_unregister_subdev(sd);
diff --git a/drivers/media/video/v4l2-device.c
b/drivers/media/video/v4l2-device.c
index 91452cd..4f74d01 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -114,10 +114,11 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev)
EXPORT_SYMBOL_GPL(v4l2_device_unregister);
int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
- struct v4l2_subdev *sd)
+ struct v4l2_subdev *sd)
{
+ struct media_entity *entity = sd-entity;
struct video_device *vdev;
- int ret = 0;
+ int ret;
/* Check for valid input */
if (v4l2_dev == NULL || sd == NULL || !sd-name[0])
@@ -129,6 +130,15 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (!try_module_get(sd-owner))
return -ENODEV;
+ /* Register the entity. */
+ if (v4l2_dev-mdev) {
+ ret = media_device_register_entity(v4l2_dev-mdev, entity);
+ if (ret 0) {
+ module_put(sd-owner);
+ return ret;
+ }
+ }
+
sd-v4l2_dev = v4l2_dev;
spin_lock(v4l2_dev-lock);
list_add_tail(sd-list, v4l2_dev-subdevs);
@@ -143,26 +153,36 @@ int v4l2_device_register_subdev(struct v4l2_device
*v4l2_dev,
if (sd-flags V4L2_SUBDEV_FL_HAS_DEVNODE) {
ret = __video_register_device(vdev, VFL_TYPE_SUBDEV, -1, 1,
sd-owner);
- if (ret 0)
+ if (ret 0) {
v4l2_device_unregister_subdev(sd);
+ return ret;
+ }
}
- return ret;
+ entity-v4l.major = VIDEO_MAJOR;
+ entity-v4l.minor = vdev-minor;
+ return 0;
}
EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
{
+ struct v4l2_device *v4l2_dev;
+
/* return if it isn't registered */
if (sd == NULL || sd-v4l2_dev == NULL)
return;
- spin_lock(sd-v4l2_dev-lock);
+ v4l2_dev = sd-v4l2_dev;
+
+ spin_lock(v4l2_dev-lock);
list_del(sd-list);
- spin_unlock(sd-v4l2_dev-lock);
+ spin_unlock(v4l2_dev-lock);
sd-v4l2_dev = NULL;
module_put(sd-owner);
+ if (v4l2_dev-mdev)
+ media_device_unregister_entity(sd-entity);
