Commit 8fcb7576 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent a439e573

drivers/media/platform/ti-vpe/cal.c

+16 −1
Original line number Diff line number Diff line
@@ -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,

			   struct v4l2_subdev *subdev,

			   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) {

		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)

{

	struct cal_v4l2_async_subdev *casd;

	struct v4l2_async_subdev *asd;

	struct fwnode_handle *fwnode;

	int ret;
@@ -2163,6 +2175,9 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst) 
		return PTR_ERR(asd);

	}



	casd = to_cal_asd(asd);

	casd->ctx = ctx;



	ret = v4l2_async_notifier_register(&ctx->cal->v4l2_dev,

					   &ctx->notifier);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE