From 274d4477893a3e84ba763b954b8ad0d2d6288a63 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 2 Nov 2020 18:19:08 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.2.0 Change-Id: Ide1bab9c83d8f2375d17ef3ce9d9f0686adeca01 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/version.h | 5 +++++ drivers/media/platform/rockchip/ispp/version.h | 9 +++++++++ include/uapi/linux/rkisp2-config.h | 2 +- include/uapi/linux/rkispp-config.h | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index e9e9e5f1a3d4..31fcd8839d3b 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -58,6 +58,11 @@ * 3. fix error status of stream off * 4. skip frame when change hdr/normal mode * 5. use ldch share buffer to reduce buffer size + * + * v1.2.0: + * 1. resolution write directly to reg for first dev + * 2. normal read back to enable hdr merge + * 3. enable LDCH in 2th frame */ #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 9b29c5a97ad8..8ef6737097ad 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -51,6 +51,15 @@ * 1. isp and ispp sync to power off * 2. fix error status of stream off * 3. use fec share buffer to reduce buffer size + * + * v1.2.0: + * 1. waiting all modules to idle to free buf + * 2. enable sharp dma to ddr default + * 3. using common dummy buf to save memory + * 4. monitor thread to alive during work + * 5. fix monitor thread exit + * 6. tnr/nr/fec sync to start + * 7. fec read yuyv format */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index 42799664286b..df1d40379c17 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(0, 1, 0x9) +#define RKISP_API_VERSION KERNEL_VERSION(1, 2, 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 de1481651887..53f09b74f70d 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(0, 1, 0x9) +#define ISPP_API_VERSION KERNEL_VERSION(1, 2, 0) #define ISPP_MODULE_TNR BIT(0)//2TO1 #define ISPP_MODULE_NR BIT(1)