samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Çatalla 0
Kod Konular Değişiklik İstekleri İşlemler Paketler Projeler Sürüm Wiki Aktivite

msm: camera: isp: Add go cmd per CSID/IFE for offline

Kaynağa Gözat 
Configure go_cmd once per CSID/IFE, irrespective of the base
index.

CRs-Fixed: 3309163
Change-Id: Iee2d876ff9351e92c96aecd8f12b968f56f01cde
Signed-off-by: Karthik Anantha Ram <quic_kartanan@quicinc.com>
Bu işleme şunda yer alıyor:
Karthik Anantha Ram
2022-09-16 13:43:48 -07:00
işlemeyi yapan: “Savita
ebeveyn fe0a275903
işleme 0334099592
3 değiştirilmiş dosya ile 217 ekleme ve 161 silme
Yama Dosyasını İndir Diff Dosyasını İndir Tüm dosyaları genişlet Tüm dosyaları daralt

121
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
Dosyayı Görüntüle

@@ -4621,7 +4621,8 @@ static int cam_ife_mgr_acquire_hw_for_offline_ctx(
if ((!in_port->ipp_count && !in_port->lcr_count) ||
!in_port->ife_rd_count) {
CAM_ERR(CAM_ISP,
"Invalid %d BUS RD %d PIX %d LCR ports for FE ctx");
"Invalid %d BUS RD %d PIX %d LCR ports for FE ctx",
in_port->ife_rd_count, in_port->ipp_count, in_port->lcr_count);
return -EINVAL;
}
@@ -11309,6 +11310,110 @@ static int cam_ife_mgr_isp_add_reg_update(struct cam_ife_hw_mgr_ctx *ctx,
return rc;
}
static int cam_ife_hw_mgr_add_csid_go_cmd(
struct cam_ife_hw_mgr_ctx *ctx,
struct cam_hw_prepare_update_args *prepare,
struct cam_kmd_buf_info *kmd_buf_info)
{
int rc = -EINVAL, i;
bool is_found = false;
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_isp_change_base_args change_base_info = {0};
list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_csid, list) {
if (hw_mgr_res->res_type == CAM_ISP_RESOURCE_UNINT)
continue;
for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
if (!hw_mgr_res->hw_res[i])
continue;
if (i == CAM_ISP_HW_SPLIT_RIGHT) {
CAM_ERR(CAM_ISP,
"Offline with right rsrc [%u] not supported ctx: %u",
hw_mgr_res->hw_res[i]->res_id, ctx->ctx_index);
return -EINVAL;
}
is_found = true;
goto add_cmds;
}
}
add_cmds:
if (is_found) {
change_base_info.base_idx = hw_mgr_res->hw_res[i]->hw_intf->hw_idx;
change_base_info.cdm_id = ctx->cdm_id;
rc = cam_isp_add_change_base(prepare,
&ctx->res_list_ife_csid,
&change_base_info, kmd_buf_info);
if (rc)
return rc;
rc = cam_isp_add_csid_offline_cmd(prepare,
hw_mgr_res->hw_res[i], kmd_buf_info);
if (rc)
return rc;
rc = 0;
}
return rc;
}
static int cam_ife_hw_mgr_add_vfe_go_cmd(
struct cam_ife_hw_mgr_ctx *ctx,
struct cam_hw_prepare_update_args *prepare,
struct cam_kmd_buf_info *kmd_buf_info)
{
int rc = -EINVAL, i;
bool is_found = false;
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_isp_change_base_args change_base_info = {0};
list_for_each_entry(hw_mgr_res, &ctx->res_list_ife_in_rd, list) {
if (hw_mgr_res->res_type == CAM_ISP_RESOURCE_UNINT)
continue;
for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
if (!hw_mgr_res->hw_res[i])
continue;
if (i == CAM_ISP_HW_SPLIT_RIGHT) {
CAM_ERR(CAM_ISP,
"Offline with right rsrc [%u] not supported ctx: %u",
hw_mgr_res->hw_res[i]->res_id, ctx->ctx_index);
return -EINVAL;
}
is_found = true;
goto add_cmds;
}
}
add_cmds:
if (is_found) {
change_base_info.base_idx = hw_mgr_res->hw_res[i]->hw_intf->hw_idx;
change_base_info.cdm_id = ctx->cdm_id;
rc = cam_isp_add_change_base(prepare, &ctx->res_list_ife_src,
&change_base_info, kmd_buf_info);
if (rc)
return rc;
rc = cam_isp_add_go_cmd(prepare, hw_mgr_res->hw_res[i], kmd_buf_info);
if (rc)
return rc;
rc = 0;
}
return rc;
}
static int cam_ife_hw_mgr_update_cmd_buffer(
struct cam_ife_hw_mgr_ctx *ctx,
struct cam_hw_prepare_update_args *prepare,
@@ -11767,18 +11872,16 @@ static int cam_ife_mgr_prepare_hw_update(void *hw_mgr_priv,
prepare->num_in_map_entries &&
ctx->flags.is_offline) {
if (ctx->ctx_type != CAM_IFE_CTX_TYPE_SFE)
rc = cam_isp_add_go_cmd(prepare, &ctx->res_list_ife_in_rd,
ctx->base[i].idx, &prepare_hw_data->kmd_cmd_buff_info);
rc = cam_ife_hw_mgr_add_vfe_go_cmd(ctx, prepare,
&prepare_hw_data->kmd_cmd_buff_info);
else
rc = cam_isp_add_csid_offline_cmd(prepare,
&ctx->res_list_ife_csid,
ctx->base[i].idx, &prepare_hw_data->kmd_cmd_buff_info);
rc = cam_ife_hw_mgr_add_csid_go_cmd(ctx, prepare,
&prepare_hw_data->kmd_cmd_buff_info);
if (rc)
CAM_ERR(CAM_ISP,
"Add %s GO_CMD faled i: %d, idx: %d, rc: %d",
"Add %s GO_CMD failed in ctx: %u rc: %d",
(ctx->ctx_type == CAM_IFE_CTX_TYPE_SFE ?
"CSID" : "IFE RD"),
i, ctx->base[i].idx, rc);
"CSID" : "IFE RD"), ctx->ctx_index, rc);
}
if (prepare_hw_data->kmd_cmd_buff_info.size <=

244
drivers/cam_isp/isp_hw_mgr/hw_utils/cam_isp_packet_parser.c
Dosyayı Görüntüle

@@ -1299,15 +1299,12 @@ int cam_isp_add_reg_update(
int cam_isp_add_go_cmd(
struct cam_hw_prepare_update_args *prepare,
struct list_head *res_list_isp_rd,
uint32_t base_idx,
struct cam_isp_resource_node *res,
struct cam_kmd_buf_info *kmd_buf_info)
{
int rc = -EINVAL;
struct cam_isp_resource_node *res;
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_isp_hw_get_cmd_update get_regup;
uint32_t kmd_buf_remain_size, num_ent, i, reg_update_size;
uint32_t kmd_buf_remain_size, num_ent, reg_update_size;
/* Max one hw entries required for each base */
if (prepare->num_hw_update_entries + 1 >=
@@ -1319,76 +1316,57 @@ int cam_isp_add_go_cmd(
}
reg_update_size = 0;
list_for_each_entry(hw_mgr_res, res_list_isp_rd, list) {
if (hw_mgr_res->res_type == CAM_ISP_RESOURCE_UNINT)
continue;
for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
if (!hw_mgr_res->hw_res[i])
continue;
res = hw_mgr_res->hw_res[i];
if (res->hw_intf->hw_idx != base_idx)
continue;
if (kmd_buf_info->size > (kmd_buf_info->used_bytes +
reg_update_size)) {
kmd_buf_remain_size = kmd_buf_info->size -
(kmd_buf_info->used_bytes +
reg_update_size);
} else {
CAM_ERR(CAM_ISP, "no free mem %d %d %d",
base_idx, kmd_buf_info->size,
kmd_buf_info->used_bytes +
reg_update_size);
rc = -EINVAL;
return rc;
}
get_regup.cmd.cmd_buf_addr = kmd_buf_info->cpu_addr +
kmd_buf_info->used_bytes/4 +
reg_update_size/4;
get_regup.cmd.size = kmd_buf_remain_size;
get_regup.cmd_type = CAM_ISP_HW_CMD_FE_TRIGGER_CMD;
get_regup.res = res;
rc = res->process_cmd(res->res_priv,
CAM_ISP_HW_CMD_FE_TRIGGER_CMD, &get_regup,
sizeof(struct cam_isp_hw_get_cmd_update));
if (rc)
return rc;
CAM_DBG(CAM_ISP, "GO_CMD added for RD res %d hw_id %d",
res->res_type, res->hw_intf->hw_idx);
reg_update_size += get_regup.cmd.used_bytes;
}
if (kmd_buf_info->size > (kmd_buf_info->used_bytes +
reg_update_size)) {
kmd_buf_remain_size = kmd_buf_info->size -
(kmd_buf_info->used_bytes +
reg_update_size);
} else {
CAM_ERR(CAM_ISP, "no free mem %d %d",
kmd_buf_info->size,
kmd_buf_info->used_bytes +
reg_update_size);
rc = -EINVAL;
return rc;
}
if (reg_update_size) {
/* Update the HW entries */
num_ent = prepare->num_hw_update_entries;
prepare->hw_update_entries[num_ent].handle =
kmd_buf_info->handle;
prepare->hw_update_entries[num_ent].len = reg_update_size;
prepare->hw_update_entries[num_ent].offset =
kmd_buf_info->offset;
prepare->hw_update_entries[num_ent].flags = CAM_ISP_COMMON_CFG_BL;
CAM_DBG(CAM_ISP,
"num_ent=%d handle=0x%x, len=%u, offset=%u",
num_ent,
prepare->hw_update_entries[num_ent].handle,
prepare->hw_update_entries[num_ent].len,
prepare->hw_update_entries[num_ent].offset);
num_ent++;
get_regup.cmd.cmd_buf_addr = kmd_buf_info->cpu_addr +
kmd_buf_info->used_bytes/4 +
reg_update_size/4;
get_regup.cmd.size = kmd_buf_remain_size;
get_regup.cmd_type = CAM_ISP_HW_CMD_FE_TRIGGER_CMD;
get_regup.res = res;
kmd_buf_info->used_bytes += reg_update_size;
kmd_buf_info->offset += reg_update_size;
prepare->num_hw_update_entries = num_ent;
rc = res->process_cmd(res->res_priv,
CAM_ISP_HW_CMD_FE_TRIGGER_CMD, &get_regup,
sizeof(struct cam_isp_hw_get_cmd_update));
if (rc)
return rc;
rc = 0;
}
CAM_DBG(CAM_ISP, "GO_CMD added for RD res %d hw_id %d",
res->res_type, res->hw_intf->hw_idx);
reg_update_size += get_regup.cmd.used_bytes;
return rc;
/* Update the HW entries */
num_ent = prepare->num_hw_update_entries;
prepare->hw_update_entries[num_ent].handle =
kmd_buf_info->handle;
prepare->hw_update_entries[num_ent].len = reg_update_size;
prepare->hw_update_entries[num_ent].offset =
kmd_buf_info->offset;
prepare->hw_update_entries[num_ent].flags = CAM_ISP_COMMON_CFG_BL;
CAM_DBG(CAM_ISP,
"num_ent=%d handle=0x%x, len=%u, offset=%u",
num_ent,
prepare->hw_update_entries[num_ent].handle,
prepare->hw_update_entries[num_ent].len,
prepare->hw_update_entries[num_ent].offset);
num_ent++;
kmd_buf_info->used_bytes += reg_update_size;
kmd_buf_info->offset += reg_update_size;
prepare->num_hw_update_entries = num_ent;
return 0;
}
int cam_isp_add_comp_wait(
@@ -1808,14 +1786,11 @@ int cam_isp_add_csid_reg_update(
int cam_isp_add_csid_offline_cmd(
struct cam_hw_prepare_update_args *prepare,
struct list_head *res_list,
uint32_t base_idx,
struct cam_isp_resource_node *res,
struct cam_kmd_buf_info *kmd_buf_info)
{
int rc = -EINVAL;
struct cam_isp_hw_mgr_res *hw_mgr_res;
struct cam_isp_resource_node *res;
uint32_t kmd_buf_remain_size, num_ent, i, go_cmd_size;
uint32_t kmd_buf_remain_size, num_ent, go_cmd_size;
struct cam_ife_csid_offline_cmd_update_args go_args;
if (prepare->num_hw_update_entries + 1 >=
@@ -1827,80 +1802,61 @@ int cam_isp_add_csid_offline_cmd(
}
go_cmd_size = 0;
list_for_each_entry(hw_mgr_res, res_list, list) {
if (hw_mgr_res->res_type == CAM_ISP_RESOURCE_UNINT)
continue;
for (i = 0; i < CAM_ISP_HW_SPLIT_MAX; i++) {
if (!hw_mgr_res->hw_res[i])
continue;
res = hw_mgr_res->hw_res[i];
if (res->hw_intf->hw_idx != base_idx)
continue;
if (kmd_buf_info->size > (kmd_buf_info->used_bytes +
go_cmd_size)) {
kmd_buf_remain_size = kmd_buf_info->size -
(kmd_buf_info->used_bytes +
go_cmd_size);
} else {
CAM_ERR(CAM_ISP, "no free mem %d %d %d",
base_idx, kmd_buf_info->size,
kmd_buf_info->used_bytes +
go_cmd_size);
rc = -EINVAL;
goto end;
}
go_args.cmd.cmd_buf_addr = kmd_buf_info->cpu_addr +
kmd_buf_info->used_bytes / 4 +
go_cmd_size / 4;
go_args.cmd.size = kmd_buf_remain_size;
go_args.res = res;
rc = res->hw_intf->hw_ops.process_cmd(
res->hw_intf->hw_priv,
CAM_IFE_CSID_PROGRAM_OFFLINE_CMD, &go_args,
sizeof(go_args));
if (rc)
goto end;
CAM_DBG(CAM_ISP,
"offline cmd update added for CSID: %u res: %d",
res->hw_intf->hw_idx, res->res_id);
go_cmd_size += go_args.cmd.used_bytes;
goto go_cmd_added;
}
if (kmd_buf_info->size > (kmd_buf_info->used_bytes +
go_cmd_size)) {
kmd_buf_remain_size = kmd_buf_info->size -
(kmd_buf_info->used_bytes +
go_cmd_size);
} else {
CAM_ERR(CAM_ISP, "no free mem %d %d",
kmd_buf_info->size,
kmd_buf_info->used_bytes +
go_cmd_size);
rc = -EINVAL;
goto end;
}
go_cmd_added:
go_args.cmd.cmd_buf_addr = kmd_buf_info->cpu_addr +
kmd_buf_info->used_bytes / 4 +
go_cmd_size / 4;
go_args.cmd.size = kmd_buf_remain_size;
go_args.res = res;
if (go_cmd_size) {
/* Update the HW entries */
num_ent = prepare->num_hw_update_entries;
prepare->hw_update_entries[num_ent].handle =
kmd_buf_info->handle;
prepare->hw_update_entries[num_ent].len = go_cmd_size;
prepare->hw_update_entries[num_ent].offset =
kmd_buf_info->offset;
rc = res->hw_intf->hw_ops.process_cmd(
res->hw_intf->hw_priv,
CAM_IFE_CSID_PROGRAM_OFFLINE_CMD, &go_args,
sizeof(go_args));
if (rc)
goto end;
/* Marking go update as COMMON */
prepare->hw_update_entries[num_ent].flags = CAM_ISP_COMMON_CFG_BL;
CAM_DBG(CAM_ISP,
"num_ent=%d handle=0x%x, len=%u, offset=%u",
num_ent,
prepare->hw_update_entries[num_ent].handle,
prepare->hw_update_entries[num_ent].len,
prepare->hw_update_entries[num_ent].offset);
num_ent++;
CAM_DBG(CAM_ISP,
"offline cmd update added for CSID: %u res: %d",
res->hw_intf->hw_idx, res->res_id);
kmd_buf_info->used_bytes += go_cmd_size;
kmd_buf_info->offset += go_cmd_size;
prepare->num_hw_update_entries = num_ent;
/* offline cmd update is success return status 0 */
rc = 0;
}
go_cmd_size += go_args.cmd.used_bytes;
/* Update the HW entries */
num_ent = prepare->num_hw_update_entries;
prepare->hw_update_entries[num_ent].handle =
kmd_buf_info->handle;
prepare->hw_update_entries[num_ent].len = go_cmd_size;
prepare->hw_update_entries[num_ent].offset =
kmd_buf_info->offset;
/* Marking go update as COMMON */
prepare->hw_update_entries[num_ent].flags = CAM_ISP_COMMON_CFG_BL;
CAM_DBG(CAM_ISP,
"num_ent=%d handle=0x%x, len=%u, offset=%u",
num_ent,
prepare->hw_update_entries[num_ent].handle,
prepare->hw_update_entries[num_ent].len,
prepare->hw_update_entries[num_ent].offset);
num_ent++;
kmd_buf_info->used_bytes += go_cmd_size;
kmd_buf_info->offset += go_cmd_size;
prepare->num_hw_update_entries = num_ent;
/* offline cmd update is success return status 0 */
rc = 0;
end:
return rc;

13
drivers/cam_isp/isp_hw_mgr/hw_utils/include/cam_isp_packet_parser.h
Dosyayı Görüntüle

@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/
#ifndef _CAM_ISP_HW_PARSER_H_
@@ -326,16 +327,14 @@ int cam_isp_add_wait_trigger(
* @brief Add go_cmd in the hw entries list for each rd source
*
* @prepare: Contain the packet and HW update variables
* @res_list_isp_rd: Resource list for BUS RD ports
* @base_idx: Base or dev index of the IFE/VFE HW instance
* @res: go_cmd added for this resource
* @kmd_buf_info: Kmd buffer to store the change base command
* @return: 0 for success
* -EINVAL for Fail
*/
int cam_isp_add_go_cmd(
struct cam_hw_prepare_update_args *prepare,
struct list_head *res_list_isp_rd,
uint32_t base_idx,
struct cam_isp_resource_node *res,
struct cam_kmd_buf_info *kmd_buf_info);
/* cam_isp_csid_add_reg_update()
@@ -361,16 +360,14 @@ int cam_isp_add_csid_reg_update(
* @brief Add csid go cmd for offline mode
*
* @prepare: Contain the packet and HW update variables
* @res_list: Resource list for CSID
* @base_idx: Base or dev index of the CSID/IFE HW instance
* @res: go_cmd added for this resource
* @kmd_buf_info: Kmd buffer to store the change base command
* @return: 0 for success
* -EINVAL for Fail
*/
int cam_isp_add_csid_offline_cmd(
struct cam_hw_prepare_update_args *prepare,
struct list_head *res_list,
uint32_t base_idx,
struct cam_isp_resource_node *res,
struct cam_kmd_buf_info *kmd_buf_info);
/*