samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: camera: common: Support compilation for new code base" into camera-kernel.lnx.5.0

Browse Source
This commit is contained in:
Savita Patted
2021-03-10 16:09:33 -08:00
committed by Gerrit - the friendly Code Review server
parent c3ecd6ea84 c4d1380c55
commit b3a6000ae7
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/netrani.mk Normal file
View File

@@ -0,0 +1,13 @@
# Settings for compiling netrani camera architecture
# Localized KCONFIG settings
CONFIG_SPECTRA_ISP := y
CONFIG_SPECTRA_ICP := y
CONFIG_SPECTRA_TFE := y
CONFIG_SPECTRA_SENSOR := y
# Flags to pass into C preprocessor
ccflags-y += -DCONFIG_SPECTRA_ISP=1
ccflags-y += -DCONFIG_SPECTRA_ICP=1
ccflags-y += -DCONFIG_SPECTRA_TFE=1
ccflags-y += -DCONFIG_SPECTRA_SENSOR=1

8
drivers/cam_isp/isp_hw_mgr/cam_tfe_hw_mgr.c
View File

@@ -5621,18 +5621,18 @@ static int cam_tfe_hw_mgr_debug_register(void)
dbgfileptr = debugfs_create_file("tfe_csid_debug", 0644, dbgfileptr = debugfs_create_file("tfe_csid_debug", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, NULL, &cam_tfe_csid_debug); g_tfe_hw_mgr.debug_cfg.dentry, NULL, &cam_tfe_csid_debug);
dbgfileptr = debugfs_create_u32("enable_recovery", 0644, debugfs_create_u32("enable_recovery", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, g_tfe_hw_mgr.debug_cfg.dentry,
&g_tfe_hw_mgr.debug_cfg.enable_recovery); &g_tfe_hw_mgr.debug_cfg.enable_recovery);
dbgfileptr = debugfs_create_u32("enable_reg_dump", 0644, debugfs_create_u32("enable_reg_dump", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, g_tfe_hw_mgr.debug_cfg.dentry,
&g_tfe_hw_mgr.debug_cfg.enable_reg_dump); &g_tfe_hw_mgr.debug_cfg.enable_reg_dump);
dbgfileptr = debugfs_create_u32("enable_csid_recovery", 0644, debugfs_create_u32("enable_csid_recovery", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, g_tfe_hw_mgr.debug_cfg.dentry,
&g_tfe_hw_mgr.debug_cfg.enable_csid_recovery); &g_tfe_hw_mgr.debug_cfg.enable_csid_recovery);
dbgfileptr = debugfs_create_file("tfe_camif_debug", 0644, dbgfileptr = debugfs_create_file("tfe_camif_debug", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, NULL, &cam_tfe_camif_debug); g_tfe_hw_mgr.debug_cfg.dentry, NULL, &cam_tfe_camif_debug);
dbgfileptr = debugfs_create_u32("per_req_reg_dump", 0644, debugfs_create_u32("per_req_reg_dump", 0644,
g_tfe_hw_mgr.debug_cfg.dentry, g_tfe_hw_mgr.debug_cfg.dentry,
&g_tfe_hw_mgr.debug_cfg.per_req_reg_dump); &g_tfe_hw_mgr.debug_cfg.per_req_reg_dump);
if (IS_ERR(dbgfileptr)) { if (IS_ERR(dbgfileptr)) {

4
drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_core.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
*/ */
#include <linux/delay.h> #include <linux/delay.h>
@@ -2141,7 +2141,7 @@ int cam_tfe_top_start(struct cam_tfe_hw_core_info *core_info,
if (in_res->res_id == CAM_ISP_HW_TFE_IN_CAMIF) { if (in_res->res_id == CAM_ISP_HW_TFE_IN_CAMIF) {
cam_tfe_camif_resource_start(core_info, in_res); cam_tfe_camif_resource_start(core_info, in_res);
} else if (in_res->res_id >= CAM_ISP_HW_TFE_IN_RDI0 || } else if (in_res->res_id >= CAM_ISP_HW_TFE_IN_RDI0 &&
in_res->res_id <= CAM_ISP_HW_TFE_IN_RDI2) { in_res->res_id <= CAM_ISP_HW_TFE_IN_RDI2) {
rsrc_rdi_data = (struct cam_tfe_rdi_data *) in_res->res_priv; rsrc_rdi_data = (struct cam_tfe_rdi_data *) in_res->res_priv;
val = (rsrc_rdi_data->pix_pattern << val = (rsrc_rdi_data->pix_pattern <<