media: atmel: atmel-isc: move media_pipeline_* to (un)prepare cb
Subsystems (2)
RFC PATCH 1/1 media: atmel: atmel-isc: move media_pipeline_* to (un)prepare cb
Move the media_pipeline_start/stop calls from start/stop streaming to the new prepare_streaming and unprepare_streaming callbacks.
Signed-off-by Eugen Hristev <[email protected]>
---
Only applies on top of
[RFC PATCHv2] vb2: add support for (un)prepare_streaming queue ops
and the series
[PATCH v10 0/5] media: atmel: atmel-isc: implement media controller +
[PATCH v10 0/8] media: atmel: atmel-isc: various fixes
drivers/media/platform/atmel/atmel-isc-base.c | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-)
drivers/media/platform/atmel/atmel-isc-base.c +17 -10
@@ -324,6 +324,13 @@ static int isc_configure(struct isc_device *isc)return isc_update_profile (isc); } +static int isc_prepare_streaming (struct vb2_queue *vq) +{ +struct isc_device *isc =vb2_get_drv_priv (vq); + +return media_pipeline_start (&isc->video_dev.entity, &isc->mpipe); +} +static int isc_start_streaming (struct vb2_queue *vq,unsigned int count) {struct isc_device *isc =vb2_get_drv_priv (vq);
@@ -332,10 +339,6 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)unsigned long flags;int ret; - ret =media_pipeline_start (&isc->video_dev.entity, &isc->mpipe); -if (ret) - goto err_pipeline_start; -/* Enable stream on the sub device */ ret =v4l2_subdev_call (isc->current_subdev->sd, video, s_stream,1 );if (ret && ret != -ENOIOCTLCMD ) {
@@ -384,9 +387,6 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)v4l2_subdev_call (isc->current_subdev->sd, video, s_stream,0 ); err_start_stream: -media_pipeline_stop (&isc->video_dev.entity); - -err_pipeline_start:spin_lock_irqsave (&isc->dma_queue_lock, flags);list_for_each_entry (buf, &isc->dma_queue, list)vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_QUEUED );
@@ -396,6 +396,14 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)return ret; } +static void isc_unprepare_streaming (struct vb2_queue *vq) +{ +struct isc_device *isc =vb2_get_drv_priv (vq); + +/* Stop media pipeline */ +media_pipeline_stop (&isc->video_dev.entity); +} +static void isc_stop_streaming (struct vb2_queue *vq) {struct isc_device *isc =vb2_get_drv_priv (vq);
@@ -425,9 +433,6 @@ static void isc_stop_streaming(struct vb2_queue *vq)if (ret && ret != -ENOIOCTLCMD )v4l2_err (&isc->v4l2_dev,"stream off failed in subdev\n" ); -/* Stop media pipeline */ -media_pipeline_stop (&isc->video_dev.entity); -/* Release all active buffers */ spin_lock_irqsave (&isc->dma_queue_lock, flags);if (unlikely (isc->cur_frm)) {
@@ -466,6 +471,8 @@ static const struct vb2_ops isc_vb2_ops = { .start_streaming = isc_start_streaming, .stop_streaming = isc_stop_streaming, .buf_queue = isc_buffer_queue, + .prepare_streaming = isc_prepare_streaming, + .unprepare_streaming = isc_unprepare_streaming, }; static int isc_querycap(struct file *file, void *priv,
Signature · 1 line
2.25.1