Commit 6eb04a8c authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

atomisp: remove aa kernel wrappers 



The aa kernel is used but it consists of nothing more than a set of wrappers
for a memset and an assignment. Replace these at the calling points with the
memset and assignment.

Keep the structures for now - those should disappear as the next layer up
gets unwrapped.

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 46a85fcd

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c

+8 −21
Original line number Diff line number Diff line
@@ -69,28 +69,17 @@ ia_css_process_aa( 
	unsigned pipe_id,

	const struct ia_css_pipeline_stage *stage,

	struct ia_css_isp_parameters *params)

{

	assert(params != NULL);



{

	unsigned size   = stage->binary->info->mem_offsets.offsets.param->dmem.aa.size;



	unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.aa.offset;



	if (size) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() enter:\n");



			ia_css_aa_encode((struct sh_css_isp_aa_params *)

					&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset],

					&params->aa_config,

size);

		struct sh_css_isp_aa_params *t =  (struct sh_css_isp_aa_params *)

				&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];

		t->strength = params->aa_config.strength;

	}

	params->isp_params_changed = true;

	params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;



			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() leave:\n");

		}



	}

}



/* Code generated by genparam/gencode.c:gen_process_function() */
@@ -2214,7 +2203,6 @@ ia_css_get_aa_config(const struct ia_css_isp_parameters *params, 
	*config = params->aa_config;



	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_get_aa_config() leave\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

}



/* Code generated by genparam/gencode.c:gen_set_function() */
@@ -2228,7 +2216,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, 


	assert(params != NULL);

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_set_aa_config() enter:\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->aa_config = *config;

	params->config_changed[IA_CSS_AA_ID] = true;

#ifndef ISP2401

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c

+2 −5
Original line number Diff line number Diff line
@@ -31,11 +31,8 @@ ia_css_initialize_aa_state( 


		unsigned offset = binary->info->mem_offsets.offsets.state->vmem.aa.offset;



		if (size) {

			ia_css_init_aa_state(

				&binary->mem_params.params[IA_CSS_PARAM_CLASS_STATE][IA_CSS_ISP_VMEM].address[offset],

				size);

		}

		if (size)

			memset(&binary->mem_params.params[IA_CSS_PARAM_CLASS_STATE][IA_CSS_ISP_VMEM].address[offset], 0, size);



	}

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_initialize_aa_state() leave:\n");

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c

+6 −21
Original line number Diff line number Diff line
@@ -70,27 +70,14 @@ ia_css_process_aa( 
	unsigned pipe_id,

	const struct ia_css_pipeline_stage *stage,

	struct ia_css_isp_parameters *params)

{

	assert(params != NULL);



{

	unsigned size   = stage->binary->info->mem_offsets.offsets.param->dmem.aa.size;



	unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.aa.offset;



	if (size) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() enter:\n");



			ia_css_aa_encode((struct sh_css_isp_aa_params *)

					&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset],

					&params->aa_config,

size);

			params->isp_params_changed = true;

			params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;



			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() leave:\n");

		}



		struct sh_css_isp_aa_params *t =  (struct sh_css_isp_aa_params *)

			&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];

		t->strength = params->aa_config.strength;

	}

}
@@ -2215,7 +2202,6 @@ ia_css_get_aa_config(const struct ia_css_isp_parameters *params, 
	*config = params->aa_config;



	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_get_aa_config() leave\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

}



/* Code generated by genparam/gencode.c:gen_set_function() */
@@ -2229,7 +2215,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, 


	assert(params != NULL);

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_set_aa_config() enter:\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->aa_config = *config;

	params->config_changed[IA_CSS_AA_ID] = true;

#ifndef ISP2401

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c

+2 −6
Original line number Diff line number Diff line
@@ -29,14 +29,10 @@ ia_css_initialize_aa_state( 


	{

		unsigned size   = binary->info->mem_offsets.offsets.state->vmem.aa.size;



		unsigned offset = binary->info->mem_offsets.offsets.state->vmem.aa.offset;



		if (size) {

			ia_css_init_aa_state(

				&binary->mem_params.params[IA_CSS_PARAM_CLASS_STATE][IA_CSS_ISP_VMEM].address[offset],

				size);

		}

		if (size)

			memset(&binary->mem_params.params[IA_CSS_PARAM_CLASS_STATE][IA_CSS_ISP_VMEM].address[offset], 0, size);



	}

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_initialize_aa_state() leave:\n");

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c

+6 −21
Original line number Diff line number Diff line
@@ -70,27 +70,14 @@ ia_css_process_aa( 
	unsigned pipe_id,

	const struct ia_css_pipeline_stage *stage,

	struct ia_css_isp_parameters *params)

{

	assert(params != NULL);



{

	unsigned size   = stage->binary->info->mem_offsets.offsets.param->dmem.aa.size;



	unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.aa.offset;



	if (size) {

			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() enter:\n");



			ia_css_aa_encode((struct sh_css_isp_aa_params *)

					&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset],

					&params->aa_config,

size);

			params->isp_params_changed = true;

			params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;



			ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_aa() leave:\n");

		}



		struct sh_css_isp_aa_params *t =  (struct sh_css_isp_aa_params *)

			&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];

		t->strength = params->aa_config.strength;

	}

}
@@ -2215,7 +2202,6 @@ ia_css_get_aa_config(const struct ia_css_isp_parameters *params, 
	*config = params->aa_config;



	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_get_aa_config() leave\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

}



/* Code generated by genparam/gencode.c:gen_set_function() */
@@ -2229,7 +2215,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, 


	assert(params != NULL);

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_set_aa_config() enter:\n");

	ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->aa_config = *config;

	params->config_changed[IA_CSS_AA_ID] = true;

#ifndef ISP2401