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/isp/isp_ispp.h | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h b/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
index 6ebb89f..16f106c 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_ispp.h
@@ -7,8 +7,8 @@
#include <linux/platform_device.h>
#include <media/v4l2-subdev.h>
#include <media/videobuf2-v4l2.h>
-#include <linux/rkisp1-config.h>
-#include <linux/rkispp-config.h>
+#include <linux/rk-isp1-config.h>
+#include <linux/rk-ispp-config.h>
#define RKISP_BUF_MAX 2
#define RKISPP_BUF_MAX 2
@@ -78,6 +78,7 @@
u32 w;
u32 h;
u32 fps;
+ bool is_fix;
};
struct rkisp_ispp_mode {
@@ -122,7 +123,7 @@
int __init rkispp_hw_drv_init(void);
-#if IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V20)
+#if IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V20) || IS_ENABLED(CONFIG_VIDEO_ROCKCHIP_ISP_VERSION_V30)
void rkisp_get_bridge_sd(struct platform_device *dev,
struct v4l2_subdev **sd);
#else
@@ -132,7 +133,5 @@
*sd = NULL;
}
#endif
-
-extern const struct vb2_mem_ops vb2_rdma_sg_memops;
#endif
--
Gitblit v1.6.2