niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

media: ti-vpe: cal: Allow multiple contexts per subdev notifier

Browse source 
The subdev notifier handling assumes a 1:1 mapping between CAL contexts
and notifiers. To prepare for merging the multiple notifiers into a
single one, retrieve the CAL context from the async subdev structure
instead of from the notifier.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Laurent Pinchart 2020-07-06 20:36:22 +02:00 • committed by Mauro Carvalho Chehab
parent a439e57358
commit 8fcb7576ad
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/media/platform/ti-vpe/cal.c
View file

@ -2115,11 +2115,22 @@ static void cal_ctx_v4l2_cleanup(struct cal_ctx *ctx)
* ------------------------------------------------------------------ * ------------------------------------------------------------------
*/ */
struct cal_v4l2_async_subdev {
struct v4l2_async_subdev asd;
struct cal_ctx *ctx;
};
static inline struct cal_v4l2_async_subdev *
to_cal_asd(struct v4l2_async_subdev *asd)
{
return container_of(asd, struct cal_v4l2_async_subdev, asd);
}
static int cal_async_bound(struct v4l2_async_notifier *notifier, static int cal_async_bound(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *subdev, struct v4l2_subdev *subdev,
struct v4l2_async_subdev *asd) struct v4l2_async_subdev *asd)
{ {
struct cal_ctx *ctx = notifier_to_ctx(notifier); struct cal_ctx *ctx = to_cal_asd(asd)->ctx;
if (ctx->phy->sensor) { if (ctx->phy->sensor) {
ctx_info(ctx, "Rejecting subdev %s (Already set!!)", ctx_info(ctx, "Rejecting subdev %s (Already set!!)",
@ -2148,6 +2159,7 @@ static const struct v4l2_async_notifier_operations cal_async_ops = {
static int of_cal_create_instance(struct cal_ctx *ctx, int inst) static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
{ {
struct cal_v4l2_async_subdev *casd;
struct v4l2_async_subdev *asd; struct v4l2_async_subdev *asd;
struct fwnode_handle *fwnode; struct fwnode_handle *fwnode;
int ret; int ret;
@ -2163,6 +2175,9 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
return PTR_ERR(asd); return PTR_ERR(asd);
} }
casd = to_cal_asd(asd);
casd->ctx = ctx;
ret = v4l2_async_notifier_register(&ctx->cal->v4l2_dev, ret = v4l2_async_notifier_register(&ctx->cal->v4l2_dev,
&ctx->notifier); &ctx->notifier);
if (ret) { if (ret) {