From d600ace1e2bb61c8e633720e4fb8bee1b7696a16 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Wed, 4 Aug 2021 19:01:50 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.6.2 Change-Id: I3959939530392f71313a3e30132d9746533f2d36 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/version.h | 12 ++++++++++++ drivers/media/platform/rockchip/ispp/version.h | 10 ++++++++++ include/uapi/linux/rkisp2-config.h | 2 +- include/uapi/linux/rkispp-config.h | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index c70ac7747371..762ac7d9e210 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -140,6 +140,18 @@ * 13.apply en params if no match for isp21 * 14.isp21 get 3a stats from ddr * 15.reserved memory using rdma_sg ops + * + * v1.6.2: + * 1.hdr direct for isp21 + * 2.fix same frame id + * 3.fix isp and ispp share dmabuf release fail + * 4.clear rdbk fifo at dmarx stop + * 5.add lock for isp stream + * 6.disable params when it stream off + * 7.dmarx support yuv format + * 8.frame buffer done early + * 9.fix set pdaf in dpcc error + * 10.add v-blank to procfs */ #define RKISP_DRIVER_VERSION RKISP_API_VERSION diff --git a/drivers/media/platform/rockchip/ispp/version.h b/drivers/media/platform/rockchip/ispp/version.h index 69979689aca3..df445daad02e 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -103,6 +103,16 @@ * v1.6.1 * 1. reserved memory using rdma_sg ops * 2. destory ispp buffers if start_stream failed + * + * v1.6.2 + * 1. fix isp and ispp share dmabuf release fail + * 2. fix bug that ispp register isn't included in SEI + * 3. frame buffer done early + * 4. reset at frame end + * 5. fix page fault due to scl exit early + * 6. fbc error handle + * 7. first frame handle for multi dev + * 8. fix driver mode sync with ispserver */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index 079bd9c7e2d4..9932b44e89e1 100644 --- a/include/uapi/linux/rkisp2-config.h +++ b/include/uapi/linux/rkisp2-config.h @@ -10,7 +10,7 @@ #include #include -#define RKISP_API_VERSION KERNEL_VERSION(1, 6, 1) +#define RKISP_API_VERSION KERNEL_VERSION(1, 6, 2) #define RKISP_CMD_TRIGGER_READ_BACK \ _IOW('V', BASE_VIDIOC_PRIVATE + 0, struct isp2x_csi_trigger) diff --git a/include/uapi/linux/rkispp-config.h b/include/uapi/linux/rkispp-config.h index 8a3425fb8a38..b77b79ab3908 100644 --- a/include/uapi/linux/rkispp-config.h +++ b/include/uapi/linux/rkispp-config.h @@ -9,7 +9,7 @@ #include #include -#define ISPP_API_VERSION KERNEL_VERSION(1, 6, 0) +#define ISPP_API_VERSION KERNEL_VERSION(1, 6, 2) #define ISPP_ID_TNR (0) #define ISPP_ID_NR (1)