Commit 66262818 authored by Tsuchiya Yuto's avatar Tsuchiya Yuto Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: remove struct ia_css_isp_parameter 

This patch removes `struct ia_css_isp_parameter sc` from
`struct ia_css_config_memory_offsets` as well as its usage [1].

[1] added on updating css version to irci_master_20150701_0213
    https://raw.githubusercontent.com/intel/ProductionKernelQuilts/cht-m1stable-2016_ww31/uefi/cht-m1stable/patches/cam-0439-atomisp2-css2401-and-2401_legacy-irci_master_2015070.patch


    ("atomisp2: css2401 and 2401_legacy-irci_master_20150701_0213")

Signed-off-by: default avatarTsuchiya Yuto <kitakar@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent fc3b36a7

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

+0 −8
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ 
#include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"

#include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"

#include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"



/* ISP2401 */

#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"



#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"

#include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"

#include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -73,10 +69,6 @@ struct ia_css_config_memory_offsets { 
		struct ia_css_isp_parameter output0;

		struct ia_css_isp_parameter output1;

		struct ia_css_isp_parameter output;



		/* ISP2401 */

		struct ia_css_isp_parameter sc;



		struct ia_css_isp_parameter raw;

		struct ia_css_isp_parameter tnr;

		struct ia_css_isp_parameter ref;

drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.c

+0 −68
Original line number Diff line number Diff line
@@ -23,35 +23,6 @@ 


#include "ia_css_sc.host.h"



/* Code generated by genparam/genconfig.c:gen_configure_function() */



/* ISP2401 */

static 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");

}



void

ia_css_sc_encode(

    struct sh_css_isp_sc_params *to,
@@ -73,45 +44,6 @@ ia_css_sc_dump( 
			    "sc_gain_shift", sc->gain_shift);

}



/* ISP2401 */

void

ia_css_sc_config(

    struct sh_css_isp_sc_isp_config *to,

    const struct ia_css_sc_configuration *from,

    unsigned int size)

{

	u32 internal_org_x_bqs = from->internal_frame_origin_x_bqs_on_sctbl;

	u32 internal_org_y_bqs = from->internal_frame_origin_y_bqs_on_sctbl;

	u32 slice, rest, i;



	(void)size;



	/* The internal_frame_origin_x_bqs_on_sctbl is separated to 8 times of slice_vec. */

	rest = internal_org_x_bqs;

	for (i = 0; i < SH_CSS_SC_INTERPED_GAIN_HOR_SLICE_TIMES; i++) {

		slice = min(rest, ((uint32_t)ISP_SLICE_NELEMS));

		rest = rest - slice;

		to->interped_gain_hor_slice_bqs[i] = slice;

	}



	to->internal_frame_origin_y_bqs_on_sctbl = internal_org_y_bqs;

}



/* ISP2401 */

void

ia_css_sc_configure(

    const struct ia_css_binary *binary,

    u32 internal_frame_origin_x_bqs_on_sctbl,

    uint32_t internal_frame_origin_y_bqs_on_sctbl)

{

	const struct ia_css_sc_configuration config = {

		internal_frame_origin_x_bqs_on_sctbl,

		internal_frame_origin_y_bqs_on_sctbl

	};



	ia_css_configure_sc(binary, &config);

}



/* ------ deprecated(bz675) : from ------ */

/* It looks like @parameter{} (in *.pipe) is used to generate the process/get/set functions,

   for parameters which should be used in the isp kernels.

drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc.host.h

+0 −33
Original line number Diff line number Diff line
@@ -32,39 +32,6 @@ ia_css_sc_dump( 
    const struct sh_css_isp_sc_params *sc,

    unsigned int level);



/* @brief Configure the shading correction.

 * @param[out]	to	Parameters used in the shading correction kernel in the isp.

 * @param[in]	from	Parameters passed from the host.

 * @param[in]	size	Size of the sh_css_isp_sc_isp_config structure.

 *

 * This function passes the parameters for the shading correction from the host to the isp.

 */

/* ISP2401 */

void

ia_css_sc_config(

    struct sh_css_isp_sc_isp_config *to,

    const struct ia_css_sc_configuration *from,

    unsigned int size);



/* @brief Configure the shading correction.

 * @param[in]	binary	The binary, which has the shading correction.

 * @param[in]	internal_frame_origin_x_bqs_on_sctbl

 *			X coordinate (in bqs) of the origin of the internal frame on the shading table.

 * @param[in]	internal_frame_origin_y_bqs_on_sctbl

 *			Y coordinate (in bqs) of the origin of the internal frame on the shading table.

 *

 * This function calls the ia_css_configure_sc() function.

 * (The ia_css_configure_sc() function is automatically generated in ia_css_isp.configs.c.)

 * The ia_css_configure_sc() function calls the ia_css_sc_config() function

 * to pass the parameters for the shading correction from the host to the isp.

 */

/* ISP2401 */

void

ia_css_sc_configure(

    const struct ia_css_binary *binary,

    u32 internal_frame_origin_x_bqs_on_sctbl,

    uint32_t internal_frame_origin_y_bqs_on_sctbl);



/* ------ deprecated(bz675) : from ------ */

void

sh_css_get_shading_settings(const struct ia_css_isp_parameters *params,

drivers/staging/media/atomisp/pci/isp/kernels/sc/sc_1.0/ia_css_sc_types.h

+0 −14
Original line number Diff line number Diff line
@@ -118,18 +118,4 @@ struct ia_css_shading_settings { 


/* ------ deprecated(bz675) : to ------ */



/* Shading Correction configuration.

 *

 *  NOTE: The shading table size is larger than or equal to the internal frame size.

 */

/* ISP2401 */

struct ia_css_sc_configuration {

	u32 internal_frame_origin_x_bqs_on_sctbl; /** Origin X (in bqs) of internal frame on shading table. */

	u32 internal_frame_origin_y_bqs_on_sctbl; /** Origin Y (in bqs) of internal frame on shading table. */

	/** NOTE: bqs = size in BQ(Bayer Quad) unit.

		1BQ means {Gr,R,B,Gb}(2x2 pixels).

		Horizontal 1 bqs corresponds to horizontal 2 pixels.

		Vertical 1 bqs corresponds to vertical 2 pixels. */

};



#endif /* __IA_CSS_SC_TYPES_H */

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

+0 −4
Original line number Diff line number Diff line
@@ -827,10 +827,6 @@ configure_isp_from_args( 
	ia_css_output1_configure(binary, &args->out_vf_frame->info);

	ia_css_copy_output_configure(binary, args->copy_output);

	ia_css_output0_configure(binary, &args->out_frame[0]->info);

#ifdef ISP2401

	ia_css_sc_configure(binary, pipeline->shading.internal_frame_origin_x_bqs_on_sctbl,

			    pipeline->shading.internal_frame_origin_y_bqs_on_sctbl);

#endif

	ia_css_iterator_configure(binary, &args->in_frame->info);

	ia_css_dvs_configure(binary, &args->out_frame[0]->info);

	ia_css_output_configure(binary, &args->out_frame[0]->info);