Commit 50f1d934 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of sctbl_legacy_* 



Those seem to be used only on certain ISP2401 firmwares that
aren't supported by the driver. So, get rid of them.

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

drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h

+0 −2
Original line number Diff line number Diff line
@@ -130,8 +130,6 @@ struct ia_css_binary { 
	int                      sctbl_width_per_color;

	int                      sctbl_aligned_width_per_color;

	int                      sctbl_height;

	int                      sctbl_legacy_width_per_color;

	int                      sctbl_legacy_height;

	struct ia_css_sdis_info	 dis;

	struct ia_css_resolution dvs_envelope;

	bool                     online;

drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c

+0 −6
Original line number Diff line number Diff line
@@ -1339,18 +1339,12 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo, 
			binary->sctbl_width_per_color = _ISP2401_SCTBL_WIDTH_PER_COLOR(isp_internal_width, s3a_log_deci);

			binary->sctbl_aligned_width_per_color = SH_CSS_MAX_SCTBL_ALIGNED_WIDTH_PER_COLOR;

			binary->sctbl_height = _ISP2401_SCTBL_HEIGHT(isp_internal_height, s3a_log_deci);

			binary->sctbl_legacy_width_per_color  = _ISP_SCTBL_LEGACY_WIDTH_PER_COLOR(sc_3a_dis_padded_width, s3a_log_deci);

			binary->sctbl_legacy_height = _ISP_SCTBL_LEGACY_HEIGHT(sc_3a_dis_height, s3a_log_deci);

		}

	} else

	{

		binary->sctbl_width_per_color         = 0;

		binary->sctbl_aligned_width_per_color = 0;

		binary->sctbl_height                  = 0;

		if (IS_ISP2401) {

			binary->sctbl_legacy_width_per_color  = 0;

			binary->sctbl_legacy_height	      = 0;

		}

	}

	ia_css_sdis_init_info(&binary->dis,

			      sc_3a_dis_width,

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

+4 −4
Original line number Diff line number Diff line
@@ -242,8 +242,8 @@ prepare_shading_table(const struct ia_css_shading_table *in_table, 


	if (!in_table) {

		sh_css_params_shading_id_table_generate(target_table,

							binary->sctbl_legacy_width_per_color,

							binary->sctbl_legacy_height);

							binary->sctbl_width_per_color,

							binary->sctbl_height);

		return;

	}
@@ -290,8 +290,8 @@ prepare_shading_table(const struct ia_css_shading_table *in_table, 


	/* This prepare_shading_table() function is called only in legacy API (not in new API).

	   Then, the legacy shading table width and height should be used. */

	table_width  = binary->sctbl_legacy_width_per_color;

	table_height = binary->sctbl_legacy_height;

	table_width  = binary->sctbl_width_per_color;

	table_height = binary->sctbl_height;



	result = ia_css_shading_table_alloc(table_width, table_height);

	if (!result) {