media: media-entity: Add media_pad_is_streaming() helper function

Add a function to test if a pad is part of a pipeline currently
streaming, and use it through drivers to replace direct access to the
stream_count field. This will help reworking pipeline start/stop without
disturbing drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index b411f9796191f1eebfcf5ddcd9470daf672dea0c..f83e043f0f3b14b62e89c7a65549c9c2e204b0ad 100644 (file)
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -834,7 +834,8 @@ int __media_entity_setup_link(struct media_link *link, u32 flags)
        sink = link->sink->entity;
 
        if (!(link->flags & MEDIA_LNK_FL_DYNAMIC) &&
-           (source->stream_count || sink->stream_count))
+           (media_entity_is_streaming(source) ||
+            media_entity_is_streaming(sink)))
                return -EBUSY;
 
        mdev = source->graph_obj.mdev;

diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/exynos4-is/common.c
index 944b224eb621c7c28e8dbd6d25fa499cfa353afa..023f624d29d58491d41c8f7fef42fdb2f4ef25ac 100644 (file)
--- a/drivers/media/platform/exynos4-is/common.c
+++ b/drivers/media/platform/exynos4-is/common.c
@@ -10,7 +10,10 @@
 #include <media/drv-intf/exynos-fimc.h>
 #include "common.h"
 
-/* Called with the media graph mutex held or entity->stream_count > 0. */
+/*
+ * Called with the media graph mutex held or media_entity_is_streaming(entity)
+ * true.
+ */
 struct v4l2_subdev *fimc_find_remote_sensor(struct media_entity *entity)
 {
        struct media_pad *pad = &entity->pads[0];

diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c
index 855235bea46dd5e422e60bee40fcef2eb521f43f..b85986e50f468998a1c668eb3ec172742ca2e200 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-isp.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp.c
@@ -226,7 +226,7 @@ static int fimc_isp_subdev_set_fmt(struct v4l2_subdev *sd,
                        }
                }
        } else {
-               if (sd->entity.stream_count == 0) {
+               if (!media_entity_is_streaming(&sd->entity)) {
                        if (fmt->pad == FIMC_ISP_SD_PAD_SINK) {
                                struct v4l2_subdev_format format = *fmt;
 

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 9b7cc9564cf13f9cf123f29435e2c226c6292fff..2e8f476efc5cfd6a726a856a74d07576c0b5bd7f 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1073,7 +1073,7 @@ static int fimc_lite_subdev_set_fmt(struct v4l2_subdev *sd,
        mutex_lock(&fimc->lock);
 
        if ((atomic_read(&fimc->out_path) == FIMC_IO_ISP &&
-           sd->entity.stream_count > 0) ||
+           media_entity_is_streaming(&sd->entity)) ||
            (atomic_read(&fimc->out_path) == FIMC_IO_DMA &&
            vb2_is_busy(&fimc->vb_queue))) {
                mutex_unlock(&fimc->lock);
@@ -1197,8 +1197,8 @@ static int fimc_lite_subdev_s_stream(struct v4l2_subdev *sd, int on)
         * Find sensor subdev linked to FIMC-LITE directly or through
         * MIPI-CSIS. This is required for configuration where FIMC-LITE
         * is used as a subdev only and feeds data internally to FIMC-IS.
-        * The pipeline links are protected through entity.stream_count
-        * so there is no need to take the media graph mutex here.
+        * The pipeline links are protected through entity.pipe so there is no
+        * need to take the media graph mutex here.
         */
        fimc->sensor = fimc_find_remote_sensor(&sd->entity);
 

diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 0186ae235113bb8f5c3ba84c4db9b85bacb4314f..5117a7a3b5ecc4da11aebf6ae554054603d6a2d2 100644 (file)
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -816,7 +816,7 @@ static int rvin_csi2_link_notify(struct media_link *link, u32 flags,
         * running streams.
         */
        media_device_for_each_entity(entity, &group->mdev)
-               if (entity->stream_count)
+               if (media_entity_is_streaming(entity))
                        return -EBUSY;
 
        mutex_lock(&group->lock);

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index fea489f03d57a06ebf1fa6b19b5b4aa96e76ec87..8546f13c42a900e1a0b6bd1d3fb06b757a259bb0 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -858,6 +858,18 @@ struct media_link *media_entity_find_link(struct media_pad *source,
  */
 struct media_pad *media_entity_remote_pad(const struct media_pad *pad);
 
+/**
+ * media_entity_is_streaming - Test if an entity is part of a streaming pipeline
+ * @entity: The entity
+ *
+ * Return: True if the entity is part of a pipeline started with the
+ * media_pipeline_start() function, false otherwise.
+ */
+static inline bool media_entity_is_streaming(const struct media_entity *entity)
+{
+       return entity->stream_count > 0;
+}
+
 /**
  * media_entity_get_fwnode_pad - Get pad number from fwnode
  *