Commit 9e22032e authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: remove #ifdef SH_CSS_ENABLE_METADATA 



The chosen firmware has it enabled, so, drop this symbol.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 52481d4d

drivers/staging/media/atomisp/pci/sh_css.c

+0 −12
Original line number Diff line number Diff line
@@ -10195,9 +10195,7 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, bool map) 
		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_OUTPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PARAMETER_SET, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PER_FRAME_PARAMETER_SET, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

		if (pipe->pipe_settings.preview.preview_binary.info &&

		    pipe->pipe_settings.preview.preview_binary.info->sp.enable.s3a)

			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_3A_STATISTICS, map);
@@ -10210,9 +10208,7 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, bool map) 
		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PARAMETER_SET, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PER_FRAME_PARAMETER_SET, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

		if (pipe->config.default_capture_config.mode == IA_CSS_CAPTURE_MODE_PRIMARY) {

			for (i = 0; i < pipe->pipe_settings.capture.num_primary_stage; i++) {

				if (pipe->pipe_settings.capture.primary_binary[i].info &&
@@ -10237,9 +10233,7 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, bool map) 
			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PARAMETER_SET, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PER_FRAME_PARAMETER_SET, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

		if (pipe->pipe_settings.video.video_binary.info &&

		    pipe->pipe_settings.video.video_binary.info->sp.enable.s3a)

			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_3A_STATISTICS, map);
@@ -10252,18 +10246,14 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, bool map) 
			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_INPUT_FRAME, map);

		if (!pipe->stream->config.continuous)

			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_OUTPUT_FRAME, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

	} else if (pipe->mode == IA_CSS_PIPE_ID_ACC) {

		if (need_input_queue)

			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_INPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_OUTPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PARAMETER_SET, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PER_FRAME_PARAMETER_SET, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

	} else if (pipe->mode == IA_CSS_PIPE_ID_YUVPP) {

		unsigned int idx;
@@ -10275,9 +10265,7 @@ void ia_css_pipe_map_queue(struct ia_css_pipe *pipe, bool map) 
		if (need_input_queue)

			ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_INPUT_FRAME, map);

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_PARAMETER_SET, map);

#if defined SH_CSS_ENABLE_METADATA

		ia_css_queue_map(thread_id, IA_CSS_BUFFER_TYPE_METADATA, map);

#endif

	}

	IA_CSS_LEAVE("");

}

drivers/staging/media/atomisp/pci/sh_css_internal.h

+1 −11
Original line number Diff line number Diff line
@@ -86,12 +86,6 @@ 
#define SH_CSS_MAX_IF_CONFIGS	3 /* Must match with IA_CSS_NR_OF_CONFIGS (not defined yet).*/

#define SH_CSS_IF_CONFIG_NOT_NEEDED	0xFF



#define SH_CSS_ENABLE_METADATA



#if defined(SH_CSS_ENABLE_METADATA) && !defined(ISP2401)

#define SH_CSS_ENABLE_METADATA_THREAD

#endif



/*

 * SH_CSS_MAX_SP_THREADS:

 *	 sp threads visible to host with connected communication queues
@@ -101,7 +95,7 @@ 
 *	 these threads can't be used as image pipe

 */



#if defined(SH_CSS_ENABLE_METADATA_THREAD)

#if !defined(ISP2401)

#define SH_CSS_SP_INTERNAL_METADATA_THREAD	1

#else

