From 7f51aa1c408a6055e73222b83104102463c2d47b Mon Sep 17 00:00:00 2001 From: Xu Hongfei Date: Fri, 29 Jan 2021 10:28:13 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.5.1 Signed-off-by: Xu Hongfei Change-Id: Ie67690626c55f2c41a1b246f0b9349aff46972bb --- drivers/media/platform/rockchip/isp/version.h | 14 ++++++++++++++ drivers/media/platform/rockchip/ispp/version.h | 5 +++++ include/uapi/linux/rkisp2-config.h | 2 +- include/uapi/linux/rkispp-config.h | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index af529ad40cb2..2ae26b0f7779 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -97,6 +97,20 @@ * 2. get stats only when meas done is on * 3. fix lsc lut error in start/stop test * + * v1.5.1: + * 1. support to set format if no streaming + * 2. add vb2_rdma_sg_memops to support contiguous page + * 3. fix gain buf update + * 4. 64 align y size for fbcgain format + * 5. add trigger mode ioctl + * 6. fix config of clk_dbg + * 7. fix path select of cif input + * 8. fix mpfbc buf update if readback off + * 9. fix array overflow + * 10. use force big mode when auto big mode is incorrect + * 11. fix extend line with isp input crop case + * 12. set lgmean related regs for tmo in hdr isr + * */ #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 b2c4bf6803c6..b6a7cf302886 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -82,6 +82,11 @@ * 2. fix panic for vmap at interrupt * 3. add virtual video for iqtool * + * v1.5.1 + * 1. add vb2_rdma_sg_memops to support contiguous page + * 2. fix config of clk_dbg + * 3. check frame id when apply params + * */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index 33bbcad498be..41f9b2239098 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, 4, 1) +#define RKISP_API_VERSION KERNEL_VERSION(1, 5, 1) #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 5146cd60f224..08f048f9c2e1 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, 4, 1) +#define ISPP_API_VERSION KERNEL_VERSION(1, 5, 1) #define ISPP_ID_TNR (0) #define ISPP_ID_NR (1)