shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: vicap fixes tasklet error for vb_done

Browse Source 
Fixes: 824a24f4 ("media: rockchip: vicap use tasklet to done buf")

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I231edb728285c049e96cfd48b4dfb19b6d31bfe8
This commit is contained in:
Zefa Chen
2023-02-20 22:24:58 +08:00
committed by Tao Huang
parent 2b6fcece05
commit 0669486cd5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/rockchip/cif/capture.c
View File

@@ -4220,11 +4220,11 @@ void rkcif_do_stop_stream(struct rkcif_stream *stream,
dev->wait_line = 0;
stream->is_line_wake_up = false;
}
tasklet_disable(&stream->vb_done_tasklet);
}
if (can_reset && hw_dev->dummy_buf.vaddr)
rkcif_destroy_dummy_buf(stream);
stream->cur_stream_mode &= ~mode;
tasklet_disable(&stream->vb_done_tasklet);
INIT_LIST_HEAD(&stream->vb_done_list);
v4l2_info(&dev->v4l2_dev, "stream[%d] stopping finished, dma_en 0x%x\n", stream->id, stream->dma_en);
mutex_unlock(&dev->stream_lock);
@@ -5213,6 +5213,7 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode)
mutex_unlock(&hw_dev->dev_lock);
if (stream->cur_stream_mode == RKCIF_STREAM_MODE_NONE) {
tasklet_enable(&stream->vb_done_tasklet);
ret = dev->pipe.open(&dev->pipe, &node->vdev.entity, true);
if (ret < 0) {
v4l2_err(v4l2_dev, "open cif pipeline failed %d\n",
@@ -5286,7 +5287,6 @@ int rkcif_do_start_stream(struct rkcif_stream *stream, unsigned int mode)
dev->reset_work_cancel = false;
stream->cur_stream_mode |= mode;
rkcif_monitor_reset_event(dev);
tasklet_enable(&stream->vb_done_tasklet);
goto out;
stop_stream:
@@ -6232,7 +6232,7 @@ static void rkcif_tasklet_handle(unsigned long data)
}
}
static void rkcif_vb_done_tasklet(struct rkcif_stream *stream, struct rkcif_buffer *buf)
void rkcif_vb_done_tasklet(struct rkcif_stream *stream, struct rkcif_buffer *buf)
{
unsigned long flags = 0;

2
drivers/media/platform/rockchip/cif/cif-tools.c
View File

@@ -618,7 +618,7 @@ static void rkcif_tools_work(struct work_struct *work)
list_add_tail(&tools_buf->list, &tools_vdev->src_buf_head);
}
tools_buf->use_cnt = 2;
rkcif_vb_done_oneframe(stream, &tools_work->active_buf->vb);
rkcif_vb_done_tasklet(stream, tools_work->active_buf);
if (tools_vdev->stopping) {
rkcif_buf_queue(&tools_work->active_buf->vb.vb2_buf);

4
drivers/media/platform/rockchip/cif/dev.h
View File

@@ -833,8 +833,8 @@ void rkcif_do_stop_stream(struct rkcif_stream *stream,
void rkcif_irq_handle_scale(struct rkcif_device *cif_dev,
unsigned int intstat_glb);
void rkcif_buf_queue(struct vb2_buffer *vb);
void rkcif_vb_done_oneframe(struct rkcif_stream *stream,
struct vb2_v4l2_buffer *vb_done);
void rkcif_vb_done_tasklet(struct rkcif_stream *stream, struct rkcif_buffer *buf);
int rkcif_scale_start(struct rkcif_scale_vdev *scale_vdev);