samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Vork 0
Code Kwesties Pull-aanvragen Actions Packages Projecten Publicaties Wiki Activiteit

msm: camera: isp: Address SFE BW issues

Bladeren bron 
Fix the logic classifying BW vote from userspace.
Correct log strings for SFE usage data.

CRs-Fixed: 2841729
Change-Id: Ife7eb5635e97b376a05696c1c5406972bcf4a7c8
Signed-off-by: Karthik Anantha Ram <kartanan@codeaurora.org>
This commit is contained in:
Karthik Anantha Ram
2021-03-18 22:43:02 -07:00
bovenliggende 536d5a9599
commit a17df881bf
3 gewijzigde bestanden met toevoegingen van 145 en 118 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

12
drivers/cam_cpas/cam_cpas_intf.c
Bestand weergeven

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/of.h>
@@ -102,15 +102,15 @@ const char *cam_cpas_axi_util_path_type_to_string(
case CAM_AXI_PATH_DATA_SFE_NRDI:
return "SFE_NRDI";
case CAM_AXI_PATH_DATA_SFE_RDI0:
return "IFE_RDI0";
return "SFE_RDI0";
case CAM_AXI_PATH_DATA_SFE_RDI1:
return "IFE_RDI1";
return "SFE_RDI1";
case CAM_AXI_PATH_DATA_SFE_RDI2:
return "IFE_RDI2";
return "SFE_RDI2";
case CAM_AXI_PATH_DATA_SFE_RDI3:
return "IFE_RDI3";
return "SFE_RDI3";
case CAM_AXI_PATH_DATA_SFE_RDI4:
return "IFE_RDI4";
return "SFE_RDI4";
case CAM_AXI_PATH_DATA_SFE_STATS:
return "SFE_STATS";

237
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
Bestand weergeven

@@ -5073,6 +5073,12 @@ static const char *cam_isp_util_usage_data_to_string(
return "RIGHT_PX";
case CAM_ISP_USAGE_RDI:
return "RDI";
case CAM_ISP_USAGE_SFE_LEFT:
return "SFE_LEFT_PX";
case CAM_ISP_USAGE_SFE_RIGHT:
return "SFE_RIGHT_PX";
case CAM_ISP_USAGE_SFE_RDI:
return "SFE_RDI";
default:
return "USAGE_INVALID";
}
@@ -5082,23 +5088,63 @@ static int cam_isp_classify_vote_info(
struct cam_isp_hw_mgr_res *hw_mgr_res,
struct cam_isp_bw_config_v2 *bw_config,
struct cam_axi_vote *isp_vote,
uint32_t hw_type,
uint32_t split_idx,
bool *nrdi_l_bw_updated,
bool *nrdi_r_bw_updated)
{
int rc = 0, i, j = 0;
if ((hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_CAMIF)
|| (hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_RD) ||
(hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_PDLIB) ||
(hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_LCR)) {
if (split_idx == CAM_ISP_HW_SPLIT_LEFT) {
if (*nrdi_l_bw_updated)
return rc;
if (hw_type == CAM_ISP_HW_TYPE_VFE) {
if ((hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_CAMIF)
|| (hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_RD) ||
(hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_PDLIB) ||
(hw_mgr_res->res_id == CAM_ISP_HW_VFE_IN_LCR)) {
if (split_idx == CAM_ISP_HW_SPLIT_LEFT) {
if (*nrdi_l_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_LEFT_PX) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_l_bw_updated = true;
} else {
if (*nrdi_r_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RIGHT_PX) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_r_bw_updated = true;
}
} else if ((hw_mgr_res->res_id >= CAM_ISP_HW_VFE_IN_RDI0)
&& (hw_mgr_res->res_id <=
CAM_ISP_HW_VFE_IN_RDI3)) {
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_LEFT_PX) {
if ((bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RDI) &&
((bw_config->axi_path[i].path_data_type -
CAM_AXI_PATH_DATA_IFE_RDI0) ==
(hw_mgr_res->res_id -
CAM_ISP_HW_VFE_IN_RDI0))) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
@@ -5108,108 +5154,77 @@ static int cam_isp_classify_vote_info(
}
isp_vote->num_paths = j;
*nrdi_l_bw_updated = true;
} else {
if (*nrdi_r_bw_updated)
if (hw_mgr_res->hw_res[split_idx]) {
CAM_ERR(CAM_ISP, "Invalid res_id %u, split_idx: %u",
hw_mgr_res->res_id, split_idx);
rc = -EINVAL;
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RIGHT_PX) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_r_bw_updated = true;
}
} else if ((hw_mgr_res->res_id >= CAM_ISP_HW_VFE_IN_RDI0)
&& (hw_mgr_res->res_id <=
CAM_ISP_HW_VFE_IN_RDI3)) {
for (i = 0; i < bw_config->num_paths; i++) {
if ((bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RDI) &&
((bw_config->axi_path[i].path_data_type -
CAM_AXI_PATH_DATA_IFE_RDI0) ==
(hw_mgr_res->res_id -
CAM_ISP_HW_VFE_IN_RDI0))) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
} else if ((hw_mgr_res->res_id == CAM_ISP_HW_SFE_IN_PIX)
|| (hw_mgr_res->res_id == CAM_ISP_HW_SFE_IN_RD0) ||
(hw_mgr_res->res_id == CAM_ISP_HW_SFE_IN_RD1) ||
(hw_mgr_res->res_id == CAM_ISP_HW_SFE_IN_RD2)) {
if (split_idx == CAM_ISP_HW_SPLIT_LEFT) {
if (*nrdi_l_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_LEFT_PX) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_l_bw_updated = true;
} else {
if (*nrdi_r_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RIGHT_PX) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_r_bw_updated = true;
}
} else if ((hw_mgr_res->res_id >= CAM_ISP_HW_SFE_IN_RDI0)
&& (hw_mgr_res->res_id <=
CAM_ISP_HW_SFE_IN_RDI4)) {
for (i = 0; i < bw_config->num_paths; i++) {
if ((bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_RDI) &&
((bw_config->axi_path[i].path_data_type -
CAM_AXI_PATH_DATA_IFE_RDI0) ==
(hw_mgr_res->res_id -
CAM_ISP_HW_VFE_IN_RDI0))) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
} else {
if (hw_mgr_res->hw_res[split_idx]) {
CAM_ERR(CAM_ISP, "Invalid res_id %u, split_idx: %u",
hw_mgr_res->res_id, split_idx);
rc = -EINVAL;
return rc;
if (hw_mgr_res->res_id == CAM_ISP_HW_SFE_IN_PIX) {
if (split_idx == CAM_ISP_HW_SPLIT_LEFT) {
if (*nrdi_l_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_SFE_LEFT) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_l_bw_updated = true;
} else {
if (*nrdi_r_bw_updated)
return rc;
for (i = 0; i < bw_config->num_paths; i++) {
if (bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_SFE_RIGHT) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
*nrdi_r_bw_updated = true;
}
} else if ((hw_mgr_res->res_id >= CAM_ISP_HW_SFE_IN_RDI0)
&& (hw_mgr_res->res_id <=
CAM_ISP_HW_SFE_IN_RDI4)) {
for (i = 0; i < bw_config->num_paths; i++) {
if ((bw_config->axi_path[i].usage_data ==
CAM_ISP_USAGE_SFE_RDI) &&
((bw_config->axi_path[i].path_data_type -
CAM_AXI_PATH_DATA_SFE_RDI0) ==
(hw_mgr_res->res_id -
CAM_ISP_HW_SFE_IN_RDI0))) {
memcpy(&isp_vote->axi_path[j],
&bw_config->axi_path[i],
sizeof(struct
cam_axi_per_path_bw_vote));
j++;
}
}
isp_vote->num_paths = j;
} else {
if (hw_mgr_res->hw_res[split_idx]) {
CAM_ERR(CAM_ISP, "Invalid res_id %u, split_idx: %u",
hw_mgr_res->res_id, split_idx);
rc = -EINVAL;
return rc;
}
}
}
@@ -5267,8 +5282,8 @@ static int cam_isp_blob_bw_update_v2(
memset(&bw_upd_args.isp_vote, 0,
sizeof(struct cam_axi_vote));
rc = cam_isp_classify_vote_info(hw_mgr_res, bw_config,
&bw_upd_args.isp_vote, split_idx,
&nrdi_l_bw_updated, &nrdi_r_bw_updated);
&bw_upd_args.isp_vote, CAM_ISP_HW_TYPE_VFE,
split_idx, &nrdi_l_bw_updated, &nrdi_r_bw_updated);
if (rc)
return rc;
@@ -5311,12 +5326,12 @@ static int cam_isp_blob_bw_update_v2(
memset(&sfe_bw_update_args.sfe_vote, 0,
sizeof(struct cam_axi_vote));
rc = cam_isp_classify_vote_info(hw_mgr_res, bw_config,
&sfe_bw_update_args.sfe_vote, split_idx,
&nrdi_l_bw_updated, &nrdi_r_bw_updated);
&sfe_bw_update_args.sfe_vote, CAM_ISP_HW_TYPE_SFE,
split_idx, &nrdi_l_bw_updated, &nrdi_r_bw_updated);
if (rc)
return rc;
if (!bw_upd_args.isp_vote.num_paths)
if (!sfe_bw_update_args.sfe_vote.num_paths)
continue;
hw_intf = hw_mgr_res->hw_res[split_idx]->hw_intf;

14
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.c
Bestand weergeven

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
*/
#include <linux/slab.h>
@@ -1072,6 +1072,8 @@ int cam_sfe_top_start(
struct cam_isp_resource_node *sfe_res;
struct cam_hw_info *hw_info = NULL;
struct cam_sfe_path_data *path_data;
struct cam_hw_soc_info *soc_info = NULL;
struct cam_sfe_soc_private *soc_private = NULL;
uint32_t error_mask[CAM_SFE_IRQ_REGISTERS_MAX];
uint32_t sof_eof_mask[CAM_SFE_IRQ_REGISTERS_MAX];
@@ -1082,6 +1084,8 @@ int cam_sfe_top_start(
top_priv = (struct cam_sfe_top_priv *)priv;
sfe_res = (struct cam_isp_resource_node *) start_args;
soc_info = top_priv->common_data.soc_info;
soc_private = soc_info->soc_private;
hw_info = (struct cam_hw_info *)sfe_res->hw_intf->hw_priv;
if (!hw_info) {
@@ -1101,6 +1105,14 @@ int cam_sfe_top_start(
if (rc)
return rc;
rc = cam_sfe_top_set_axi_bw_vote(soc_private,
top_priv, true);
if (rc) {
CAM_ERR(CAM_SFE,
"set_axi_bw_vote failed, rc=%d", rc);
return rc;
}
/* core cfg updated via CDM */
CAM_DBG(CAM_SFE, "SFE HW [%u] core_cfg: 0x%x",
hw_info->soc_info.index,