openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Laurent Pinchart 2016-02-15 22:10:26 -02:00 committed by Mauro Carvalho Chehab
parent 8d954abe30
commit 6a8e07b215
10 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/platform/vsp1/vsp1_bru.c
View File

@ -390,7 +390,8 @@ struct vsp1_bru *vsp1_bru_create(struct vsp1_device *vsp1)
bru->entity.type = VSP1_ENTITY_BRU; bru->entity.type = VSP1_ENTITY_BRU;
ret = vsp1_entity_init(vsp1, &bru->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) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_entity.c
View File

@ -340,7 +340,7 @@ static const struct vsp1_route vsp1_routes[] = {
int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity, int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
const char *name, unsigned int num_pads, 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; struct v4l2_subdev *subdev;
unsigned int i; unsigned int i;
@ -381,6 +381,7 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
subdev = &entity->subdev; subdev = &entity->subdev;
v4l2_subdev_init(subdev, ops); v4l2_subdev_init(subdev, ops);
subdev->entity.function = function;
subdev->entity.ops = &vsp1->media_ops; subdev->entity.ops = &vsp1->media_ops;
subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; subdev->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;

2
drivers/media/platform/vsp1/vsp1_entity.h
View File

@ -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, int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
const char *name, unsigned int num_pads, 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); void vsp1_entity_destroy(struct vsp1_entity *entity);
extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops; extern const struct v4l2_subdev_internal_ops vsp1_subdev_internal_ops;

5
drivers/media/platform/vsp1/vsp1_hsit.c
View File

@ -161,8 +161,9 @@ struct vsp1_hsit *vsp1_hsit_create(struct vsp1_device *vsp1, bool inverse)
else else
hsit->entity.type = VSP1_ENTITY_HST; hsit->entity.type = VSP1_ENTITY_HST;
ret = vsp1_entity_init(vsp1, &hsit->entity, inverse ? "hsi" : "hst", 2, ret = vsp1_entity_init(vsp1, &hsit->entity, inverse ? "hsi" : "hst",
&hsit_ops); 2, &hsit_ops,
MEDIA_ENT_F_PROC_VIDEO_PIXEL_ENC_CONV);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

7
drivers/media/platform/vsp1/vsp1_lif.c
View File

@ -165,7 +165,12 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)
lif->entity.ops = &lif_entity_ops; lif->entity.ops = &lif_entity_ops;
lif->entity.type = VSP1_ENTITY_LIF; 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) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_lut.c
View File

@ -204,7 +204,8 @@ struct vsp1_lut *vsp1_lut_create(struct vsp1_device *vsp1)
lut->entity.ops = &lut_entity_ops; lut->entity.ops = &lut_entity_ops;
lut->entity.type = VSP1_ENTITY_LUT; lut->entity.type = VSP1_ENTITY_LUT;
ret = vsp1_entity_init(vsp1, &lut->entity, "lut", 2, &lut_ops); ret = vsp1_entity_init(vsp1, &lut->entity, "lut", 2, &lut_ops,
MEDIA_ENT_F_PROC_VIDEO_LUT);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_rpf.c
View File

@ -237,7 +237,8 @@ struct vsp1_rwpf *vsp1_rpf_create(struct vsp1_device *vsp1, unsigned int index)
rpf->entity.index = index; rpf->entity.index = index;
sprintf(name, "rpf.%u", index); sprintf(name, "rpf.%u", index);
ret = vsp1_entity_init(vsp1, &rpf->entity, name, 2, &rpf_ops); ret = vsp1_entity_init(vsp1, &rpf->entity, name, 2, &rpf_ops,
MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_sru.c
View File

@ -308,7 +308,8 @@ struct vsp1_sru *vsp1_sru_create(struct vsp1_device *vsp1)
sru->entity.ops = &sru_entity_ops; sru->entity.ops = &sru_entity_ops;
sru->entity.type = VSP1_ENTITY_SRU; sru->entity.type = VSP1_ENTITY_SRU;
ret = vsp1_entity_init(vsp1, &sru->entity, "sru", 2, &sru_ops); ret = vsp1_entity_init(vsp1, &sru->entity, "sru", 2, &sru_ops,
MEDIA_ENT_F_PROC_VIDEO_SCALER);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_uds.c
View File

@ -314,7 +314,8 @@ struct vsp1_uds *vsp1_uds_create(struct vsp1_device *vsp1, unsigned int index)
uds->entity.index = index; uds->entity.index = index;
sprintf(name, "uds.%u", index); sprintf(name, "uds.%u", index);
ret = vsp1_entity_init(vsp1, &uds->entity, name, 2, &uds_ops); ret = vsp1_entity_init(vsp1, &uds->entity, name, 2, &uds_ops,
MEDIA_ENT_F_PROC_VIDEO_SCALER);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);

3
drivers/media/platform/vsp1/vsp1_wpf.c
View File

@ -216,7 +216,8 @@ struct vsp1_rwpf *vsp1_wpf_create(struct vsp1_device *vsp1, unsigned int index)
wpf->entity.index = index; wpf->entity.index = index;
sprintf(name, "wpf.%u", index); sprintf(name, "wpf.%u", index);
ret = vsp1_entity_init(vsp1, &wpf->entity, name, 2, &wpf_ops); ret = vsp1_entity_init(vsp1, &wpf->entity, name, 2, &wpf_ops,
MEDIA_ENT_F_PROC_VIDEO_PIXEL_FORMATTER);
if (ret < 0) if (ret < 0)
return ERR_PTR(ret); return ERR_PTR(ret);