hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] s5p-fimc: Don't create multiple active links to same sink entity 

The driver is supposed to create active media link from sensor N
(or its corresponding s5p-mipi-csis entity) to FIMC.N by default.
Instead s5p-mipi-csis.N entity gets  always connected by a default
active link to FIMC.N, regardless of there are parallel bus sensor
entities already connected to FIMC.N. Correct this.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki 2012-05-16 13:08:30 -03:00 committed by Mauro Carvalho Chehab
parent 90e614bb4c
commit d0da3c3565
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/video/s5p-fimc/fimc-mdevice.c
View File

@ -502,12 +502,12 @@ static void fimc_md_unregister_entities(struct fimc_md *fmd)
* @source: the source entity to create links to all fimc entities from * @source: the source entity to create links to all fimc entities from
* @sensor: sensor subdev linked to FIMC[fimc_id] entity, may be null * @sensor: sensor subdev linked to FIMC[fimc_id] entity, may be null
* @pad: the source entity pad index * @pad: the source entity pad index
* @fimc_id: index of the fimc device for which link should be enabled * @link_mask: bitmask of the fimc devices for which link should be enabled
*/ */
static int __fimc_md_create_fimc_sink_links(struct fimc_md *fmd, static int __fimc_md_create_fimc_sink_links(struct fimc_md *fmd,
struct media_entity *source, struct media_entity *source,
struct v4l2_subdev *sensor, struct v4l2_subdev *sensor,
int pad, int fimc_id) int pad, int link_mask)
{ {
struct fimc_sensor_info *s_info; struct fimc_sensor_info *s_info;
struct media_entity *sink; struct media_entity *sink;
@ -524,7 +524,7 @@ static int __fimc_md_create_fimc_sink_links(struct fimc_md *fmd,
if (!fmd->fimc[i]->variant->has_cam_if) if (!fmd->fimc[i]->variant->has_cam_if)
continue; continue;
flags = (i == fimc_id) ? MEDIA_LNK_FL_ENABLED : 0; flags = ((1 << i) & link_mask) ? MEDIA_LNK_FL_ENABLED : 0;
sink = &fmd->fimc[i]->vid_cap.subdev.entity; sink = &fmd->fimc[i]->vid_cap.subdev.entity;
ret = media_entity_create_link(source, pad, sink, ret = media_entity_create_link(source, pad, sink,
@ -556,7 +556,10 @@ static int __fimc_md_create_fimc_sink_links(struct fimc_md *fmd,
if (!fmd->fimc_lite[i]) if (!fmd->fimc_lite[i])
continue; continue;
flags = (i == fimc_id) ? MEDIA_LNK_FL_ENABLED : 0; if (link_mask & (1 << (i + FIMC_MAX_DEVS)))
flags = MEDIA_LNK_FL_ENABLED;
else
flags = 0;
sink = &fmd->fimc_lite[i]->subdev.entity; sink = &fmd->fimc_lite[i]->subdev.entity;
ret = media_entity_create_link(source, pad, sink, ret = media_entity_create_link(source, pad, sink,
@ -618,9 +621,8 @@ static int fimc_md_create_links(struct fimc_md *fmd)
struct s5p_fimc_isp_info *pdata; struct s5p_fimc_isp_info *pdata;
struct fimc_sensor_info *s_info; struct fimc_sensor_info *s_info;
struct media_entity *source, *sink; struct media_entity *source, *sink;
int i, pad, fimc_id = 0; int i, pad, fimc_id = 0, ret = 0;
int ret = 0; u32 flags, link_mask = 0;
u32 flags;
for (i = 0; i < fmd->num_sensors; i++) { for (i = 0; i < fmd->num_sensors; i++) {
if (fmd->sensor[i].subdev == NULL) if (fmd->sensor[i].subdev == NULL)
@ -672,19 +674,20 @@ static int fimc_md_create_links(struct fimc_md *fmd)
if (source == NULL) if (source == NULL)
continue; continue;
link_mask = 1 << fimc_id++;
ret = __fimc_md_create_fimc_sink_links(fmd, source, sensor, ret = __fimc_md_create_fimc_sink_links(fmd, source, sensor,
pad, fimc_id++); pad, link_mask);
} }
fimc_id = 0;
for (i = 0; i < ARRAY_SIZE(fmd->csis); i++) { for (i = 0; i < ARRAY_SIZE(fmd->csis); i++) {
if (fmd->csis[i].sd == NULL) if (fmd->csis[i].sd == NULL)
continue; continue;
source = &fmd->csis[i].sd->entity; source = &fmd->csis[i].sd->entity;
pad = CSIS_PAD_SOURCE; pad = CSIS_PAD_SOURCE;
link_mask = 1 << fimc_id++;
ret = __fimc_md_create_fimc_sink_links(fmd, source, NULL, ret = __fimc_md_create_fimc_sink_links(fmd, source, NULL,
pad, fimc_id++); pad, link_mask);
} }
/* Create immutable links between each FIMC's subdev and video node */ /* Create immutable links between each FIMC's subdev and video node */