From 8d5c287ddb3bf0708acc0f55ea1faa6d2c0801d1 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Thu, 17 Dec 2020 19:44:28 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.3.0 Change-Id: I27d24dcdea7eeefba4287ffa71c7ca509fd2e194 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/version.h | 18 ++++++++++++++++++ drivers/media/platform/rockchip/ispp/version.h | 6 ++++++ include/uapi/linux/rkisp2-config.h | 2 +- include/uapi/linux/rkispp-config.h | 3 +-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index 4d5bd7c401b7..75c6ec495348 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -73,6 +73,24 @@ * 1. isp/ispp add lock for multi dev runtime * 2. support output isp/ispp reg on each frame * 3. fix error detected by depmod + * + * v1.3.0: + * 1. capture to different version + * 2. add isp21 + * 3. add rk3568 config + * 4. support iq part of isp21 + * 5. remove hdrtmo to fix crash when connect to yuv sensor + * 6. fix enable function of ynr/cnr/bay3d/dhaz/adrc is not correct + * 7. fix can not get correct awb rawdata + * 8. add get awb data from ddr function + * 9. fix frame id error for isp21 + * 10. config lsc by sram in rdbk mode + * 11. add force update to enable dehaze + * 12. fix bug of scheduling while atomic + * 13. fix setting drc register is not correct + * 14. extend line to fix merge bypass bug for isp20 + * 15. vb2 dma sg for iommu enable + * 16. config dmatx to valid buf addr */ #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 8ab6118d0b36..bcfe46ac743f 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -70,6 +70,12 @@ * 3. fix mmu err due to buf free for multi dev * 4. support output isp/ispp reg on each frame * 5. fix error detected by depmod + * + * v1.3.0: + * 1. fec extend to independent video + * 2. reduce buf count + * 3. dummy buf map to one page if iommu enable + * 4. vb2 dma sg for iommu enable */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index ce65caf19458..8963c962144d 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, 2, 2) +#define RKISP_API_VERSION KERNEL_VERSION(1, 3, 0) #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 d04835709fa4..1b1522b7e7a9 100644 --- a/include/uapi/linux/rkispp-config.h +++ b/include/uapi/linux/rkispp-config.h @@ -9,8 +9,7 @@ #include #include -#define ISPP_API_VERSION KERNEL_VERSION(1, 2, 2) - +#define ISPP_API_VERSION KERNEL_VERSION(1, 3, 0) #define ISPP_ID_TNR (0) #define ISPP_ID_NR (1)