shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix csm range to full

Browse Source 
csm->cgc->cproc->ie, and sharp no support
limit range from csm, so fix csm range to full and
cgc to config limit or full range.

Change-Id: Iccc3e7254d55c0e7b61e33028af88e7685e9f1e5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-05-09 10:53:16 +08:00
committed by Tao Huang
parent a7dcda114f
commit 34086f9377
3 changed files with 90 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/media/platform/rockchip/isp/isp_params_v21.c
View File

@@ -3322,7 +3322,7 @@ static void
isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_csm_cfg *arg)
{
u32 i, val, eff_ctrl, cproc_ctrl;
u32 i, val;
for (i = 0; i < ISP21_CSM_COEFF_NUM; i++) {
if (i == 0)
@@ -3335,32 +3335,7 @@ isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
}
val = CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
if (arg->csm_full_range) {
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
isp_param_set_bits(params_vdev, ISP_CTRL, val);
} else {
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
isp_param_clear_bits(params_vdev, ISP_CTRL, val);
}
eff_ctrl = rkisp_ioread32(params_vdev, CIF_IMG_EFF_CTRL);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->csm_full_range)
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
rkisp_iowrite32(params_vdev, eff_ctrl, CIF_IMG_EFF_CTRL);
}
cproc_ctrl = rkisp_ioread32(params_vdev, CPROC_CTRL);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE || !arg->csm_full_range)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
rkisp_iowrite32(params_vdev, cproc_ctrl, CPROC_CTRL);
}
isp_param_set_bits(params_vdev, ISP_CTRL, val);
}
static void
@@ -3368,13 +3343,36 @@ isp_cgc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_cgc_cfg *arg)
{
u32 val = rkisp_ioread32(params_vdev, ISP_CTRL);
u32 eff_ctrl, cproc_ctrl;
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
val &= ~(ISP21_CGC_YUV_LIMIT | ISP21_CGC_RATIO_EN);
if (arg->yuv_limit)
if (arg->yuv_limit) {
val |= ISP21_CGC_YUV_LIMIT;
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
}
if (arg->ratio_en)
val |= ISP21_CGC_RATIO_EN;
rkisp_iowrite32(params_vdev, val, ISP_CTRL);
cproc_ctrl = rkisp_ioread32(params_vdev, CPROC_CTRL);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (arg->yuv_limit)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
rkisp_iowrite32(params_vdev, cproc_ctrl, CPROC_CTRL);
}
eff_ctrl = rkisp_ioread32(params_vdev, CIF_IMG_EFF_CTRL);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->yuv_limit)
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
rkisp_iowrite32(params_vdev, eff_ctrl, CIF_IMG_EFF_CTRL);
}
}
struct rkisp_isp_params_v21_ops rkisp_v21_isp_params_ops = {
@@ -3486,12 +3484,13 @@ void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
if ((module_cfg_update & ISP2X_MODULE_GOC))
ops->goc_config(params_vdev, &new_params->others.gammaout_cfg);
if ((module_cfg_update & ISP2X_MODULE_CGC))
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
/* range csm->cgc->cproc->ie */
if ((module_cfg_update & ISP2X_MODULE_CSM))
ops->csm_config(params_vdev, &new_params->others.csm_cfg);
if ((module_cfg_update & ISP2X_MODULE_CGC))
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
if ((module_cfg_update & ISP2X_MODULE_CPROC))
ops->cproc_config(params_vdev, &new_params->others.cproc_cfg);

61
drivers/media/platform/rockchip/isp/isp_params_v32.c
View File

@@ -3527,7 +3527,7 @@ static void
isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_csm_cfg *arg)
{
u32 i, val, eff_ctrl, cproc_ctrl;
u32 i, val;
for (i = 0; i < ISP32_CSM_COEFF_NUM; i++) {
if (i == 0)
@@ -3540,33 +3540,8 @@ isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
}
val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
if (arg->csm_full_range) {
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
val |= CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
} else {
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
val &= ~(CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA);
}
val |= CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->csm_full_range)
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
}
cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE || !arg->csm_full_range)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL);
}
}
static void
@@ -3574,13 +3549,36 @@ isp_cgc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_cgc_cfg *arg)
{
u32 val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
u32 eff_ctrl, cproc_ctrl;
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
val &= ~(ISP3X_SW_CGC_YUV_LIMIT | ISP3X_SW_CGC_RATIO_EN);
if (arg->yuv_limit)
if (arg->yuv_limit) {
val |= ISP3X_SW_CGC_YUV_LIMIT;
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
}
if (arg->ratio_en)
val |= ISP3X_SW_CGC_RATIO_EN;
isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (arg->yuv_limit)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL);
}
eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->yuv_limit)
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
}
}
static void
@@ -3747,12 +3745,13 @@ void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
if (module_cfg_update & ISP32_MODULE_GOC)
ops->goc_config(params_vdev, &new_params->others.gammaout_cfg);
if (module_cfg_update & ISP3X_MODULE_CGC)
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
/* range csm->cgc->cproc->ie */
if (module_cfg_update & ISP3X_MODULE_CSM)
ops->csm_config(params_vdev, &new_params->others.csm_cfg);
if (module_cfg_update & ISP3X_MODULE_CGC)
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
if (module_cfg_update & ISP32_MODULE_CPROC)
ops->cproc_config(params_vdev, &new_params->others.cproc_cfg);

61
drivers/media/platform/rockchip/isp/isp_params_v3x.c
View File

@@ -3653,7 +3653,7 @@ static void
isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_csm_cfg *arg, u32 id)
{
u32 i, val, eff_ctrl, cproc_ctrl;
u32 i, val;
for (i = 0; i < ISP3X_CSM_COEFF_NUM; i++) {
if (i == 0)
@@ -3666,32 +3666,7 @@ isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
}
val = CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
if (arg->csm_full_range) {
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL0, val, id);
} else {
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL0, val, id);
}
eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->csm_full_range)
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
}
cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL, id);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE || !arg->csm_full_range)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL, id);
}
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL0, val, id);
}
static void
@@ -3699,13 +3674,36 @@ isp_cgc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_cgc_cfg *arg, u32 id)
{
u32 val = isp3_param_read(params_vdev, ISP3X_ISP_CTRL0, id);
u32 eff_ctrl, cproc_ctrl;
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
val &= ~(ISP3X_SW_CGC_YUV_LIMIT | ISP3X_SW_CGC_RATIO_EN);
if (arg->yuv_limit)
if (arg->yuv_limit) {
val |= ISP3X_SW_CGC_YUV_LIMIT;
params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
}
if (arg->ratio_en)
val |= ISP3X_SW_CGC_RATIO_EN;
isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0, id);
cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL, id);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (arg->yuv_limit)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL, id);
}
eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->yuv_limit)
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
}
}
struct rkisp_isp_params_ops_v3x isp_params_ops_v3x = {
@@ -3825,12 +3823,13 @@ void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
if ((module_cfg_update & ISP3X_MODULE_GOC))
ops->goc_config(params_vdev, &new_params->others.gammaout_cfg, id);
if ((module_cfg_update & ISP3X_MODULE_CGC))
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg, id);
/* range csm->cgc->cproc->ie */
if ((module_cfg_update & ISP3X_MODULE_CSM))
ops->csm_config(params_vdev, &new_params->others.csm_cfg, id);
if ((module_cfg_update & ISP3X_MODULE_CGC))
ops->cgc_config(params_vdev, &new_params->others.cgc_cfg, id);
if ((module_cfg_update & ISP3X_MODULE_CPROC))
ops->cproc_config(params_vdev, &new_params->others.cproc_cfg, id);