shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp1: clean list when stream failed

Browse Source 
Change-Id: Ib9ebf27d7b3e7e3952f95e37dcaea90faf1411f8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-07-21 09:51:20 +08:00
parent aff7f97251
commit 48d73c60c2
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/media/platform/rockchip/isp1/capture.c
View File

@@ -1412,25 +1412,12 @@ static void rkisp1_destroy_dummy_buf(struct rkisp1_stream *stream)
dummy_buf->vaddr, dummy_buf->dma_addr);
}
static void rkisp1_stop_streaming(struct vb2_queue *queue)
static void destroy_buf_queue(struct rkisp1_stream *stream,
enum vb2_buffer_state state)
{
struct rkisp1_stream *stream = queue->drv_priv;
struct rkisp1_vdev_node *node = &stream->vnode;
struct rkisp1_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
struct rkisp1_buffer *buf;
unsigned long lock_flags = 0;
int ret;
rkisp1_stream_stop(stream);
/* call to the other devices */
media_pipeline_stop(&node->vdev.entity);
ret = dev->pipe.set_stream(&dev->pipe, false);
if (ret < 0)
v4l2_err(v4l2_dev, "pipeline stream-off failed error:%d\n",
ret);
/* release buffers */
spin_lock_irqsave(&stream->vbq_lock, lock_flags);
if (stream->curr_buf) {
list_add_tail(&stream->curr_buf->queue, &stream->buf_queue);
@@ -1449,6 +1436,26 @@ static void rkisp1_stop_streaming(struct vb2_queue *queue)
vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
}
spin_unlock_irqrestore(&stream->vbq_lock, lock_flags);
}
static void rkisp1_stop_streaming(struct vb2_queue *queue)
{
struct rkisp1_stream *stream = queue->drv_priv;
struct rkisp1_vdev_node *node = &stream->vnode;
struct rkisp1_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
int ret;
rkisp1_stream_stop(stream);
/* call to the other devices */
media_pipeline_stop(&node->vdev.entity);
ret = dev->pipe.set_stream(&dev->pipe, false);
if (ret < 0)
v4l2_err(v4l2_dev, "pipeline stream-off failed error:%d\n",
ret);
/* release buffers */
destroy_buf_queue(stream, VB2_BUF_STATE_ERROR);
ret = dev->pipe.close(&dev->pipe);
if (ret < 0)
@@ -1499,7 +1506,6 @@ rkisp1_start_streaming(struct vb2_queue *queue, unsigned int count)
struct rkisp1_device *dev = stream->ispdev;
struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
int ret;
unsigned int i;
if (WARN_ON(stream->streaming))
return -EBUSY;
@@ -1569,14 +1575,8 @@ close_pipe:
destroy_dummy_buf:
rkisp1_destroy_dummy_buf(stream);
buffer_done:
for (i = 0; i < queue->num_buffers; ++i) {
struct vb2_buffer *vb;
vb = queue->bufs[i];
if (vb->state == VB2_BUF_STATE_ACTIVE)
vb2_buffer_done(vb, VB2_BUF_STATE_QUEUED);
}
destroy_buf_queue(stream, VB2_BUF_STATE_QUEUED);
stream->streaming = false;
return ret;
}