hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: v4l: async: Prepare for async sub-device notifiers 

Refactor the V4L2 async framework a little in preparation for async
sub-device notifiers. This avoids making some structural changes in the
patch actually implementing sub-device notifiers, making that patch easier
to review.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Sakari Ailus 2017-09-24 20:48:08 -04:00 committed by Mauro Carvalho Chehab
parent 479bc5a8c6
commit a3620cb48d
1 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
drivers/media/v4l2-core/v4l2-async.c
View File

@ -125,12 +125,13 @@ static struct v4l2_async_subdev *v4l2_async_find_match(
} }
static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
struct v4l2_device *v4l2_dev,
struct v4l2_subdev *sd, struct v4l2_subdev *sd,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
{ {
int ret; int ret;
ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd); ret = v4l2_device_register_subdev(v4l2_dev, sd);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -151,6 +152,29 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
return 0; return 0;
} }
/* Test all async sub-devices in a notifier for a match. */
static int v4l2_async_notifier_try_all_subdevs(
struct v4l2_async_notifier *notifier)
{
struct v4l2_device *v4l2_dev = notifier->v4l2_dev;
struct v4l2_subdev *sd, *tmp;
list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
struct v4l2_async_subdev *asd;
int ret;
asd = v4l2_async_find_match(notifier, sd);
if (!asd)
continue;
ret = v4l2_async_match_notify(notifier, v4l2_dev, sd, asd);
if (ret < 0)
return ret;
}
return 0;
}
static void v4l2_async_cleanup(struct v4l2_subdev *sd) static void v4l2_async_cleanup(struct v4l2_subdev *sd)
{ {
v4l2_device_unregister_subdev(sd); v4l2_device_unregister_subdev(sd);
@ -172,18 +196,15 @@ static void v4l2_async_notifier_unbind_all_subdevs(
} }
} }
int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev, static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
struct v4l2_async_notifier *notifier)
{ {
struct v4l2_subdev *sd, *tmp;
struct v4l2_async_subdev *asd; struct v4l2_async_subdev *asd;
int ret; int ret;
int i; int i;
if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS) if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
return -EINVAL; return -EINVAL;
notifier->v4l2_dev = v4l2_dev;
INIT_LIST_HEAD(&notifier->waiting); INIT_LIST_HEAD(&notifier->waiting);
INIT_LIST_HEAD(&notifier->done); INIT_LIST_HEAD(&notifier->done);
@ -216,18 +237,10 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
mutex_lock(&list_lock); mutex_lock(&list_lock);
list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) { ret = v4l2_async_notifier_try_all_subdevs(notifier);
int ret; if (ret) {
mutex_unlock(&list_lock);
asd = v4l2_async_find_match(notifier, sd); return ret;
if (!asd)
continue;
ret = v4l2_async_match_notify(notifier, sd, asd);
if (ret < 0) {
mutex_unlock(&list_lock);
return ret;
}
} }
if (list_empty(&notifier->waiting)) { if (list_empty(&notifier->waiting)) {
@ -250,6 +263,23 @@ err_complete:
return ret; return ret;
} }
int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier)
{
int ret;
if (WARN_ON(!v4l2_dev))
return -EINVAL;
notifier->v4l2_dev = v4l2_dev;
ret = __v4l2_async_notifier_register(notifier);
if (ret)
notifier->v4l2_dev = NULL;
return ret;
}
EXPORT_SYMBOL(v4l2_async_notifier_register); EXPORT_SYMBOL(v4l2_async_notifier_register);
void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
@ -324,7 +354,8 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
if (!asd) if (!asd)
continue; continue;
ret = v4l2_async_match_notify(notifier, sd, asd); ret = v4l2_async_match_notify(notifier, notifier->v4l2_dev, sd,
asd);
if (ret) if (ret)
goto err_unlock; goto err_unlock;