media: vimc: Add vimc-streamer for stream control

Add a linear pipeline logic for the stream control. It's created by
walking backwards on the entity graph. When the stream starts it will
simply loop through the pipeline calling the respective process_frame
function of each entity.

Fixes: f2fe89061d797 ("vimc: Virtual Media Controller core, capture
and sensor")

Cc: stable@vger.kernel.org # for v4.20
Signed-off-by: Lucas A. M. Magalhães <lucmaga@gmail.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: fixed small space-after-tab issue in the patch]
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index aaeddf24b042..93837d9eecd2 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -24,6 +24,7 @@
 #include <media/videobuf2-vmalloc.h>
 
 #include "vimc-common.h"
+#include "vimc-streamer.h"
 
 #define VIMC_CAP_DRV_NAME "vimc-capture"
 
@@ -44,7 +45,7 @@ struct vimc_cap_device {
         spinlock_t qlock;
         struct mutex lock;
         u32 sequence;
-        struct media_pipeline pipe;
+        struct vimc_stream stream;
 };
 
 static const struct v4l2_pix_format fmt_default = {
@@ -248,14 +249,13 @@ static int vimc_cap_start_streaming(struct vb2_queue *vq, unsigned int count)
         vcap->sequence = 0;
 
         /* Start the media pipeline */
-        ret = media_pipeline_start(entity, &vcap->pipe);
+        ret = media_pipeline_start(entity, &vcap->stream.pipe);
         if (ret) {
                 vimc_cap_return_all_buffers(vcap, VB2_BUF_STATE_QUEUED);
                 return ret;
         }
 
-        /* Enable streaming from the pipe */
-        ret = vimc_pipeline_s_stream(&vcap->vdev.entity, 1);
+        ret = vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 1);
         if (ret) {
                 media_pipeline_stop(entity);
                 vimc_cap_return_all_buffers(vcap, VB2_BUF_STATE_QUEUED);
@@ -273,8 +273,7 @@ static void vimc_cap_stop_streaming(struct vb2_queue *vq)
 {
         struct vimc_cap_device *vcap = vb2_get_drv_priv(vq);
 
-        /* Disable streaming from the pipe */
-        vimc_pipeline_s_stream(&vcap->vdev.entity, 0);
+        vimc_streamer_s_stream(&vcap->stream, &vcap->ved, 0);
 
         /* Stop the media pipeline */
         media_pipeline_stop(&vcap->vdev.entity);
@@ -355,8 +354,8 @@ static void vimc_cap_comp_unbind(struct device *comp, struct device *master,
         kfree(vcap);
 }
 
-static void vimc_cap_process_frame(struct vimc_ent_device *ved,
-                                   struct media_pad *sink, const void *frame)
+static void *vimc_cap_process_frame(struct vimc_ent_device *ved,
+                                    const void *frame)
 {
         struct vimc_cap_device *vcap = container_of(ved, struct vimc_cap_device,
                                                     ved);
@@ -370,7 +369,7 @@ static void vimc_cap_process_frame(struct vimc_ent_device *ved,
                                             typeof(*vimc_buf), list);
         if (!vimc_buf) {
                 spin_unlock(&vcap->qlock);
-                return;
+                return ERR_PTR(-EAGAIN);
         }
 
         /* Remove this entry from the list */
@@ -391,6 +390,7 @@ static void vimc_cap_process_frame(struct vimc_ent_device *ved,
         vb2_set_plane_payload(&vimc_buf->vb2.vb2_buf, 0,
                               vcap->format.sizeimage);
         vb2_buffer_done(&vimc_buf->vb2.vb2_buf, VB2_BUF_STATE_DONE);
+        return NULL;
 }
 
 static int vimc_cap_comp_bind(struct device *comp, struct device *master,