Collect entities which are part of the pipeline into a single bit mask.

Signed-off-by: Sakari Ailus <sakari.ai...@iki.fi>
---
 drivers/media/video/omap3isp/ispvideo.c |   61 +++++++++++++++++--------------
 drivers/media/video/omap3isp/ispvideo.h |    2 +
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/drivers/media/video/omap3isp/ispvideo.c 
b/drivers/media/video/omap3isp/ispvideo.c
index d34f690..8ce3c5b 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -255,8 +255,9 @@ isp_video_remote_subdev(struct isp_video *video, u32 *pad)
 }
 
 /* Return a pointer to the ISP video instance at the far end of the pipeline. 
*/
-static struct isp_video *
-isp_video_far_end(struct isp_video *video)
+static int isp_video_get_graph_data(struct isp_video *video,
+                                   struct isp_pipeline *pipe,
+                                   enum isp_pipeline_state *state)
 {
        struct media_entity_graph graph;
        struct media_entity *entity = &video->video.entity;
@@ -267,21 +268,40 @@ isp_video_far_end(struct isp_video *video)
        media_entity_graph_walk_start(&graph, entity);
 
        while ((entity = media_entity_graph_walk_next(&graph))) {
+               struct isp_video *__video;
+
+               pipe->entities |= 1 << entity->id;
+
+               if (far_end != NULL)
+                       continue;
+
                if (entity == &video->video.entity)
                        continue;
 
                if (media_entity_type(entity) != MEDIA_ENT_T_DEVNODE)
                        continue;
 
-               far_end = to_isp_video(media_entity_to_video_device(entity));
-               if (far_end->type != video->type)
-                       break;
-
-               far_end = NULL;
+               __video = to_isp_video(media_entity_to_video_device(entity));
+               if (__video->type != video->type)
+                       far_end = __video;
        }
 
        mutex_unlock(&mdev->graph_mutex);
-       return far_end;
+
+       if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+               *state = ISP_PIPELINE_STREAM_OUTPUT | ISP_PIPELINE_IDLE_OUTPUT;
+               pipe->input = far_end;
+               pipe->output = video;
+       } else {
+               if (far_end == NULL)
+                       return -EPIPE;
+
+               *state = ISP_PIPELINE_STREAM_INPUT | ISP_PIPELINE_IDLE_INPUT;
+               pipe->input = video;
+               pipe->output = far_end;
+       }
+
+       return 0;
 }
 
 /*
@@ -972,7 +992,6 @@ isp_video_streamon(struct file *file, void *fh, enum 
v4l2_buf_type type)
        struct isp_video *video = video_drvdata(file);
        enum isp_pipeline_state state;
        struct isp_pipeline *pipe;
-       struct isp_video *far_end;
        unsigned long flags;
        int ret;
 
@@ -992,6 +1011,8 @@ isp_video_streamon(struct file *file, void *fh, enum 
v4l2_buf_type type)
        pipe = video->video.entity.pipe
             ? to_isp_pipeline(&video->video.entity) : &video->pipe;
 
+       pipe->entities = 0;
+
        if (video->isp->pdata->set_constraints)
                video->isp->pdata->set_constraints(video->isp, true);
        pipe->l3_ick = clk_get_rate(video->isp->clock[ISP_CLK_L3_ICK]);
@@ -1011,25 +1032,9 @@ isp_video_streamon(struct file *file, void *fh, enum 
v4l2_buf_type type)
        video->bpl_padding = ret;
        video->bpl_value = vfh->format.fmt.pix.bytesperline;
 
-       /* Find the ISP video node connected at the far end of the pipeline and
-        * update the pipeline.
-        */
-       far_end = isp_video_far_end(video);
-
-       if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-               state = ISP_PIPELINE_STREAM_OUTPUT | ISP_PIPELINE_IDLE_OUTPUT;
-               pipe->input = far_end;
-               pipe->output = video;
-       } else {
-               if (far_end == NULL) {
-                       ret = -EPIPE;
-                       goto err_check_format;
-               }
-
-               state = ISP_PIPELINE_STREAM_INPUT | ISP_PIPELINE_IDLE_INPUT;
-               pipe->input = video;
-               pipe->output = far_end;
-       }
+       ret = isp_video_get_graph_data(video, pipe, &state);
+       if (ret < 0)
+               goto err_check_format;
 
        /* Validate the pipeline and update its state. */
        ret = isp_video_validate_pipeline(pipe);
diff --git a/drivers/media/video/omap3isp/ispvideo.h 
b/drivers/media/video/omap3isp/ispvideo.h
index d91bdb9..c9187cb 100644
--- a/drivers/media/video/omap3isp/ispvideo.h
+++ b/drivers/media/video/omap3isp/ispvideo.h
@@ -88,6 +88,7 @@ enum isp_pipeline_state {
 /*
  * struct isp_pipeline - An ISP hardware pipeline
  * @error: A hardware error occurred during capture
+ * @entities: Bitmask of entities in the pipeline (indexed by entity ID)
  */
 struct isp_pipeline {
        struct media_pipeline pipe;
@@ -96,6 +97,7 @@ struct isp_pipeline {
        enum isp_pipeline_stream_state stream_state;
        struct isp_video *input;
        struct isp_video *output;
+       u32 entities;
        unsigned long l3_ick;
        unsigned int max_rate;
        atomic_t frame_number;
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to