From 11258c202867f1bb218d3a1063a5a20e33df8b11 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Mon, 15 Nov 2021 18:14:28 +0800 Subject: [PATCH] media: rockchip: cif change image offset to match isp unite Signed-off-by: Zefa Chen Change-Id: I00b658f7ac2cf551fab4c94fd914c62893891b47 --- drivers/media/platform/rockchip/cif/subdev-itf.c | 7 ++++--- drivers/media/platform/rockchip/cif/subdev-itf.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.c b/drivers/media/platform/rockchip/cif/subdev-itf.c index ef31cad2c53c..7573e0d10388 100644 --- a/drivers/media/platform/rockchip/cif/subdev-itf.c +++ b/drivers/media/platform/rockchip/cif/subdev-itf.c @@ -21,6 +21,7 @@ #include #include "dev.h" #include +#include static inline struct sditf_priv *to_sditf_priv(struct v4l2_subdev *subdev) { @@ -339,7 +340,7 @@ static int sditf_channel_enable(struct sditf_priv *priv, int user) } if (user == 0) { if (priv->toisp_inf.link_mode == TOISP_UNITE) - width = priv->cap_info.width / 2 + 256; + width = priv->cap_info.width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL; rkcif_write_register_or(cif_dev, CIF_REG_TOISP0_CTRL, ctrl_val); if (width && height) { rkcif_write_register(cif_dev, CIF_REG_TOISP0_CROP, @@ -352,8 +353,8 @@ static int sditf_channel_enable(struct sditf_priv *priv, int user) rkcif_write_register_or(cif_dev, CIF_REG_GLB_INTEN, int_en); } else { if (priv->toisp_inf.link_mode == TOISP_UNITE) { - offset_x = priv->cap_info.width / 2 - 256; - width = priv->cap_info.width / 2 + 256; + offset_x = priv->cap_info.width / 2 - RKMOUDLE_UNITE_EXTEND_PIXEL; + width = priv->cap_info.width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL; } rkcif_write_register_or(cif_dev, CIF_REG_TOISP1_CTRL, ctrl_val); if (width && height) { diff --git a/drivers/media/platform/rockchip/cif/subdev-itf.h b/drivers/media/platform/rockchip/cif/subdev-itf.h index c432fbc4bf0a..a1ebbe02a820 100644 --- a/drivers/media/platform/rockchip/cif/subdev-itf.h +++ b/drivers/media/platform/rockchip/cif/subdev-itf.h @@ -21,7 +21,7 @@ #define RKISP0_DEVNAME "rkisp0" #define RKISP1_DEVNAME "rkisp1" -#define RKISP_UNITE_DEVNAME "rkisp_unite" +#define RKISP_UNITE_DEVNAME "rkisp-unite" #define RKCIF_TOISP_CH0 0 #define RKCIF_TOISP_CH1 1