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: remove associated of cproc and ie

Browse Source 
Change-Id: Ic4d6171398322e24993e4a0419fd43fae85672b8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-09-15 11:14:12 +08:00
parent bbeb468d79
commit c6fc3119d6
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/platform/rockchip/isp/isp_params_v1x.c
View File

@@ -769,10 +769,6 @@ static void isp_aec_config_v12(struct rkisp_isp_params_vdev *params_vdev,
static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct cifisp_cproc_config *arg)
{
struct cifisp_isp_other_cfg *cur_other_cfg =
&params_vdev->isp1x_params->others;
struct cifisp_ie_config *cur_ie_config = &cur_other_cfg->ie_config;
u32 effect = cur_ie_config->effect;
u32 quantization = params_vdev->quantization;
rkisp1_iowrite32(params_vdev, arg->contrast, CIF_C_PROC_CONTRAST);
@@ -780,8 +776,7 @@ static void isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
rkisp1_iowrite32(params_vdev, arg->sat, CIF_C_PROC_SATURATION);
rkisp1_iowrite32(params_vdev, arg->brightness, CIF_C_PROC_BRIGHTNESS);
if (quantization != V4L2_QUANTIZATION_FULL_RANGE ||
effect != V4L2_COLORFX_NONE) {
if (quantization != V4L2_QUANTIZATION_FULL_RANGE) {
isp_param_clear_bits(params_vdev, CIF_C_PROC_CTRL,
CIF_C_PROC_YOUT_FULL |
CIF_C_PROC_YIN_FULL |

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

@@ -905,10 +905,6 @@ static void
isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_cproc_cfg *arg)
{
struct isp21_isp_other_cfg *cur_other_cfg =
&params_vdev->isp21_params->others;
struct isp2x_ie_cfg *cur_ie_config = &cur_other_cfg->ie_cfg;
u32 effect = cur_ie_config->effect;
u32 quantization = params_vdev->quantization;
rkisp_iowrite32(params_vdev, arg->contrast, CPROC_CONTRAST);
@@ -916,8 +912,7 @@ isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
rkisp_iowrite32(params_vdev, arg->sat, CPROC_SATURATION);
rkisp_iowrite32(params_vdev, arg->brightness, CPROC_BRIGHTNESS);
if (quantization != V4L2_QUANTIZATION_FULL_RANGE ||
effect != V4L2_COLORFX_NONE) {
if (quantization != V4L2_QUANTIZATION_FULL_RANGE) {
isp_param_clear_bits(params_vdev, CPROC_CTRL,
CIF_C_PROC_YOUT_FULL |
CIF_C_PROC_YIN_FULL |

7
drivers/media/platform/rockchip/isp/isp_params_v2x.c
View File

@@ -954,10 +954,6 @@ static void
isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_cproc_cfg *arg)
{
struct isp2x_isp_other_cfg *cur_other_cfg =
&params_vdev->isp2x_params->others;
struct isp2x_ie_cfg *cur_ie_config = &cur_other_cfg->ie_cfg;
u32 effect = cur_ie_config->effect;
u32 quantization = params_vdev->quantization;
rkisp_iowrite32(params_vdev, arg->contrast, CPROC_CONTRAST);
@@ -965,8 +961,7 @@ isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
rkisp_iowrite32(params_vdev, arg->sat, CPROC_SATURATION);
rkisp_iowrite32(params_vdev, arg->brightness, CPROC_BRIGHTNESS);
if (quantization != V4L2_QUANTIZATION_FULL_RANGE ||
effect != V4L2_COLORFX_NONE) {
if (quantization != V4L2_QUANTIZATION_FULL_RANGE) {
isp_param_clear_bits(params_vdev, CPROC_CTRL,
CIF_C_PROC_YOUT_FULL |
CIF_C_PROC_YIN_FULL |