From a8b02396070edce07bd21e2af34090d1b715a809 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Mon, 7 Jun 2021 18:10:00 +0800 Subject: [PATCH] media: rockchip: isp/ispp to version v1.6.1 Change-Id: I6a9cdac4874a02cb0465c87aa23d7180d2109d3d Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/version.h | 17 +++++++++++++++++ drivers/media/platform/rockchip/ispp/version.h | 4 ++++ include/uapi/linux/rkisp2-config.h | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/isp/version.h b/drivers/media/platform/rockchip/isp/version.h index a59efa602afa..c70ac7747371 100644 --- a/drivers/media/platform/rockchip/isp/version.h +++ b/drivers/media/platform/rockchip/isp/version.h @@ -123,6 +123,23 @@ * 9. fix err of mp dump raw for isp20 * 10. make sure 3dlut no continuous read twice * 11. adjust rdbk times with mulit dev for isp2.0 + * + * v1.6.1: + * 1.fix multi dev refcnt + * 2.update procfs info + * 3.add check for params subscribe event + * 4.resolution limit for isp21 + * 5.dma buf alloc limit to DMA32 + * 6.add monitor to restart if abnormal + * 7.adjust probe order + * 8.max height 3072 for isp21 + * 9.dmatx support embedded and shield pixels data + * 10.separate rdbk from csi subdev + * 11.add bt601/bt709/bt2020 colorspace + * 12.apply en params if no match for isp20 + * 13.apply en params if no match for isp21 + * 14.isp21 get 3a stats from ddr + * 15.reserved memory using rdma_sg ops */ #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 feba8cf64fbd..69979689aca3 100644 --- a/drivers/media/platform/rockchip/ispp/version.h +++ b/drivers/media/platform/rockchip/ispp/version.h @@ -99,6 +99,10 @@ * 9. add cru reset * 10. check SHARP_CORE_CTRL after update * 11. add uvnr sd32 self en control + * + * v1.6.1 + * 1. reserved memory using rdma_sg ops + * 2. destory ispp buffers if start_stream failed */ #define RKISPP_DRIVER_VERSION ISPP_API_VERSION diff --git a/include/uapi/linux/rkisp2-config.h b/include/uapi/linux/rkisp2-config.h index eab435765d23..079bd9c7e2d4 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, 0) +#define RKISP_API_VERSION KERNEL_VERSION(1, 6, 1) #define RKISP_CMD_TRIGGER_READ_BACK \ _IOW('V', BASE_VIDIOC_PRIVATE + 0, struct isp2x_csi_trigger)