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

Merge "msm: camera: cre: compilation fixes" into camera-kernel.lnx.6.0

Browse Source
This commit is contained in:
Camera Software Integration
2021-12-15 19:15:08 -08:00
committed by Gerrit - the friendly Code Review server
parent c4b93c74bf 40049f0b5e
commit d037c94f80
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.c
View File

@@ -35,12 +35,12 @@ static struct cam_cre_hw_mgr *cre_hw_mgr;
static bool cam_cre_debug_clk_update(struct cam_cre_clk_info *hw_mgr_clk_info) static bool cam_cre_debug_clk_update(struct cam_cre_clk_info *hw_mgr_clk_info)
{ {
if (cre_hw_mgr.cre_debug_clk && if (cre_hw_mgr->cre_debug_clk &&
cre_hw_mgr.cre_debug_clk != hw_mgr_clk_info->curr_clk) { cre_hw_mgr->cre_debug_clk != hw_mgr_clk_info->curr_clk) {
hw_mgr_clk_info->base_clk = cre_hw_mgr.cre_debug_clk; hw_mgr_clk_info->base_clk = cre_hw_mgr->cre_debug_clk;
hw_mgr_clk_info->curr_clk = cre_hw_mgr.cre_debug_clk; hw_mgr_clk_info->curr_clk = cre_hw_mgr->cre_debug_clk;
hw_mgr_clk_info->uncompressed_bw = cre_hw_mgr.cre_debug_clk; hw_mgr_clk_info->uncompressed_bw = cre_hw_mgr->cre_debug_clk;
hw_mgr_clk_info->compressed_bw = cre_hw_mgr.cre_debug_clk; hw_mgr_clk_info->compressed_bw = cre_hw_mgr->cre_debug_clk;
CAM_DBG(CAM_PERF, "bc = %d cc = %d ub %d cb %d", CAM_DBG(CAM_PERF, "bc = %d cc = %d ub %d cb %d",
hw_mgr_clk_info->base_clk, hw_mgr_clk_info->curr_clk, hw_mgr_clk_info->base_clk, hw_mgr_clk_info->curr_clk,
hw_mgr_clk_info->uncompressed_bw, hw_mgr_clk_info->uncompressed_bw,
@@ -745,7 +745,7 @@ static void cam_cre_device_timer_stop(struct cam_cre_hw_mgr *hw_mgr)
static int cam_cre_mgr_process_cmd(void *priv, void *data) static int cam_cre_mgr_process_cmd(void *priv, void *data)
{ {
int rc = 0; int rc = 0, i = 0;
struct cre_cmd_work_data *task_data = NULL; struct cre_cmd_work_data *task_data = NULL;
struct cam_cre_ctx *ctx_data; struct cam_cre_ctx *ctx_data;
struct cam_cre_request *cre_req; struct cam_cre_request *cre_req;
@@ -1218,7 +1218,7 @@ static bool cam_cre_check_clk_update(struct cam_cre_hw_mgr *hw_mgr,
clk_info->frame_cycles, clk_info->budget_ns); clk_info->frame_cycles, clk_info->budget_ns);
ctx_data->clk_info.rt_flag = clk_info->rt_flag; ctx_data->clk_info.rt_flag = clk_info->rt_flag;
if (cre_hw_mgr.cre_debug_clk) if (cre_hw_mgr->cre_debug_clk)
return cam_cre_debug_clk_update(hw_mgr_clk_info); return cam_cre_debug_clk_update(hw_mgr_clk_info);
if (busy) if (busy)
@@ -2871,8 +2871,25 @@ cmd_work_failed:
return rc; return rc;
} }
static int cam_cre_set_dbg_default_clk(void *data, u64 val)
{
cre_hw_mgr->cre_debug_clk = val;
return 0;
}
static int cam_cre_get_dbg_default_clk(void *data, u64 *val)
{
*val = cre_hw_mgr->cre_debug_clk;
return 0;
}
DEFINE_DEBUGFS_ATTRIBUTE(cam_cre_debug_default_clk,
cam_cre_get_dbg_default_clk,
cam_cre_set_dbg_default_clk, "%16llu");
static int cam_cre_create_debug_fs(void) static int cam_cre_create_debug_fs(void)
{ {
struct dentry *dbgfileptr = NULL;
int rc = 0;
cre_hw_mgr->dentry = debugfs_create_dir("camera_cre", cre_hw_mgr->dentry = debugfs_create_dir("camera_cre",
NULL); NULL);
@@ -2891,7 +2908,7 @@ static int cam_cre_create_debug_fs(void)
} }
dbgfileptr = debugfs_create_file("cre_debug_clk", 0644, dbgfileptr = debugfs_create_file("cre_debug_clk", 0644,
cre_hw_mgr.dentry, NULL, &cam_cre_debug_default_clk); cre_hw_mgr->dentry, NULL, &cam_cre_debug_default_clk);
if (IS_ERR(dbgfileptr)) { if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV) if (PTR_ERR(dbgfileptr) == -ENODEV)
@@ -3030,18 +3047,3 @@ cre_ctx_bitmap_failed:
return rc; return rc;
} }
static int cam_cre_set_dbg_default_clk(void *data, u64 val)
{
cre_hw_mgr.cre_debug_clk = val;
return 0;
}
static int cam_cre_get_dbg_default_clk(void *data, u64 *val)
{
*val = cre_hw_mgr.cre_debug_clk;
return 0;
}
DEFINE_SIMPLE_ATTRIBUTE(cam_cre_debug_default_clk,
cam_cre_get_dbg_default_clk,
cam_cre_set_dbg_default_clk, "%16llu");

4
drivers/cam_cre/cam_cre_hw_mgr/cam_cre_hw_mgr.h
View File

@@ -125,6 +125,8 @@ struct cre_cmd_generic_blob {
* @hw_type: IPE/BPS device type * @hw_type: IPE/BPS device type
* @watch_dog: watchdog timer handle * @watch_dog: watchdog timer handle
* @watch_dog_reset_counter: Counter for watch dog reset * @watch_dog_reset_counter: Counter for watch dog reset
* @uncompressed_bw: uncompressed BW
* @compressed_bw: compressed BW
*/ */
struct cam_cre_clk_info { struct cam_cre_clk_info {
uint32_t base_clk; uint32_t base_clk;
@@ -136,6 +138,8 @@ struct cam_cre_clk_info {
uint32_t hw_type; uint32_t hw_type;
struct cam_req_mgr_timer *watch_dog; struct cam_req_mgr_timer *watch_dog;
uint32_t watch_dog_reset_counter; uint32_t watch_dog_reset_counter;
uint64_t uncompressed_bw;
uint64_t compressed_bw;
}; };
/** /**