OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Sylwester Nawrocki 2013-03-25 16:50:50 -03:00 committed by Mauro Carvalho Chehab
parent 439797980a
commit 9ea89e2b62
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/platform/exynos4-is/fimc-capture.c
View File

@ -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,

1
drivers/media/platform/exynos4-is/fimc-core.h
View File

@ -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;

18
drivers/media/platform/exynos4-is/fimc-lite.c
View File

@ -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,

1
drivers/media/platform/exynos4-is/fimc-lite.h
View File

@ -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)