video_device and vb2_queue locks are now both
mandatory. Add them, remove driver ad-hoc locks,
and implement wait_{prepare, finish}.
To stay on the safe side, this commit uses a single mutex
for both locks. Better latency can be obtained by separating
these if needed.
Signed-off-by: Ezequiel Garcia <ezequiel@xxxxxxxxxxxxx>
---
drivers/staging/media/omap4iss/iss_video.c | 32 +++++++-----------------------
drivers/staging/media/omap4iss/iss_video.h | 2 +-
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index a3a83424a926..380cfd230262 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -260,10 +260,7 @@ __iss_video_get_format(struct iss_video *video,
fmt.pad = pad;
fmt.which = V4L2_SUBDEV_FORMAT_ACTIVE;
- mutex_lock(&video->mutex);
ret = v4l2_subdev_call(subdev, pad, get_fmt, NULL, &fmt);
- mutex_unlock(&video->mutex);
-
if (ret)
return ret;
@@ -411,6 +408,8 @@ static const struct vb2_ops iss_video_vb2ops = {
.buf_prepare = iss_video_buf_prepare,
.buf_queue = iss_video_buf_queue,
.buf_cleanup = iss_video_buf_cleanup,
+ .wait_prepare = vb2_ops_wait_prepare,
+ .wait_finish = vb2_ops_wait_finish,
};
/*
@@ -592,9 +591,7 @@ iss_video_get_format(struct file *file, void *fh, struct v4l2_format *format)
if (format->type != video->type)
return -EINVAL;
- mutex_lock(&video->mutex);
*format = vfh->format;
- mutex_unlock(&video->mutex);
return 0;
}
@@ -609,8 +606,6 @@ iss_video_set_format(struct file *file, void *fh, struct v4l2_format *format)
if (format->type != video->type)
return -EINVAL;
- mutex_lock(&video->mutex);
-
/*
* Fill the bytesperline and sizeimage fields by converting to media bus
* format and back to pixel format.
@@ -620,7 +615,6 @@ iss_video_set_format(struct file *file, void *fh, struct v4l2_format *format)
vfh->format = *format;
- mutex_unlock(&video->mutex);
return 0;
}
@@ -741,9 +735,7 @@ iss_video_set_selection(struct file *file, void *fh, struct v4l2_selection *sel)
return -EINVAL;
sdsel.pad = pad;
- mutex_lock(&video->mutex);
ret = v4l2_subdev_call(subdev, pad, set_selection, NULL, &sdsel);
- mutex_unlock(&video->mutex);
if (!ret)
sel->r = sdsel.r;
@@ -873,8 +865,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
if (type != video->type)
return -EINVAL;
- mutex_lock(&video->stream_lock);
-
/*
* Start streaming on the pipeline. No link touching an entity in the
* pipeline can be activated or deactivated once streaming is started.
@@ -978,8 +968,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
media_graph_walk_cleanup(&graph);
- mutex_unlock(&video->stream_lock);
-
return 0;
err_omap4iss_set_stream:
@@ -996,8 +984,6 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
err_graph_walk_init:
media_entity_enum_cleanup(&pipe->ent_enum);
- mutex_unlock(&video->stream_lock);
-
return ret;
}
@@ -1013,10 +999,8 @@ iss_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
if (type != video->type)
return -EINVAL;
- mutex_lock(&video->stream_lock);
-
if (!vb2_is_streaming(&vfh->queue))
- goto done;
+ return 0;
/* Update the pipeline state. */
if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1041,8 +1025,6 @@ iss_video_streamoff(struct file *file, void *fh, enum v4l2_buf_type type)
video->iss->pdata->set_constraints(video->iss, false);
media_pipeline_stop(&video->video.entity);
-done:
- mutex_unlock(&video->stream_lock);
return 0;
}
@@ -1137,6 +1119,7 @@ static int iss_video_open(struct file *file)
q->buf_struct_size = sizeof(struct iss_buffer);
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->dev = video->iss->dev;
+ q->lock = &video->v4l_lock;
ret = vb2_queue_init(q);
if (ret) {
@@ -1238,12 +1221,11 @@ int omap4iss_video_init(struct iss_video *video, const char *name)
if (ret < 0)
return ret;
+ mutex_init(&video->v4l_lock);
spin_lock_init(&video->qlock);
- mutex_init(&video->mutex);
atomic_set(&video->active, 0);
spin_lock_init(&video->pipe.lock);
- mutex_init(&video->stream_lock);
/* Initialize the video device. */
if (!video->ops)
@@ -1252,6 +1234,7 @@ int omap4iss_video_init(struct iss_video *video, const char *name)
video->video.fops = &iss_video_fops;
snprintf(video->video.name, sizeof(video->video.name),
"OMAP4 ISS %s %s", name, direction);
+ video->video.lock = &video->v4l_lock;
video->video.vfl_type = VFL_TYPE_GRABBER;
video->video.release = video_device_release_empty;
video->video.ioctl_ops = &iss_video_ioctl_ops;
@@ -1265,8 +1248,7 @@ int omap4iss_video_init(struct iss_video *video, const char *name)
void omap4iss_video_cleanup(struct iss_video *video)
{
media_entity_cleanup(&video->video.entity);
- mutex_destroy(&video->stream_lock);
- mutex_destroy(&video->mutex);
+ mutex_destroy(&video->v4l_lock);
}
int omap4iss_video_register(struct iss_video *video, struct v4l2_device *vdev)
diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index d7e05d04512c..4b8e5a8073fb 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -148,8 +148,8 @@ struct iss_video {
enum v4l2_buf_type type;
struct media_pad pad;
- struct mutex mutex; /* format and crop settings */
atomic_t active;
+ struct mutex v4l_lock;
struct iss_device *iss;
--
2.16.3
