From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198
---
kernel/drivers/media/platform/rockchip/ispp/common.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/ispp/common.c b/kernel/drivers/media/platform/rockchip/ispp/common.c
index 3ccd657..8e4b105 100644
--- a/kernel/drivers/media/platform/rockchip/ispp/common.c
+++ b/kernel/drivers/media/platform/rockchip/ispp/common.c
@@ -269,7 +269,7 @@
if (rkispp_debug)
dev_info(hw->dev, "%s dbufs[%d]:0x%p\n",
__func__, i, buf->dbufs);
- for (j = 0; j < GROUP_BUF_MAX; j++) {
+ for (j = 0; j < hw->pool[0].group_buf_max; j++) {
if (buf->mem_priv[j]) {
g_ops->unmap_dmabuf(buf->mem_priv[j]);
g_ops->detach_dmabuf(buf->mem_priv[j]);
@@ -304,7 +304,7 @@
if (rkispp_debug)
dev_info(hw->dev, "%s dbufs[%d]:0x%p\n",
__func__, i, dbufs);
- for (i = 0; i < GROUP_BUF_MAX; i++) {
+ for (i = 0; i < hw->pool[0].group_buf_max; i++) {
mem = g_ops->attach_dmabuf(hw->dev, dbufs->dbuf[i],
dbufs->dbuf[i]->size, DMA_BIDIRECTIONAL);
if (IS_ERR(mem)) {
@@ -370,8 +370,9 @@
hw->cur_dev_id = buf->index;
ispp = hw->ispp[buf->index];
vdev = &ispp->stream_vdev;
- val = (vdev->module_ens & ISPP_MODULE_TNR) ? ISPP_MODULE_TNR : ISPP_MODULE_NR;
- rkispp_module_work_event(ispp, buf, NULL, val, false);
+ val = (vdev->module_ens & ISPP_MODULE_TNR) ? ISPP_MODULE_TNR :
+ ((vdev->module_ens & ISPP_MODULE_NR) ? ISPP_MODULE_NR : ISPP_MODULE_FEC);
+ vdev->stream_ops->rkispp_module_work_event(ispp, buf, NULL, val, false);
}
spin_unlock_irqrestore(&hw->buf_lock, lock_flags);
--
Gitblit v1.6.2