#define SH_CSS_SP_INTERNAL_METADATA_THREAD	0
@@ -526,7 +520,6 @@ struct sh_css_sp_pipeline { 
				  this struct; needs cleanup */

	s32 num_execs; /* number of times to run if this is

			      an acceleration pipe. */

#if defined(SH_CSS_ENABLE_METADATA)

	struct {

		u32        format;   /* Metadata format in hrt format */

		u32        width;    /* Width of a line */
@@ -535,7 +528,6 @@ struct sh_css_sp_pipeline { 
		u32        size;     /* Total size (in bytes) */

		ia_css_ptr    cont_buf; /* Address of continuous buffer */

	} metadata;

#endif

	u32	output_frame_queue_id;

	union {

		struct {
@@ -570,9 +562,7 @@ struct ia_css_frames_sp { 
	struct ia_css_frame_sp_info internal_frame_info;

	struct ia_css_buffer_sp s3a_buf;

	struct ia_css_buffer_sp dvs_buf;

#if defined SH_CSS_ENABLE_METADATA

	struct ia_css_buffer_sp metadata_buf;

#endif

};



/* Information for a single pipeline stage for an ISP */

drivers/staging/media/atomisp/pci/sh_css_sp.c

+0 −13
Original line number Diff line number Diff line
@@ -330,9 +330,7 @@ sh_css_sp_start_isys_copy(struct ia_css_frame *out_frame, 
	unsigned int thread_id;

	u8 stage_num = 0;

	struct sh_css_sp_pipeline *pipe;

#if defined SH_CSS_ENABLE_METADATA

	enum sh_css_queue_id queue_id;

#endif



	assert(out_frame);
@@ -372,7 +370,6 @@ sh_css_sp_start_isys_copy(struct ia_css_frame *out_frame, 


	set_output_frame_buffer(out_frame, 0);



#if defined SH_CSS_ENABLE_METADATA

	if (pipe->metadata.height > 0) {

		ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_METADATA, thread_id,

					       &queue_id);
@@ -380,7 +377,6 @@ sh_css_sp_start_isys_copy(struct ia_css_frame *out_frame, 
						    queue_id, mmgr_EXCEPTION,

						    IA_CSS_BUFFER_TYPE_METADATA);

	}

#endif



	ia_css_debug_pipe_graph_dump_sp_raw_copy(out_frame);

}
@@ -904,9 +900,7 @@ initialize_stage_frames(struct ia_css_frames_sp *frames) 
	initialize_frame_buffer_attribute(&frames->out_vf.buf_attr);

	initialize_frame_buffer_attribute(&frames->s3a_buf);

	initialize_frame_buffer_attribute(&frames->dvs_buf);

#if defined SH_CSS_ENABLE_METADATA

	initialize_frame_buffer_attribute(&frames->metadata_buf);

#endif

}



static int
@@ -1032,10 +1026,8 @@ sh_css_sp_init_stage(struct ia_css_binary *binary, 
						    mmgr_EXCEPTION,

						    IA_CSS_BUFFER_TYPE_DIS_STATISTICS);

	}

#if defined SH_CSS_ENABLE_METADATA

	ia_css_query_internal_queue_id(IA_CSS_BUFFER_TYPE_METADATA, thread_id, &queue_id);

	sh_css_copy_buffer_attr_to_spbuffer(&sh_css_sp_stage.frames.metadata_buf, queue_id, mmgr_EXCEPTION, IA_CSS_BUFFER_TYPE_METADATA);

#endif

	if (err)

		return err;
@@ -1304,7 +1296,6 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, 
	}

	sh_css_sp_group.pipe[thread_id].scaler_pp_lut = sh_css_pipe_get_pp_gdc_lut(pipe);



#if defined(SH_CSS_ENABLE_METADATA)

	if (md_info && md_info->size > 0) {

		sh_css_sp_group.pipe[thread_id].metadata.width  = md_info->resolution.width;

		sh_css_sp_group.pipe[thread_id].metadata.height = md_info->resolution.height;
@@ -1314,10 +1305,6 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, 
		    md_config->data_type, MIPI_PREDICTOR_NONE,

		    &sh_css_sp_group.pipe[thread_id].metadata.format);

	}

#else

	(void)md_config;

	(void)md_info;

#endif



	sh_css_sp_group.pipe[thread_id].output_frame_queue_id = (uint32_t)SH_CSS_INVALID_QUEUE_ID;

	if (pipe_id != IA_CSS_PIPE_ID_COPY) {