korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 10:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: microchip: microchip-isc: move media_pipeline_* to (un)prepare cb

Browse Source 
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 <eugen.hristev@microchip.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Eugen Hristev 2022-11-07 14:18:17 +00:00 committed by Mauro Carvalho Chehab
parent 78ba0d79b7
commit 8a8f9cedcb
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/media/platform/microchip/microchip-isc-base.c
View File

@ -328,6 +328,13 @@ static int isc_configure(struct isc_device *isc)
return isc_update_profile(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.pads, &isc->mpipe);
}
static int isc_start_streaming(struct vb2_queue *vq, unsigned int count) static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)
{ {
struct isc_device *isc = vb2_get_drv_priv(vq); struct isc_device *isc = vb2_get_drv_priv(vq);
@ -336,10 +343,6 @@ static int isc_start_streaming(struct vb2_queue *vq, unsigned int count)
unsigned long flags; unsigned long flags;
int ret; int ret;
ret = media_pipeline_start(isc->video_dev.entity.pads, &isc->mpipe);
if (ret)
goto err_pipeline_start;
/* Enable stream on the sub device */ /* Enable stream on the sub device */
ret = v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 1); ret = v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 1);
if (ret && ret != -ENOIOCTLCMD) { if (ret && ret != -ENOIOCTLCMD) {
@ -389,9 +392,6 @@ err_pm_get:
v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0); v4l2_subdev_call(isc->current_subdev->sd, video, s_stream, 0);
err_start_stream: err_start_stream:
media_pipeline_stop(isc->video_dev.entity.pads);
err_pipeline_start:
spin_lock_irqsave(&isc->dma_queue_lock, flags); spin_lock_irqsave(&isc->dma_queue_lock, flags);
list_for_each_entry(buf, &isc->dma_queue, list) list_for_each_entry(buf, &isc->dma_queue, list)
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED); vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
@ -401,6 +401,14 @@ err_pipeline_start:
return ret; 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.pads);
}
static void isc_stop_streaming(struct vb2_queue *vq) static void isc_stop_streaming(struct vb2_queue *vq)
{ {
struct isc_device *isc = vb2_get_drv_priv(vq); struct isc_device *isc = vb2_get_drv_priv(vq);
@ -430,9 +438,6 @@ static void isc_stop_streaming(struct vb2_queue *vq)
if (ret && ret != -ENOIOCTLCMD) if (ret && ret != -ENOIOCTLCMD)
v4l2_err(&isc->v4l2_dev, "stream off failed in subdev\n"); v4l2_err(&isc->v4l2_dev, "stream off failed in subdev\n");
/* Stop media pipeline */
media_pipeline_stop(isc->video_dev.entity.pads);
/* Release all active buffers */ /* Release all active buffers */
spin_lock_irqsave(&isc->dma_queue_lock, flags); spin_lock_irqsave(&isc->dma_queue_lock, flags);
if (unlikely(isc->cur_frm)) { if (unlikely(isc->cur_frm)) {
@ -472,6 +477,8 @@ static const struct vb2_ops isc_vb2_ops = {
.start_streaming = isc_start_streaming, .start_streaming = isc_start_streaming,
.stop_streaming = isc_stop_streaming, .stop_streaming = isc_stop_streaming,
.buf_queue = isc_buffer_queue, .buf_queue = isc_buffer_queue,
.prepare_streaming = isc_prepare_streaming,
.unprepare_streaming = isc_unprepare_streaming,
}; };
static int isc_querycap(struct file *file, void *priv, static int isc_querycap(struct file *file, void *priv,