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

msm: camera: tfe: Fix compilation for TFE

Browse Source 
Fix TFE related compilation failiures in lnx.dev branch.

CRs-Fixed: 3543205
Change-Id: Ie9582f52a5e0960d419d4e791c58e16ae4c7209e
Signed-off-by: Pranav Sanwal <quic_psanwal@quicinc.com>
This commit is contained in:
Pranav Sanwal
2023-07-13 18:08:30 -07:00
committed by Camera Software Integration
parent 4252b1f555
commit eff9517e23
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3718,7 +3718,7 @@ static int cam_isp_tfe_blob_hfr_update(
if (!hw_mgr_res->hw_res[blob_info->base_info->split_id])
return 0;
hw_intf = hw_mgr->tfe_devices[base->idx]->hw_intf;
hw_intf = cam_tfe_hw_mgr_get_hw_intf(blob_info->base_info, ctx);
rc = cam_isp_add_cmd_buf_update(
hw_mgr_res->hw_res[blob_info->base_info->split_id], hw_intf,
blob_type, CAM_ISP_HW_CMD_GET_HFR_UPDATE,
@@ -3898,6 +3898,7 @@ static int cam_isp_tfe_blob_bw_limit_update(
struct cam_kmd_buf_info *kmd_buf_info;
struct cam_tfe_hw_mgr_ctx *ctx = NULL;
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_hw_intf *hw_intf = NULL;
uint32_t res_id_out, i;
uint32_t total_used_bytes = 0;
uint32_t kmd_buf_remain_size;
@@ -3943,10 +3944,12 @@ static int cam_isp_tfe_blob_bw_limit_update(
hw_mgr_res = &ctx->res_list_tfe_out[res_id_out];
hw_intf = cam_tfe_hw_mgr_get_hw_intf(blob_info->base_info, ctx);
rc = cam_isp_add_cmd_buf_update(
hw_mgr_res, blob_type,
hw_mgr_res->hw_res[blob_info->base_info->split_id],
hw_intf,
blob_type,
CAM_ISP_HW_CMD_WM_BW_LIMIT_CONFIG,
blob_info->base_info->idx,
(void *)cmd_buf_addr,
kmd_buf_remain_size,
(void *)wm_bw_limit_cfg,
@@ -4135,7 +4138,6 @@ static int cam_isp_tfe_packet_generic_blob_handler(void *user_data,
}
break;
case CAM_ISP_TFE_GENERIC_BLOB_TYPE_BW_CONFIG_V2: {
size_t bw_config_size = 0;
struct cam_isp_tfe_bw_config_v2 *bw_config =
(struct cam_isp_tfe_bw_config_v2 *)blob_data;
struct cam_isp_prepare_hw_update_data *prepare_hw_data;
@@ -4194,13 +4196,13 @@ static int cam_isp_tfe_packet_generic_blob_handler(void *user_data,
for (i = 0; i < bw_config->num_paths; i++) {
path_vote = &prepare_hw_data->bw_clk_config.bw_config_v2.axi_path[i];
path_vote.usage_data = bw_config->axi_path[i].usage_data;
path_vote.transac_type = bw_config->axi_path[i].transac_type;
path_vote.path_data_type = bw_config->axi_path[i].path_data_type;
path_vote.vote_level = 0;
path_vote.camnoc_bw = bw_config->axi_path[i].camnoc_bw;
path_vote.mnoc_ab_bw = bw_config->axi_path[i].mnoc_ab_bw;
path_vote.mnoc_ib_bw = bw_config->axi_path[i].mnoc_ib_bw;
path_vote->usage_data = bw_config->axi_path[i].usage_data;
path_vote->transac_type = bw_config->axi_path[i].transac_type;
path_vote->path_data_type = bw_config->axi_path[i].path_data_type;
path_vote->vote_level = 0;
path_vote->camnoc_bw = bw_config->axi_path[i].camnoc_bw;
path_vote->mnoc_ab_bw = bw_config->axi_path[i].mnoc_ab_bw;
path_vote->mnoc_ib_bw = bw_config->axi_path[i].mnoc_ib_bw;
}
tfe_mgr_ctx->bw_config_version = CAM_ISP_BW_CONFIG_V2;
@@ -4569,7 +4571,7 @@ static int cam_tfe_mgr_prepare_hw_update(void *hw_mgr_priv,
return rc;
rc = cam_packet_util_process_patches(prepare->packet,
prepare->track_buf_list, hw_mgr->mgr_common.cmd_iommu_hdl,
prepare->buf_tracker, hw_mgr->mgr_common.cmd_iommu_hdl,
hw_mgr->mgr_common.cmd_iommu_hdl_secure, false);
if (rc) {
CAM_ERR(CAM_ISP, "Patch ISP packet failed.");
@@ -4626,14 +4628,14 @@ static int cam_tfe_mgr_prepare_hw_update(void *hw_mgr_priv,
io_buf_info.scratch_check_cfg = &check_for_scratch;
io_buf_info.prepare = prepare;
io_buf_info.kmd_buf_info = &prepare_hw_data->kmd_cmd_buff_info;
io_buf_info.res_list_ife_in_rd = NULL;
io_buf_info.res_list_in_rd = NULL;
io_buf_info.iommu_hdl = hw_mgr->mgr_common.img_iommu_hdl;
io_buf_info.sec_iommu_hdl = hw_mgr->mgr_common.img_iommu_hdl_secure;
io_buf_info.base = &ctx->base[i];
io_buf_info.fill_fence = fill_fence;
io_buf_info.out_base = CAM_ISP_TFE_OUT_RES_BASE;
io_buf_info.out_max = CAM_TFE_HW_OUT_RES_MAX;
io_buf_info.res_list_isp_out = ctx->res_list_ife_out;
io_buf_info.res_list_isp_out = ctx->res_list_tfe_out;
rc = cam_isp_add_io_buffers(&io_buf_info);
if (rc) {
@@ -4852,7 +4854,7 @@ static void cam_tfe_mgr_dump_pf_data(
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_isp_hw_get_cmd_update cmd_update;
struct cam_isp_hw_get_res_for_mid get_res;
struct cam_packet *packet;
struct cam_packet *packet = NULL;
struct cam_hw_cmd_pf_args *pf_cmd_args;
uint32_t *resource_type;
uint32_t hw_id;
@@ -4862,10 +4864,10 @@ static void cam_tfe_mgr_dump_pf_data(
ctx = (struct cam_tfe_hw_mgr_ctx *)hw_cmd_args->ctxt_to_hw_map;
pf_cmd_args = hw_cmd_args->u.pf_cmd_args;
rc = cam_packet_util_get_packet_addr(packet,
rc = cam_packet_util_get_packet_addr(&packet,
pf_cmd_args->pf_req_info->packet_handle, pf_cmd_args->pf_req_info->packet_offset);
if (rc)
return rc;
return;
ctx_found = &pf_cmd_args->pf_args->pf_context_info.ctx_found;
resource_type = &pf_cmd_args->pf_args->pf_context_info.resource_type;

5
drivers/cam_isp/isp_hw_mgr/isp_hw/include/cam_tfe_hw_intf.h
View File

@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef _CAM_TFE_HW_INTF_H_
@@ -92,6 +93,7 @@ struct cam_tfe_hw_get_hw_cap {
* (Default is Master in case of Single TFE)
* @cdm_ops: CDM operations
* @ctx: Context data
* @comp_grp_id: TFE bus comp group id
*/
struct cam_tfe_hw_tfe_out_acquire_args {
struct cam_isp_resource_node *rsrc_node;
@@ -102,6 +104,7 @@ struct cam_tfe_hw_tfe_out_acquire_args {
uint32_t is_master;
struct cam_cdm_utils_ops *cdm_ops;
void *ctx;
uint32_t comp_grp_id;
};
/*
@@ -221,6 +224,7 @@ struct cam_tfe_bw_control_args {
* @error_type: Identify different errors
* @enable_reg_dump: enable register dump on error
* @ts: Timestamp
* @last_consumed_addr: Last consumed addr for resource
*/
struct cam_tfe_irq_evt_payload {
struct list_head list;
@@ -237,6 +241,7 @@ struct cam_tfe_irq_evt_payload {
uint32_t error_type;
bool enable_reg_dump;
struct cam_isp_timestamp ts;
uint32_t last_consumed_addr;
};
/*

1
drivers/cam_isp/isp_hw_mgr/isp_hw/tfe_hw/cam_tfe_bus.c
View File

@@ -504,6 +504,7 @@ static int cam_tfe_bus_get_wm_idx(
break;
case PLANE_C:
wm_idx = 14;
break;
default:
break;
}

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

@@ -1541,7 +1541,6 @@ static int cam_tfe_hw_dump(
uint32_t num_reg;
uint32_t lut_word_size, lut_size;
uint32_t lut_bank_sel, lut_dmi_reg;
uint32_t val;
void __iomem *reg_base;
void __iomem *mem_base;
uint32_t *addr, *start;

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

@@ -174,8 +174,8 @@ int cam_tfe_enable_soc_resources(struct cam_hw_soc_info *soc_info)
goto end;
}
rc = cam_soc_util_enable_platform_resource(soc_info, CAM_CLK_SW_CLIENT_IDXs, true,
soc_info->lowest_clk_level, true);
rc = cam_soc_util_enable_platform_resource(soc_info, CAM_CLK_SW_CLIENT_IDX, true,
CAM_LOWSVS_VOTE, true);
if (rc) {
CAM_ERR(CAM_ISP, "Error! enable platform failed rc=%d", rc);
goto stop_cpas;