Commit f16595ae authored by Alan Cox's avatar Alan Cox Committed by Mauro Carvalho Chehab

[media] atomisp2: remove HRT_UNSCHED

HRT_UNSCHED is never defined or set in the driver, so this is dead code that
can be retired, simplifying the code a bit further.
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 2310ae5c
...@@ -176,7 +176,6 @@ void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...) ...@@ -176,7 +176,6 @@ void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...)
va_end(ap); va_end(ap);
} }
#if !defined(HRT_UNSCHED)
static void debug_dump_long_array_formatted( static void debug_dump_long_array_formatted(
const sp_ID_t sp_id, const sp_ID_t sp_id,
hrt_address stack_sp_addr, hrt_address stack_sp_addr,
...@@ -249,12 +248,6 @@ void ia_css_debug_dump_sp_stack_info(void) ...@@ -249,12 +248,6 @@ void ia_css_debug_dump_sp_stack_info(void)
{ {
debug_dump_sp_stack_info(SP0_ID); debug_dump_sp_stack_info(SP0_ID);
} }
#else
/* Empty def for crun */
void ia_css_debug_dump_sp_stack_info(void)
{
}
#endif /* #if !HRT_UNSCHED */
void ia_css_debug_set_dtrace_level(const unsigned int trace_level) void ia_css_debug_set_dtrace_level(const unsigned int trace_level)
......
...@@ -62,12 +62,6 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id, ...@@ -62,12 +62,6 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id,
spctrl_cofig_info[sp_id].code_addr = mmgr_NULL; spctrl_cofig_info[sp_id].code_addr = mmgr_NULL;
#if defined(HRT_UNSCHED)
(void)init_dmem_cfg;
code_addr = mmgr_malloc(1);
if (code_addr == mmgr_NULL)
return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
#else
init_dmem_cfg = &spctrl_cofig_info[sp_id].dmem_config; init_dmem_cfg = &spctrl_cofig_info[sp_id].dmem_config;
init_dmem_cfg->dmem_data_addr = spctrl_cfg->dmem_data_addr; init_dmem_cfg->dmem_data_addr = spctrl_cfg->dmem_data_addr;
init_dmem_cfg->dmem_bss_addr = spctrl_cfg->dmem_bss_addr; init_dmem_cfg->dmem_bss_addr = spctrl_cfg->dmem_bss_addr;
...@@ -104,7 +98,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id, ...@@ -104,7 +98,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id,
code_addr = mmgr_NULL; code_addr = mmgr_NULL;
return IA_CSS_ERR_INTERNAL_ERROR; return IA_CSS_ERR_INTERNAL_ERROR;
} }
#endif
spctrl_cofig_info[sp_id].sp_entry = spctrl_cfg->sp_entry; spctrl_cofig_info[sp_id].sp_entry = spctrl_cfg->sp_entry;
spctrl_cofig_info[sp_id].code_addr = code_addr; spctrl_cofig_info[sp_id].code_addr = code_addr;
spctrl_cofig_info[sp_id].program_name = spctrl_cfg->program_name; spctrl_cofig_info[sp_id].program_name = spctrl_cfg->program_name;
......
...@@ -1575,7 +1575,6 @@ static bool sh_css_setup_spctrl_config(const struct ia_css_fw_info *fw, ...@@ -1575,7 +1575,6 @@ static bool sh_css_setup_spctrl_config(const struct ia_css_fw_info *fw,
spctrl_cfg->sp_entry = 0; spctrl_cfg->sp_entry = 0;
spctrl_cfg->program_name = (char *)(program); spctrl_cfg->program_name = (char *)(program);
#if !defined(HRT_UNSCHED)
spctrl_cfg->ddr_data_offset = fw->blob.data_source; spctrl_cfg->ddr_data_offset = fw->blob.data_source;
spctrl_cfg->dmem_data_addr = fw->blob.data_target; spctrl_cfg->dmem_data_addr = fw->blob.data_target;
spctrl_cfg->dmem_bss_addr = fw->blob.bss_target; spctrl_cfg->dmem_bss_addr = fw->blob.bss_target;
...@@ -1588,7 +1587,7 @@ static bool sh_css_setup_spctrl_config(const struct ia_css_fw_info *fw, ...@@ -1588,7 +1587,7 @@ static bool sh_css_setup_spctrl_config(const struct ia_css_fw_info *fw,
spctrl_cfg->code_size = fw->blob.size; spctrl_cfg->code_size = fw->blob.size;
spctrl_cfg->code = fw->blob.code; spctrl_cfg->code = fw->blob.code;
spctrl_cfg->sp_entry = fw->info.sp.sp_entry; /* entry function ptr on SP */ spctrl_cfg->sp_entry = fw->info.sp.sp_entry; /* entry function ptr on SP */
#endif
return true; return true;
} }
void void
...@@ -8570,9 +8569,7 @@ remove_firmware(struct ia_css_fw_info **l, struct ia_css_fw_info *firmware) ...@@ -8570,9 +8569,7 @@ remove_firmware(struct ia_css_fw_info **l, struct ia_css_fw_info *firmware)
return; /* removing single and multiple firmware is handled in acc_unload_extension() */ return; /* removing single and multiple firmware is handled in acc_unload_extension() */
} }
#if !defined(HRT_UNSCHED) static enum ia_css_err upload_isp_code(struct ia_css_fw_info *firmware)
static enum ia_css_err
upload_isp_code(struct ia_css_fw_info *firmware)
{ {
hrt_vaddress binary; hrt_vaddress binary;
...@@ -8600,12 +8597,10 @@ upload_isp_code(struct ia_css_fw_info *firmware) ...@@ -8600,12 +8597,10 @@ upload_isp_code(struct ia_css_fw_info *firmware)
return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
return IA_CSS_SUCCESS; return IA_CSS_SUCCESS;
} }
#endif
static enum ia_css_err static enum ia_css_err
acc_load_extension(struct ia_css_fw_info *firmware) acc_load_extension(struct ia_css_fw_info *firmware)
{ {
#if !defined(HRT_UNSCHED)
enum ia_css_err err; enum ia_css_err err;
struct ia_css_fw_info *hd = firmware; struct ia_css_fw_info *hd = firmware;
while (hd){ while (hd){
...@@ -8614,7 +8609,6 @@ acc_load_extension(struct ia_css_fw_info *firmware) ...@@ -8614,7 +8609,6 @@ acc_load_extension(struct ia_css_fw_info *firmware)
return err; return err;
hd = hd->next; hd = hd->next;
} }
#endif
if (firmware == NULL) if (firmware == NULL)
return IA_CSS_ERR_INVALID_ARGUMENTS; return IA_CSS_ERR_INVALID_ARGUMENTS;
......
...@@ -92,12 +92,7 @@ setup_binary(struct ia_css_fw_info *fw, const char *fw_data, struct ia_css_fw_in ...@@ -92,12 +92,7 @@ setup_binary(struct ia_css_fw_info *fw, const char *fw_data, struct ia_css_fw_in
*sh_css_fw = *fw; *sh_css_fw = *fw;
#if defined(HRT_UNSCHED)
sh_css_fw->blob.code = vmalloc(1);
#else
sh_css_fw->blob.code = vmalloc(fw->blob.size); sh_css_fw->blob.code = vmalloc(fw->blob.size);
#endif
if (sh_css_fw->blob.code == NULL) if (sh_css_fw->blob.code == NULL)
return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment