From b2cdfdd52ad0ab0f5b079dd014fcf327159bb9d6 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Wed, 31 Jan 2024 14:16:02 +0800 Subject: [PATCH] media: rockchip: isp: fix isp32 bp min output Change-Id: Ic711a9b668cc6f832d4752700e63db54a50ed594 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/capture.c | 8 -------- drivers/media/platform/rockchip/isp/capture.h | 8 ++++++++ drivers/media/platform/rockchip/isp/capture_v32.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture.c b/drivers/media/platform/rockchip/isp/capture.c index bad561885b92..76165eb4ba92 100644 --- a/drivers/media/platform/rockchip/isp/capture.c +++ b/drivers/media/platform/rockchip/isp/capture.c @@ -13,14 +13,6 @@ #include "regs.h" #include "rkisp_tb_helper.h" -#define STREAM_MAX_MP_RSZ_OUTPUT_WIDTH 4416 -#define STREAM_MAX_MP_RSZ_OUTPUT_HEIGHT 3312 -#define STREAM_MAX_SP_RSZ_OUTPUT_WIDTH 1920 -#define STREAM_MAX_SP_RSZ_OUTPUT_HEIGHT 1080 -#define STREAM_MIN_RSZ_OUTPUT_WIDTH 32 -#define STREAM_MIN_RSZ_OUTPUT_HEIGHT 32 -#define STREAM_OUTPUT_STEP_WISE 8 - #define STREAM_MIN_MP_SP_INPUT_WIDTH STREAM_MIN_RSZ_OUTPUT_WIDTH #define STREAM_MIN_MP_SP_INPUT_HEIGHT STREAM_MIN_RSZ_OUTPUT_HEIGHT diff --git a/drivers/media/platform/rockchip/isp/capture.h b/drivers/media/platform/rockchip/isp/capture.h index d382f6cd888c..26b9ee90aa6c 100644 --- a/drivers/media/platform/rockchip/isp/capture.h +++ b/drivers/media/platform/rockchip/isp/capture.h @@ -57,6 +57,14 @@ #define DMATX2_VDEV_NAME DRIVER_NAME "_rawwr2" #define DMATX3_VDEV_NAME DRIVER_NAME "_rawwr3" +#define STREAM_MAX_MP_RSZ_OUTPUT_WIDTH 4416 +#define STREAM_MAX_MP_RSZ_OUTPUT_HEIGHT 3312 +#define STREAM_MAX_SP_RSZ_OUTPUT_WIDTH 1920 +#define STREAM_MAX_SP_RSZ_OUTPUT_HEIGHT 1080 +#define STREAM_MIN_RSZ_OUTPUT_WIDTH 32 +#define STREAM_MIN_RSZ_OUTPUT_HEIGHT 32 +#define STREAM_OUTPUT_STEP_WISE 8 + struct rkisp_stream; enum { diff --git a/drivers/media/platform/rockchip/isp/capture_v32.c b/drivers/media/platform/rockchip/isp/capture_v32.c index e33313869ce1..a0d60cbd16e6 100644 --- a/drivers/media/platform/rockchip/isp/capture_v32.c +++ b/drivers/media/platform/rockchip/isp/capture_v32.c @@ -359,8 +359,8 @@ static struct stream_config rkisp_bp_stream_config = { .fmt_size = ARRAY_SIZE(bp_fmts), .max_rsz_width = CIF_ISP_INPUT_W_MAX_V32, .max_rsz_height = CIF_ISP_INPUT_H_MAX_V32, - .min_rsz_width = CIF_ISP_INPUT_W_MIN, - .min_rsz_height = CIF_ISP_INPUT_H_MIN, + .min_rsz_width = STREAM_MIN_RSZ_OUTPUT_WIDTH, + .min_rsz_height = STREAM_MIN_RSZ_OUTPUT_HEIGHT, .frame_end_id = ISP3X_MI_BP_FRAME, .rsz = { .ctrl = ISP32_BP_RESIZE_CTRL,