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: ispp: reset at frame end

Browse Source 
Change-Id: I83d1bd9c4464fc138bf87f349e3f464b74eefd38
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-08-03 10:47:24 +08:00
parent 20e9c1ac54
commit eb37718088
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/ispp/hw.c
View File

@@ -323,7 +323,7 @@ static int rkispp_hw_probe(struct platform_device *pdev)
atomic_set(&hw_dev->refcnt, 0);
INIT_LIST_HEAD(&hw_dev->list);
hw_dev->is_idle = true;
hw_dev->is_single = true;
hw_dev->is_single = false;
hw_dev->is_fec_ext = false;
hw_dev->is_dma_contig = true;
hw_dev->is_dma_sg_ops = false;

2
drivers/media/platform/rockchip/ispp/params.c
View File

@@ -320,7 +320,7 @@ static void nr_config(struct rkispp_params_vdev *params_vdev,
nobig_en = 0;
}
if (params_vdev->dev->hw_dev->is_single)
if (params_vdev->dev->hw_dev->dev_num == 1)
sd32_self_en = arg->uvnr_sd32_self_en;
val = arg->uvnr_step1_en << 1 | arg->uvnr_step2_en << 2 |
arg->nr_gain_en << 3 | sd32_self_en << 4 |

4
drivers/media/platform/rockchip/ispp/stream.c
View File

@@ -3281,6 +3281,7 @@ void rkispp_module_work_event(struct rkispp_device *dev,
((module == ISPP_MODULE_NR && is_single) ||
(module == ISPP_MODULE_FEC && !is_single))))) {
dev->stream_vdev.monitor.retry = 0;
rkispp_soft_reset(dev->hw_dev);
rkispp_event_handle(dev, CMD_QUEUE_DMABUF, NULL);
}
@@ -3314,7 +3315,8 @@ void rkispp_isr(u32 mis_val, struct rkispp_device *dev)
if (mis_val & err_mask) {
dev->isr_err_cnt++;
v4l2_err(&dev->v4l2_dev,
"ispp err:0x%x\n", mis_val);
"ispp err:0x%x, seq:%d\n",
mis_val, dev->ispp_sdev.frm_sync_seq);
}
if (mis_val & TNR_INT) {