| Message ID | 20230605102903.924283-2-hpa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove #ifdef ISP2401 and unifying sh_css_sp_group structure | expand |
Hi, On 6/5/23 12:29, Kate Hsuan wrote: > Since some parts of the data scructure elements are determined in compile > time, the configuration data structure should be compiled for both two > ISP models. In order to set the configuration for both ISP model in > runtime, Thesh_css_sp_group is unified to one data structure for the > configuration to ensure the data structure can be used for both ISP2400 > and 2401. > > Signed-off-by: Kate Hsuan <hpa@redhat.com> Please squash this patch into patch 2/3 even if the intermediate results with just this patch compiles it will not run properly, so just fold the 2 patches into 1 please. Regards, Hans > --- > .../media/atomisp/pci/sh_css_internal.h | 35 ++++++------------- > 1 file changed, 11 insertions(+), 24 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h > index d98f1323441e..2fa0b3e45fe0 100644 > --- a/drivers/staging/media/atomisp/pci/sh_css_internal.h > +++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h > @@ -22,9 +22,7 @@ > #include <platform_support.h> > #include <linux/stdarg.h> > > -#if !defined(ISP2401) > #include "input_formatter.h" > -#endif > #include "input_system.h" > > #include "ia_css_types.h" > @@ -95,19 +93,20 @@ > * these threads can't be used as image pipe > */ > > -#if !defined(ISP2401) > -#define SH_CSS_SP_INTERNAL_METADATA_THREAD 1 > -#else > -#define SH_CSS_SP_INTERNAL_METADATA_THREAD 0 > -#endif > +#define SH_CSS_SP_INTERNAL_METADATA_THREAD_2400 1 > +#define SH_CSS_SP_INTERNAL_METADATA_THREAD_2401 0 > > #define SH_CSS_SP_INTERNAL_SERVICE_THREAD 1 > > #define SH_CSS_MAX_SP_THREADS 5 > > -#define SH_CSS_MAX_SP_INTERNAL_THREADS (\ > - SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ > - SH_CSS_SP_INTERNAL_METADATA_THREAD) > +#define SH_CSS_MAX_SP_INTERNAL_THREADS_2400 (\ > + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ > + SH_CSS_SP_INTERNAL_METADATA_THREAD_2400) > + > +#define SH_CSS_MAX_SP_INTERNAL_THREADS_2401 (\ > + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ > + SH_CSS_SP_INTERNAL_METADATA_THREAD_2401) > > #define SH_CSS_MAX_PIPELINES SH_CSS_MAX_SP_THREADS > > @@ -357,14 +356,12 @@ struct sh_css_sp_debug_command { > u32 dma_sw_reg; > }; > > -#if !defined(ISP2401) > /* SP input formatter configuration.*/ > struct sh_css_sp_input_formatter_set { > u32 stream_format; > input_formatter_cfg_t config_a; > input_formatter_cfg_t config_b; > }; > -#endif > > #define IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT (3) > > @@ -377,7 +374,7 @@ struct sh_css_sp_config { > frames are locked when their EOF event is successfully sent to the > host (true) or when they are passed to the preview/video pipe > (false). */ > -#if !defined(ISP2401) > + > struct { > u8 a_changed; > u8 b_changed; > @@ -385,15 +382,13 @@ struct sh_css_sp_config { > struct sh_css_sp_input_formatter_set > set[SH_CSS_MAX_IF_CONFIGS]; /* CSI-2 port is used as index. */ > } input_formatter; > -#endif > -#if !defined(ISP2401) > + > sync_generator_cfg_t sync_gen; > tpg_cfg_t tpg; > prbs_cfg_t prbs; > input_system_cfg_t input_circuit; > u8 input_circuit_cfg_changed; > u32 mipi_sizes_for_check[N_CSI_PORTS][IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT]; > -#endif > u8 enable_isys_event_queue; > u8 disable_cont_vf; > }; > @@ -409,7 +404,6 @@ enum sh_css_stage_type { > #define SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS_MASK \ > ((SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS << SH_CSS_MAX_SP_THREADS) - 1) > > -#if defined(ISP2401) > struct sh_css_sp_pipeline_terminal { > union { > /* Input System 2401 */ > @@ -442,7 +436,6 @@ struct sh_css_sp_pipeline_io_status { > u32 running[N_INPUT_SYSTEM_CSI_PORT]; /** configured streams */ > }; > > -#endif > enum sh_css_port_dir { > SH_CSS_PORT_INPUT = 0, > SH_CSS_PORT_OUTPUT = 1 > @@ -641,10 +634,8 @@ struct sh_css_sp_stage { > struct sh_css_sp_group { > struct sh_css_sp_config config; > struct sh_css_sp_pipeline pipe[SH_CSS_MAX_SP_THREADS]; > -#if defined(ISP2401) > struct sh_css_sp_pipeline_io pipe_io[SH_CSS_MAX_SP_THREADS]; > struct sh_css_sp_pipeline_io_status pipe_io_status; > -#endif > struct sh_css_sp_debug_command debug; > }; > > @@ -922,13 +913,11 @@ sh_css_frame_info_set_width(struct ia_css_frame_info *info, > unsigned int width, > unsigned int aligned); > > -#if !defined(ISP2401) > > unsigned int > sh_css_get_mipi_sizes_for_check(const unsigned int port, > const unsigned int idx); > > -#endif > > ia_css_ptr > sh_css_store_sp_group_to_ddr(void); > @@ -971,11 +960,9 @@ sh_css_continuous_is_enabled(uint8_t pipe_num); > struct ia_css_pipe * > find_pipe_by_num(uint32_t pipe_num); > > -#ifdef ISP2401 > void > ia_css_get_crop_offsets( > struct ia_css_pipe *pipe, > struct ia_css_frame_info *in_frame); > -#endif > > #endif /* _SH_CSS_INTERNAL_H_ */
diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h index d98f1323441e..2fa0b3e45fe0 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_internal.h +++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h @@ -22,9 +22,7 @@ #include <platform_support.h> #include <linux/stdarg.h> -#if !defined(ISP2401) #include "input_formatter.h" -#endif #include "input_system.h" #include "ia_css_types.h" @@ -95,19 +93,20 @@ * these threads can't be used as image pipe */ -#if !defined(ISP2401) -#define SH_CSS_SP_INTERNAL_METADATA_THREAD 1 -#else -#define SH_CSS_SP_INTERNAL_METADATA_THREAD 0 -#endif +#define SH_CSS_SP_INTERNAL_METADATA_THREAD_2400 1 +#define SH_CSS_SP_INTERNAL_METADATA_THREAD_2401 0 #define SH_CSS_SP_INTERNAL_SERVICE_THREAD 1 #define SH_CSS_MAX_SP_THREADS 5 -#define SH_CSS_MAX_SP_INTERNAL_THREADS (\ - SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ - SH_CSS_SP_INTERNAL_METADATA_THREAD) +#define SH_CSS_MAX_SP_INTERNAL_THREADS_2400 (\ + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ + SH_CSS_SP_INTERNAL_METADATA_THREAD_2400) + +#define SH_CSS_MAX_SP_INTERNAL_THREADS_2401 (\ + SH_CSS_SP_INTERNAL_SERVICE_THREAD +\ + SH_CSS_SP_INTERNAL_METADATA_THREAD_2401) #define SH_CSS_MAX_PIPELINES SH_CSS_MAX_SP_THREADS @@ -357,14 +356,12 @@ struct sh_css_sp_debug_command { u32 dma_sw_reg; }; -#if !defined(ISP2401) /* SP input formatter configuration.*/ struct sh_css_sp_input_formatter_set { u32 stream_format; input_formatter_cfg_t config_a; input_formatter_cfg_t config_b; }; -#endif #define IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT (3) @@ -377,7 +374,7 @@ struct sh_css_sp_config { frames are locked when their EOF event is successfully sent to the host (true) or when they are passed to the preview/video pipe (false). */ -#if !defined(ISP2401) + struct { u8 a_changed; u8 b_changed; @@ -385,15 +382,13 @@ struct sh_css_sp_config { struct sh_css_sp_input_formatter_set set[SH_CSS_MAX_IF_CONFIGS]; /* CSI-2 port is used as index. */ } input_formatter; -#endif -#if !defined(ISP2401) + sync_generator_cfg_t sync_gen; tpg_cfg_t tpg; prbs_cfg_t prbs; input_system_cfg_t input_circuit; u8 input_circuit_cfg_changed; u32 mipi_sizes_for_check[N_CSI_PORTS][IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT]; -#endif u8 enable_isys_event_queue; u8 disable_cont_vf; }; @@ -409,7 +404,6 @@ enum sh_css_stage_type { #define SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS_MASK \ ((SH_CSS_PIPE_CONFIG_SAMPLE_PARAMS << SH_CSS_MAX_SP_THREADS) - 1) -#if defined(ISP2401) struct sh_css_sp_pipeline_terminal { union { /* Input System 2401 */ @@ -442,7 +436,6 @@ struct sh_css_sp_pipeline_io_status { u32 running[N_INPUT_SYSTEM_CSI_PORT]; /** configured streams */ }; -#endif enum sh_css_port_dir { SH_CSS_PORT_INPUT = 0, SH_CSS_PORT_OUTPUT = 1 @@ -641,10 +634,8 @@ struct sh_css_sp_stage { struct sh_css_sp_group { struct sh_css_sp_config config; struct sh_css_sp_pipeline pipe[SH_CSS_MAX_SP_THREADS]; -#if defined(ISP2401) struct sh_css_sp_pipeline_io pipe_io[SH_CSS_MAX_SP_THREADS]; struct sh_css_sp_pipeline_io_status pipe_io_status; -#endif struct sh_css_sp_debug_command debug; }; @@ -922,13 +913,11 @@ sh_css_frame_info_set_width(struct ia_css_frame_info *info, unsigned int width, unsigned int aligned); -#if !defined(ISP2401) unsigned int sh_css_get_mipi_sizes_for_check(const unsigned int port, const unsigned int idx); -#endif ia_css_ptr sh_css_store_sp_group_to_ddr(void); @@ -971,11 +960,9 @@ sh_css_continuous_is_enabled(uint8_t pipe_num); struct ia_css_pipe * find_pipe_by_num(uint32_t pipe_num); -#ifdef ISP2401 void ia_css_get_crop_offsets( struct ia_css_pipe *pipe, struct ia_css_frame_info *in_frame); -#endif #endif /* _SH_CSS_INTERNAL_H_ */
Since some parts of the data scructure elements are determined in compile time, the configuration data structure should be compiled for both two ISP models. In order to set the configuration for both ISP model in runtime, Thesh_css_sp_group is unified to one data structure for the configuration to ensure the data structure can be used for both ISP2400 and 2401. Signed-off-by: Kate Hsuan <hpa@redhat.com> --- .../media/atomisp/pci/sh_css_internal.h | 35 ++++++------------- 1 file changed, 11 insertions(+), 24 deletions(-)