p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[media] v4l: vsp1: Extract link creation to separate function 

Link creation will be handled differently for the DU pipeline.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2015-08-02 18:21:12 -03:00 committed by Mauro Carvalho Chehab
parent f8562f218b
commit a07dcc53b1
1 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
drivers/media/platform/vsp1/vsp1_drv.c
View File

@ -67,7 +67,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
*/ */
/* /*
* vsp1_create_links - Create links from all sources to the given sink * vsp1_create_sink_links - Create links from all sources to the given sink
* *
* This function creates media links from all valid sources to the given sink * This function creates media links from all valid sources to the given sink
* pad. Links that would be invalid according to the VSP1 hardware capabilities * pad. Links that would be invalid according to the VSP1 hardware capabilities
@ -76,26 +76,14 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
* - from a UDS to a UDS (UDS entities can't be chained) * - from a UDS to a UDS (UDS entities can't be chained)
* - from an entity to itself (no loops are allowed) * - from an entity to itself (no loops are allowed)
*/ */
static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink) static int vsp1_create_sink_links(struct vsp1_device *vsp1,
struct vsp1_entity *sink)
{ {
struct media_entity *entity = &sink->subdev.entity; struct media_entity *entity = &sink->subdev.entity;
struct vsp1_entity *source; struct vsp1_entity *source;
unsigned int pad; unsigned int pad;
int ret; int ret;
if (sink->type == VSP1_ENTITY_RPF) {
struct vsp1_rwpf *rpf = to_rwpf(&sink->subdev);
/* RPFs have no source entities, just connect their source pad
* to their video device.
*/
return media_create_pad_link(&rpf->video->video.entity, 0,
&rpf->entity.subdev.entity,
RWPF_PAD_SINK,
MEDIA_LNK_FL_ENABLED |
MEDIA_LNK_FL_IMMUTABLE);
}
list_for_each_entry(source, &vsp1->entities, list_dev) { list_for_each_entry(source, &vsp1->entities, list_dev) {
u32 flags; u32 flags;
@ -126,21 +114,63 @@ static int vsp1_create_links(struct vsp1_device *vsp1, struct vsp1_entity *sink)
} }
} }
if (sink->type == VSP1_ENTITY_WPF) { return 0;
struct vsp1_rwpf *wpf = to_rwpf(&sink->subdev); }
unsigned int flags = MEDIA_LNK_FL_ENABLED;
static int vsp1_create_links(struct vsp1_device *vsp1)
{
struct vsp1_entity *entity;
unsigned int i;
int ret;
list_for_each_entry(entity, &vsp1->entities, list_dev) {
if (entity->type == VSP1_ENTITY_LIF ||
entity->type == VSP1_ENTITY_RPF)
continue;
ret = vsp1_create_sink_links(vsp1, entity);
if (ret < 0)
return ret;
}
if (vsp1->pdata.features & VSP1_HAS_LIF) {
ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
RWPF_PAD_SOURCE,
&vsp1->lif->entity.subdev.entity,
LIF_PAD_SINK, 0);
if (ret < 0)
return ret;
}
for (i = 0; i < vsp1->pdata.rpf_count; ++i) {
struct vsp1_rwpf *rpf = vsp1->rpf[i];
ret = media_create_pad_link(&rpf->video->video.entity, 0,
&rpf->entity.subdev.entity,
RWPF_PAD_SINK,
MEDIA_LNK_FL_ENABLED |
MEDIA_LNK_FL_IMMUTABLE);
if (ret < 0)
return ret;
}
for (i = 0; i < vsp1->pdata.wpf_count; ++i) {
/* Connect the video device to the WPF. All connections are /* Connect the video device to the WPF. All connections are
* immutable except for the WPF0 source link if a LIF is * immutable except for the WPF0 source link if a LIF is
* present. * present.
*/ */
if (!(vsp1->pdata.features & VSP1_HAS_LIF) || sink->index != 0) struct vsp1_rwpf *wpf = vsp1->wpf[i];
unsigned int flags = MEDIA_LNK_FL_ENABLED;
if (!(vsp1->pdata.features & VSP1_HAS_LIF) || i != 0)
flags |= MEDIA_LNK_FL_IMMUTABLE; flags |= MEDIA_LNK_FL_IMMUTABLE;
return media_create_pad_link(&wpf->entity.subdev.entity, ret = media_create_pad_link(&wpf->entity.subdev.entity,
RWPF_PAD_SOURCE, RWPF_PAD_SOURCE,
&wpf->video->video.entity, &wpf->video->video.entity, 0,
0, flags); flags);
if (ret < 0)
return ret;
} }
return 0; return 0;
@ -310,22 +340,9 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
} }
/* Create links. */ /* Create links. */
list_for_each_entry(entity, &vsp1->entities, list_dev) { ret = vsp1_create_links(vsp1);
if (entity->type == VSP1_ENTITY_LIF) if (ret < 0)
continue; goto done;
ret = vsp1_create_links(vsp1, entity);
if (ret < 0)
goto done;
}
if (vsp1->pdata.features & VSP1_HAS_LIF) {
ret = media_create_pad_link(
&vsp1->wpf[0]->entity.subdev.entity, RWPF_PAD_SOURCE,
&vsp1->lif->entity.subdev.entity, LIF_PAD_SINK, 0);
if (ret < 0)
return ret;
}
ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev); ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);
if (ret < 0) if (ret < 0)