Skip to content

Commit

Permalink
[media] s5p-fimc: Update graph traversal for entities with multiple s…
Browse files Browse the repository at this point in the history
…ource pads

We cannot assume that the passed entity the fimc_pipeline_prepare()
function is supposed to start the media graph traversal from will
always have its sink pad at pad index 0. Find the starting media
entity's sink pad by iterating over its all pads and checking the
pad flags. This ensures proper handling of FIMC, FIMC-LITE and
FIMC-IS-ISP subdevs that have more than one sink and one source pad.

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>
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Mar 31, 2013
1 parent 76323e5 commit 39bb6df
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions drivers/media/platform/s5p-fimc/fimc-mdevice.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,35 @@ static int __fimc_md_set_camclk(struct fimc_md *fmd,
bool on);
/**
* fimc_pipeline_prepare - update pipeline information with subdevice pointers
* @fimc: fimc device terminating the pipeline
* @me: media entity terminating the pipeline
*
* Caller holds the graph mutex.
*/
static void fimc_pipeline_prepare(struct fimc_pipeline *p,
struct media_entity *me)
{
struct media_pad *pad = &me->pads[0];
struct v4l2_subdev *sd;
int i;

for (i = 0; i < IDX_MAX; i++)
p->subdevs[i] = NULL;

while (1) {
if (!(pad->flags & MEDIA_PAD_FL_SINK))
break;
struct media_pad *pad = NULL;

/* Find remote source pad */
for (i = 0; i < me->num_pads; i++) {
struct media_pad *spad = &me->pads[i];
if (!(spad->flags & MEDIA_PAD_FL_SINK))
continue;
pad = media_entity_remote_source(spad);
if (pad)
break;
}

/* source pad */
pad = media_entity_remote_source(pad);
if (pad == NULL ||
media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
break;

sd = media_entity_to_v4l2_subdev(pad->entity);

switch (sd->grp_id) {
Expand All @@ -84,8 +89,9 @@ static void fimc_pipeline_prepare(struct fimc_pipeline *p,
pr_warn("%s: Unknown subdev grp_id: %#x\n",
__func__, sd->grp_id);
}
/* sink pad */
pad = &sd->entity.pads[0];
me = &sd->entity;
if (me->num_pads == 1)
break;
}
}

Expand Down

0 comments on commit 39bb6df

Please sign in to comment.