media: staging: rkisp1: validate links before powering and streaming

In function rkisp1_vb2_start_streaming, the call to
media_pipeline_start should be the first thing in order
to validate the links and prevents their state from being modified
before power up and streaming.

Adjust stop streaming to the same logic, call media_pipeline_stop
after we disable streaming on the entities in the topology.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index b6f497c..9b4a12e 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -921,7 +921,6 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue)
        mutex_lock(&cap->rkisp1->stream_lock);
 
        rkisp1_stream_stop(cap);
-       media_pipeline_stop(&node->vdev.entity);
        ret = rkisp1_pipeline_sink_walk(&node->vdev.entity, NULL,
                                        rkisp1_pipeline_disable_cb);
        if (ret)
@@ -937,6 +936,8 @@ static void rkisp1_vb2_stop_streaming(struct vb2_queue *queue)
 
        rkisp1_dummy_buf_destroy(cap);
 
+       media_pipeline_stop(&node->vdev.entity);
+
        mutex_unlock(&cap->rkisp1->stream_lock);
 }
 
@@ -986,9 +987,15 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
 
        mutex_lock(&cap->rkisp1->stream_lock);
 
+       ret = media_pipeline_start(entity, &cap->rkisp1->pipe);
+       if (ret) {
+               dev_err(cap->rkisp1->dev, "start pipeline failed %d\n", ret);
+               goto err_ret_buffers;
+       }
+
        ret = rkisp1_dummy_buf_create(cap);
        if (ret)
-               goto err_ret_buffers;
+               goto err_pipeline_stop;
 
        ret = pm_runtime_get_sync(cap->rkisp1->dev);
        if (ret < 0) {
@@ -1009,18 +1016,10 @@ rkisp1_vb2_start_streaming(struct vb2_queue *queue, unsigned int count)
        if (ret)
                goto err_stop_stream;
 
-       ret = media_pipeline_start(entity, &cap->rkisp1->pipe);
-       if (ret) {
-               dev_err(cap->rkisp1->dev, "start pipeline failed %d\n", ret);
-               goto err_pipe_disable;
-       }
-
        mutex_unlock(&cap->rkisp1->stream_lock);
 
        return 0;
 
-err_pipe_disable:
-       rkisp1_pipeline_sink_walk(entity, NULL, rkisp1_pipeline_disable_cb);
 err_stop_stream:
        rkisp1_stream_stop(cap);
        v4l2_pipeline_pm_put(entity);
@@ -1028,6 +1027,8 @@ err_pipe_pm_put:
        pm_runtime_put(cap->rkisp1->dev);
 err_destroy_dummy:
        rkisp1_dummy_buf_destroy(cap);
+err_pipeline_stop:
+       media_pipeline_stop(entity);
 err_ret_buffers:
        rkisp1_return_all_buffers(cap, VB2_BUF_STATE_QUEUED);
        mutex_unlock(&cap->rkisp1->stream_lock);