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

media: atomisp: make fw ver irci_stable_candrpv_0415_20150521_0458 work 

This patch removes the unnamed struct `shading` from
`struct sh_css_sp_pipeline` 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")

This patch, together with the 4 patches applied before it revert incompatible
changes in the current css version for ISP2401 (irci_ecr-master_20150911_0724)
back to irci_stable_candrpv_0415_20150521_0458.

Some `struct`s are `sizeof()`ed in sh_css_firmware.c file. So, I guess
issues will happen if these sizes are changed. Therefore, keep them the
same as css version irci_stable_candrpv_0415_20150521_0458 to make atomisp
work for firmware made for such css version since we don't have firmware
made for the current css version.

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

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

+0 −8
Original line number Diff line number Diff line
@@ -551,14 +551,6 @@ struct sh_css_sp_pipeline { 
			u32	raw_bit_depth;

		} raw;

	} copy;



/* ISP2401 */



	/* Parameters passed to Shading Correction kernel. */

	struct {

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

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

	} shading;

};



/*

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

+0 −18
Original line number Diff line number Diff line
@@ -1308,24 +1308,6 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, 
	}

#endif



	if (IS_ISP2401) {

		/* For the shading correction type 1 (the legacy shading table conversion in css is not used),

		* the parameters are passed to the isp for the shading table centering.

		*/

		if (internal_frame_origin_bqs_on_sctbl &&

		    params && params->shading_settings.enable_shading_table_conversion == 0) {

			sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_x_bqs_on_sctbl

			= (uint32_t)internal_frame_origin_bqs_on_sctbl->x;

			sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_y_bqs_on_sctbl

			= (uint32_t)internal_frame_origin_bqs_on_sctbl->y;

		} else {

			sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_x_bqs_on_sctbl =

			0;

			sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_y_bqs_on_sctbl =

			0;

		}

	}



	IA_CSS_LOG("pipe_id %d port_config %08x",

		   pipe_id, sh_css_sp_group.pipe[thread_id].inout_port_config);