Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a8e07b2 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: vsp1: Set entities functions 



Initialize the function field of all subdev entities instantiated by the
driver. This gets rids of multiple warnings printed by the media
controller core.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 8d954abe

drivers/media/platform/vsp1/vsp1_bru.c

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1) 
	bru->entity.type = VSP1_ENTITY_BRU;



	ret = vsp1_entity_init(vsp1, &bru->entity, "bru",

			       vsp1->info->num_bru_inputs + 1, &bru_ops);

			       vsp1->info->num_bru_inputs + 1, &bru_ops,

			       MEDIA_ENT_F_PROC_VIDEO_COMPOSER);

	if (ret < 0)

		return ERR_PTR(ret);

drivers/media/platform/vsp1/vsp1_entity.c

+2 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static const struct vsp1_route vsp1_routes[] = { 


int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

		     const char *name, unsigned int num_pads,

		     const struct v4l2_subdev_ops *ops)

		     const struct v4l2_subdev_ops *ops, u32 function)

{

	struct v4l2_subdev *subdev;

	unsigned int i;
@@ -381,6 +381,7 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, 
	subdev = &entity->subdev;

	v4l2_subdev_init(subdev, ops);



	subdev->entity.function = function;

	subdev->entity.ops = &vsp1->media_ops;

	subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

drivers/media/platform/vsp1/vsp1_entity.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static inline struct vsp1_entity *to_vsp1_entity(struct v4l2_subdev *subdev) 


int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,

		     const char *name, unsigned int num_pads,

		     const struct v4l2_subdev_ops *ops);

		     const struct v4l2_subdev_ops *ops, u32 function);

void vsp1_entity_destroy(struct vsp1_entity *entity);



extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;

drivers/media/platform/vsp1/vsp1_hsit.c

+3 −2
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse) 
	else

		hsit->entity.type = VSP1_ENTITY_HST;



	ret = vsp1_entity_init(vsp1, &hsit->entity, inverse ? "hsi" : "hst", 2,

			       &hsit_ops);

	ret = vsp1_entity_init(vsp1, &hsit->entity, inverse ? "hsi" : "hst",

			       2, &hsit_ops,

			       MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV);

	if (ret < 0)

		return ERR_PTR(ret);

drivers/media/platform/vsp1/vsp1_lif.c

+6 −1
Original line number Diff line number Diff line
@@ -165,7 +165,12 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1) 
	lif->entity.ops = &lif_entity_ops;

	lif->entity.type = VSP1_ENTITY_LIF;



	ret = vsp1_entity_init(vsp1, &lif->entity, "lif", 2, &lif_ops);

	/* The LIF is never exposed to userspace, but media entity registration

	 * requires a function to be set. Use PROC_VIDEO_PIXEL_FORMATTER just to

	 * avoid triggering a WARN_ON(), the value won't be seen anywhere.

	 */

	ret = vsp1_entity_init(vsp1, &lif->entity, "lif", 2, &lif_ops,

			       MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);

	if (ret < 0)

		return ERR_PTR(ret);