A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 06:09:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "msm: camera: tfe: confine hw errata for bengal" into camera-kernel.lnx.4.0

Browse source
This commit is contained in:
Haritha Chintalapati 2020-08-13 14:15:00 -07:00 • committed by Gerrit - the friendly Code Review server
commit f64d8b76f2
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c
View file

@ -1901,6 +1901,7 @@ static int cam_tfe_camif_resource_start(
uint32_t epoch0_irq_mask;
uint32_t epoch1_irq_mask;
uint32_t computed_epoch_line_cfg;
uint32_t camera_hw_version = 0;
if (!camif_res || !core_info) {
CAM_ERR(CAM_ISP, "Error Invalid input arguments");
@ -1963,13 +1964,18 @@ static int cam_tfe_camif_resource_start(
CAM_DBG(CAM_ISP, "TFE:%d core_cfg 0 val:0x%x", core_info->core_index,
val);
val = cam_io_r(rsrc_data->mem_base +
rsrc_data->common_reg->core_cfg_1);
val &= ~BIT(0);
cam_io_w_mb(val, rsrc_data->mem_base +
rsrc_data->common_reg->core_cfg_1);
CAM_DBG(CAM_ISP, "TFE:%d core_cfg 1 val:0x%x", core_info->core_index,
val);
if (cam_cpas_get_cpas_hw_version(&camera_hw_version))
CAM_ERR(CAM_ISP, "Failed to get HW version");
if (camera_hw_version == CAM_CPAS_TITAN_540_V100) {
val = cam_io_r(rsrc_data->mem_base +
rsrc_data->common_reg->core_cfg_1);
val &= ~BIT(0);
cam_io_w_mb(val, rsrc_data->mem_base +
rsrc_data->common_reg->core_cfg_1);
CAM_DBG(CAM_ISP, "TFE:%d core_cfg 1 val:0x%x",
core_info->core_index, val);
}
/* Epoch config */
epoch0_irq_mask = ((rsrc_data->last_line -

2
drivers/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c
View file

@ -1022,7 +1022,7 @@ static int cam_lrme_mgr_create_debugfs_entry(void)
if (!dbgfileptr) {
CAM_ERR(CAM_ISP,"DebugFS could not create directory!");
rc = -ENOENT;
goto end;
goto err;
}
/* Store parent inode for cleanup in caller */
g_lrme_hw_mgr.debugfs_entry.dentry = dbgfileptr;