[media] exynos4-is: Ensure proper media pipeline state on device close

Make sure media_entity_pipeline_stop() is called on video device
close in cases where there was VIDIOC_STREAMON ioctl and no
VIDIOC_STREAMOFF. This patch fixes media entities stream_count
state which could prevent links from being disconnected, due to
non-zero stream_count.

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>

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 965b07f36e3c28b1fc0439181309050006f3f43d..28c6b26f6ff5b277e375fe671e9f0da6030f4b74 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -551,6 +551,7 @@ unlock:
 static int fimc_capture_release(struct file *file)
 {
        struct fimc_dev *fimc = video_drvdata(file);
+       struct fimc_vid_cap *vc = &fimc->vid_cap;
        int ret;
 
        dbg("pid: %d, state: 0x%lx", task_pid_nr(current), fimc->state);
@@ -558,6 +559,10 @@ static int fimc_capture_release(struct file *file)
        mutex_lock(&fimc->lock);
 
        if (v4l2_fh_is_singular_file(file)) {
+               if (vc->streaming) {
+                       media_entity_pipeline_stop(&vc->vfd.entity);
+                       vc->streaming = false;
+               }
                clear_bit(ST_CAPT_BUSY, &fimc->state);
                fimc_stop_capture(fimc, false);
                fimc_pipeline_call(fimc, close, &fimc->pipeline);
@@ -1243,8 +1248,10 @@ static int fimc_cap_streamon(struct file *file, void *priv,
        }
 
        ret = vb2_ioctl_streamon(file, priv, type);
-       if (!ret)
+       if (!ret) {
+               vc->streaming = true;
                return ret;
+       }
 
 err_p_stop:
        media_entity_pipeline_stop(entity);
@@ -1258,11 +1265,12 @@ static int fimc_cap_streamoff(struct file *file, void *priv,
        int ret;
 
        ret = vb2_ioctl_streamoff(file, priv, type);
+       if (ret < 0)
+               return ret;
 
-       if (ret == 0)
-               media_entity_pipeline_stop(&fimc->vid_cap.vfd.entity);
-
-       return ret;
+       media_entity_pipeline_stop(&fimc->vid_cap.vfd.entity);
+       fimc->vid_cap.streaming = false;
+       return 0;
 }
 
 static int fimc_cap_reqbufs(struct file *file, void *priv,

diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index 7d361b24dfd7fe3a23ce0ad70e69a23e6975dc01..d2fe162485a3c0b4451beac1d1ee22684632753f 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -319,6 +319,7 @@ struct fimc_vid_cap {
        int                             buf_index;
        unsigned int                    frame_count;
        unsigned int                    reqbufs_count;
+       bool                            streaming;
        int                             input_index;
        int                             refcnt;
        u32                             input;

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index b11e3583b9fad13d372121bbe48d099b7a718d62..cb196b85a858004f1337852e5f7e8c108c9bf0f2 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -507,6 +507,10 @@ static int fimc_lite_release(struct file *file)
 
        if (v4l2_fh_is_singular_file(file) &&
            atomic_read(&fimc->out_path) == FIMC_IO_DMA) {
+               if (fimc->streaming) {
+                       media_entity_pipeline_stop(&fimc->vfd.entity);
+                       fimc->streaming = false;
+               }
                clear_bit(ST_FLITE_IN_USE, &fimc->state);
                fimc_lite_stop_capture(fimc, false);
                fimc_pipeline_call(fimc, close, &fimc->pipeline);
@@ -798,8 +802,11 @@ static int fimc_lite_streamon(struct file *file, void *priv,
                goto err_p_stop;
 
        ret = vb2_ioctl_streamon(file, priv, type);
-       if (!ret)
+       if (!ret) {
+               fimc->streaming = true;
                return ret;
+       }
+
 err_p_stop:
        media_entity_pipeline_stop(entity);
        return 0;
@@ -812,9 +819,12 @@ static int fimc_lite_streamoff(struct file *file, void *priv,
        int ret;
 
        ret = vb2_ioctl_streamoff(file, priv, type);
-       if (ret == 0)
-               media_entity_pipeline_stop(&fimc->vfd.entity);
-       return ret;
+       if (ret < 0)
+               return ret;
+
+       media_entity_pipeline_stop(&fimc->vfd.entity);
+       fimc->streaming = false;
+       return 0;
 }
 
 static int fimc_lite_reqbufs(struct file *file, void *priv,

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h
index 8a8d26f583447294a4c238662f744f677ce75646..71fed5129e3020553994ce660cf2b326549920d4 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.h
+++ b/drivers/media/platform/exynos4-is/fimc-lite.h
@@ -166,6 +166,7 @@ struct fimc_lite {
        int                     ref_count;
 
        struct fimc_lite_events events;
+       bool                    streaming;
 };
 
 static inline bool fimc_lite_active(struct fimc_lite *fimc)