media: atomisp: cleanup contents of css_2400_system/

Everything there is for ISP2400 only. So, we can trivially
solve all ifdefs at once

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab 2020-04-30 14:15:18 +02:00
parent 0850936063
commit 9935e2928a
3 changed files with 0 additions and 1827 deletions

View File

@ -273,36 +273,6 @@ ia_css_configure_output(
}
/* Code generated by genparam/genconfig.c:gen_configure_function() */
#ifdef ISP2401
void
ia_css_configure_sc(
const struct ia_css_binary *binary,
const struct ia_css_sc_configuration *config_dmem)
{
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_configure_sc() enter:\n");
{
unsigned int offset = 0;
unsigned int size = 0;
if (binary->info->mem_offsets.offsets.config) {
size = binary->info->mem_offsets.offsets.config->dmem.sc.size;
offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset;
}
if (size) {
ia_css_sc_config((struct sh_css_isp_sc_isp_config *)
&binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset],
config_dmem, size);
}
}
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_configure_sc() leave:\n");
}
/* Code generated by genparam/genconfig.c:gen_configure_function() */
#endif
void
ia_css_configure_raw(

View File

@ -1722,31 +1722,6 @@ ia_css_process_xnr3(
"ia_css_process_xnr3() leave:\n");
}
}
#ifdef ISP2401
{
unsigned int size =
stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size;
unsigned int offset =
stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.offset;
if (size) {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_process_xnr3() enter:\n");
ia_css_xnr3_vmem_encode((struct sh_css_isp_xnr3_vmem_params *)
&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_VMEM].address[offset],
&params->xnr3_config,
size);
params->isp_params_changed = true;
params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_VMEM] =
true;
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_process_xnr3() leave:\n");
}
}
#endif
}
/* Code generated by genparam/gencode.c:gen_param_process_table() */
@ -1838,10 +1813,8 @@ ia_css_set_dp_config(struct ia_css_isp_parameters *params,
ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->dp_config = *config;
params->config_changed[IA_CSS_DP_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_DP_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_dp_config() leave: return_void\n");
}
@ -1881,10 +1854,8 @@ ia_css_set_wb_config(struct ia_css_isp_parameters *params,
ia_css_wb_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->wb_config = *config;
params->config_changed[IA_CSS_WB_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_WB_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_wb_config() leave: return_void\n");
}
@ -1924,10 +1895,8 @@ ia_css_set_tnr_config(struct ia_css_isp_parameters *params,
ia_css_tnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->tnr_config = *config;
params->config_changed[IA_CSS_TNR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_TNR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_tnr_config() leave: return_void\n");
}
@ -1967,10 +1936,8 @@ ia_css_set_ob_config(struct ia_css_isp_parameters *params,
ia_css_ob_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->ob_config = *config;
params->config_changed[IA_CSS_OB_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_OB_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_ob_config() leave: return_void\n");
}
@ -2010,10 +1977,8 @@ ia_css_set_de_config(struct ia_css_isp_parameters *params,
ia_css_de_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->de_config = *config;
params->config_changed[IA_CSS_DE_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_DE_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_de_config() leave: return_void\n");
}
@ -2053,10 +2018,8 @@ ia_css_set_anr_config(struct ia_css_isp_parameters *params,
ia_css_anr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->anr_config = *config;
params->config_changed[IA_CSS_ANR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_ANR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_anr_config() leave: return_void\n");
}
@ -2096,10 +2059,8 @@ ia_css_set_anr2_config(struct ia_css_isp_parameters *params,
ia_css_anr2_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->anr_thres = *config;
params->config_changed[IA_CSS_ANR2_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_ANR2_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_anr2_config() leave: return_void\n");
}
@ -2139,10 +2100,8 @@ ia_css_set_ce_config(struct ia_css_isp_parameters *params,
ia_css_ce_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->ce_config = *config;
params->config_changed[IA_CSS_CE_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_CE_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_ce_config() leave: return_void\n");
}
@ -2182,10 +2141,8 @@ ia_css_set_ecd_config(struct ia_css_isp_parameters *params,
ia_css_ecd_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->ecd_config = *config;
params->config_changed[IA_CSS_ECD_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_ECD_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_ecd_config() leave: return_void\n");
}
@ -2225,10 +2182,8 @@ ia_css_set_ynr_config(struct ia_css_isp_parameters *params,
ia_css_ynr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->ynr_config = *config;
params->config_changed[IA_CSS_YNR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_YNR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_ynr_config() leave: return_void\n");
}
@ -2268,10 +2223,8 @@ ia_css_set_fc_config(struct ia_css_isp_parameters *params,
ia_css_fc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->fc_config = *config;
params->config_changed[IA_CSS_FC_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_FC_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_fc_config() leave: return_void\n");
}
@ -2311,10 +2264,8 @@ ia_css_set_cnr_config(struct ia_css_isp_parameters *params,
ia_css_cnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->cnr_config = *config;
params->config_changed[IA_CSS_CNR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_CNR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_cnr_config() leave: return_void\n");
}
@ -2354,10 +2305,8 @@ ia_css_set_macc_config(struct ia_css_isp_parameters *params,
ia_css_macc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->macc_config = *config;
params->config_changed[IA_CSS_MACC_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_MACC_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_macc_config() leave: return_void\n");
}
@ -2397,10 +2346,8 @@ ia_css_set_ctc_config(struct ia_css_isp_parameters *params,
ia_css_ctc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->ctc_config = *config;
params->config_changed[IA_CSS_CTC_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_CTC_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_ctc_config() leave: return_void\n");
}
@ -2438,10 +2385,8 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params,
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_set_aa_config() enter:\n");
params->aa_config = *config;
params->config_changed[IA_CSS_AA_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_AA_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_aa_config() leave: return_void\n");
}
@ -2481,10 +2426,8 @@ ia_css_set_yuv2rgb_config(struct ia_css_isp_parameters *params,
ia_css_yuv2rgb_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->yuv2rgb_cc_config = *config;
params->config_changed[IA_CSS_YUV2RGB_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_YUV2RGB_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_yuv2rgb_config() leave: return_void\n");
}
@ -2524,10 +2467,8 @@ ia_css_set_rgb2yuv_config(struct ia_css_isp_parameters *params,
ia_css_rgb2yuv_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->rgb2yuv_cc_config = *config;
params->config_changed[IA_CSS_RGB2YUV_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_RGB2YUV_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_rgb2yuv_config() leave: return_void\n");
}
@ -2567,10 +2508,8 @@ ia_css_set_csc_config(struct ia_css_isp_parameters *params,
ia_css_csc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->cc_config = *config;
params->config_changed[IA_CSS_CSC_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_CSC_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_csc_config() leave: return_void\n");
}
@ -2611,10 +2550,8 @@ ia_css_set_nr_config(struct ia_css_isp_parameters *params,
params->nr_config = *config;
params->config_changed[IA_CSS_BNR_ID] = true;
params->config_changed[IA_CSS_NR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_NR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_nr_config() leave: return_void\n");
}
@ -2654,10 +2591,8 @@ ia_css_set_gc_config(struct ia_css_isp_parameters *params,
ia_css_gc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->gc_config = *config;
params->config_changed[IA_CSS_GC_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_GC_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_gc_config() leave: return_void\n");
}
@ -2701,10 +2636,8 @@ ia_css_set_sdis_horicoef_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS_HORICOEF_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis_horicoef_config() leave: return_void\n");
}
@ -2748,10 +2681,8 @@ ia_css_set_sdis_vertcoef_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis_vertcoef_config() leave: return_void\n");
}
@ -2795,10 +2726,8 @@ ia_css_set_sdis_horiproj_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis_horiproj_config() leave: return_void\n");
}
@ -2842,10 +2771,8 @@ ia_css_set_sdis_vertproj_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis_vertproj_config() leave: return_void\n");
}
@ -2889,10 +2816,8 @@ ia_css_set_sdis2_horicoef_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS2_HORICOEF_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis2_horicoef_config() leave: return_void\n");
}
@ -2936,10 +2861,8 @@ ia_css_set_sdis2_vertcoef_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis2_vertcoef_config() leave: return_void\n");
}
@ -2983,10 +2906,8 @@ ia_css_set_sdis2_horiproj_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis2_horiproj_config() leave: return_void\n");
}
@ -3030,10 +2951,8 @@ ia_css_set_sdis2_vertproj_config(struct ia_css_isp_parameters *params,
params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;
params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;
params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_sdis2_vertproj_config() leave: return_void\n");
}
@ -3073,10 +2992,8 @@ ia_css_set_r_gamma_config(struct ia_css_isp_parameters *params,
ia_css_r_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->r_gamma_table = *config;
params->config_changed[IA_CSS_R_GAMMA_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_R_GAMMA_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_r_gamma_config() leave: return_void\n");
}
@ -3116,10 +3033,8 @@ ia_css_set_g_gamma_config(struct ia_css_isp_parameters *params,
ia_css_g_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->g_gamma_table = *config;
params->config_changed[IA_CSS_G_GAMMA_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_G_GAMMA_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_g_gamma_config() leave: return_void\n");
}
@ -3159,10 +3074,8 @@ ia_css_set_b_gamma_config(struct ia_css_isp_parameters *params,
ia_css_b_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->b_gamma_table = *config;
params->config_changed[IA_CSS_B_GAMMA_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_B_GAMMA_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_b_gamma_config() leave: return_void\n");
}
@ -3203,10 +3116,8 @@ ia_css_set_xnr_table_config(struct ia_css_isp_parameters *params,
ia_css_xnr_table_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->xnr_table = *config;
params->config_changed[IA_CSS_XNR_TABLE_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_XNR_TABLE_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_xnr_table_config() leave: return_void\n");
}
@ -3246,10 +3157,8 @@ ia_css_set_formats_config(struct ia_css_isp_parameters *params,
ia_css_formats_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->formats_config = *config;
params->config_changed[IA_CSS_FORMATS_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_FORMATS_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_formats_config() leave: return_void\n");
}
@ -3289,10 +3198,8 @@ ia_css_set_xnr_config(struct ia_css_isp_parameters *params,
ia_css_xnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->xnr_config = *config;
params->config_changed[IA_CSS_XNR_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_XNR_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_xnr_config() leave: return_void\n");
}
@ -3332,10 +3239,8 @@ ia_css_set_xnr3_config(struct ia_css_isp_parameters *params,
ia_css_xnr3_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->xnr3_config = *config;
params->config_changed[IA_CSS_XNR3_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_XNR3_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_xnr3_config() leave: return_void\n");
}
@ -3376,10 +3281,8 @@ ia_css_set_s3a_config(struct ia_css_isp_parameters *params,
params->s3a_config = *config;
params->config_changed[IA_CSS_BH_ID] = true;
params->config_changed[IA_CSS_S3A_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_S3A_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_s3a_config() leave: return_void\n");
}
@ -3419,10 +3322,8 @@ ia_css_set_output_config(struct ia_css_isp_parameters *params,
ia_css_output_debug_dtrace(config, IA_CSS_DEBUG_TRACE);
params->output_config = *config;
params->config_changed[IA_CSS_OUTPUT_ID] = true;
#ifndef ISP2401
params->config_changed[IA_CSS_OUTPUT_ID] = true;
#endif
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"ia_css_set_output_config() leave: return_void\n");
}

File diff suppressed because it is too large Load Diff