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

media: rockchip: isp: enable LDCH in 2th frame

Browse Source 
LDCH will compete with LSC/3DLUT for the DDR bus,
which may cause LDCH to read the map table exception.
so isp enable LDCH in 2th frame.

Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: If84139362ee9ca8de43714915f4387923cf21000
This commit is contained in:
Xu Hongfei
2020-11-02 19:31:34 +08:00
committed by Tao Huang
parent d53bd4a922
commit cb3d3f5e4c
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/media/platform/rockchip/isp/isp_params.h
View File

@@ -50,6 +50,7 @@ struct rkisp_isp_params_vdev {
struct v4l2_format vdev_fmt;
bool streamon;
bool first_params;
bool first_cfg_params;
bool hdrtmo_en;
enum v4l2_quantization quantization;

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

@@ -4,7 +4,7 @@
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-core.h>
#include <media/videobuf2-vmalloc.h> /* for ISP params */
#include <media/videobuf2-vmalloc.h> /* for ISP params */
#include <linux/rk-preisp.h>
#include "dev.h"
#include "regs.h"
@@ -3959,9 +3959,14 @@ void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
ops->ldch_config(params_vdev,
&new_params->others.ldch_cfg);
if (module_en_update & ISP2X_MODULE_LDCH)
ops->ldch_enable(params_vdev,
!!(module_ens & ISP2X_MODULE_LDCH));
if (module_en_update & ISP2X_MODULE_LDCH) {
if (params_vdev->first_cfg_params &&
!!(module_ens & ISP2X_MODULE_LDCH))
priv_val->delay_en_ldch = true;
else
ops->ldch_enable(params_vdev,
!!(module_ens & ISP2X_MODULE_LDCH));
}
}
if ((module_en_update & ISP2X_MODULE_GAIN) ||
@@ -4198,9 +4203,13 @@ rkisp_params_first_cfg_v2x(struct rkisp_isp_params_vdev *params_vdev)
priv_val->tmo_en = 0;
priv_val->lsc_en = 0;
priv_val->mge_en = 0;
priv_val->delay_en_ldch = false;
params_vdev->first_cfg_params = true;
__isp_isr_other_config(params_vdev, params_vdev->isp2x_params, RKISP_PARAMS_ALL);
__isp_isr_meas_config(params_vdev, params_vdev->isp2x_params, RKISP_PARAMS_ALL);
__preisp_isr_update_hdrae_para(params_vdev, params_vdev->isp2x_params);
params_vdev->first_cfg_params = false;
params_vdev->cur_hdrtmo = params_vdev->isp2x_params->others.hdrtmo_cfg;
params_vdev->cur_hdrmge = params_vdev->isp2x_params->others.hdrmge_cfg;
params_vdev->last_hdrtmo = params_vdev->cur_hdrtmo;
@@ -4436,6 +4445,17 @@ rkisp_params_isr_v2x(struct rkisp_isp_params_vdev *params_vdev,
params_vdev->rdbk_times--;
if (IS_HDR_RDBK(dev->csi_dev.rd_mode) && !params_vdev->rdbk_times) {
struct rkisp_isp_params_val_v2x *priv_val =
(struct rkisp_isp_params_val_v2x *)params_vdev->priv_val;
if (priv_val->delay_en_ldch) {
struct rkisp_isp_params_v2x_ops *ops =
(struct rkisp_isp_params_v2x_ops *)params_vdev->priv_ops;
ops->ldch_enable(params_vdev, true);
priv_val->delay_en_ldch = false;
}
rkisp_params_cfg_v2x(params_vdev, cur_frame_id, 0, RKISP_PARAMS_SHD);
return;
}

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

@@ -334,6 +334,13 @@ struct rkisp_isp_params_val_v2x {
u8 tmo_en;
u8 lsc_en;
u8 mge_en;
/*
* LDCH will compete with LSC/3DLUT for the DDR bus,
* which may cause LDCH to read the map table exception.
* so enable LDCH in 2th frame.
*/
bool delay_en_ldch;
};
int rkisp_init_params_vdev_v2x(struct rkisp_isp_params_vdev *params_vdev);