Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37fd9c35 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

atomisp: remove fixedbds kernel code 



This is a whole pile of code that wraps a single assignment. Remove it and
put the assignment in the caller. Once we have the kernels sorted we should
revisit these and remove all the pointless 1 item structs that go with it.

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

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

+6 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "isp/kernels/de/de_1.0/ia_css_de.host.h"

#include "isp/kernels/de/de_2/ia_css_de2.host.h"

#include "isp/kernels/dp/dp_1.0/ia_css_dp.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h"

#include "isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h"

#include "isp/kernels/gc/gc_1.0/ia_css_gc.host.h"

#include "isp/kernels/gc/gc_2/ia_css_gc2.host.h"
@@ -924,12 +924,13 @@ ia_css_process_bds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.bds.offset;



		if (size) {

			struct sh_css_isp_bds_params *p;

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



			ia_css_bds_encode((struct sh_css_isp_bds_params *)

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

					&params->bds_config,

size);

			p = (struct sh_css_isp_bds_params *)

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

			p->baf_strength = params->bds_config.strength;



			params->isp_params_changed = true;

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

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

+6 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "isp/kernels/de/de_1.0/ia_css_de.host.h"

#include "isp/kernels/de/de_2/ia_css_de2.host.h"

#include "isp/kernels/dp/dp_1.0/ia_css_dp.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h"

#include "isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h"

#include "isp/kernels/gc/gc_1.0/ia_css_gc.host.h"

#include "isp/kernels/gc/gc_2/ia_css_gc2.host.h"
@@ -923,12 +923,13 @@ ia_css_process_bds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.bds.offset;



		if (size) {

			struct sh_css_isp_bds_params *p;

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



			ia_css_bds_encode((struct sh_css_isp_bds_params *)

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

					&params->bds_config,

size);

			p = (struct sh_css_isp_bds_params *)

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

			p->baf_strength = params->bds_config.strength;



			params->isp_params_changed = true;

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

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

+6 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "isp/kernels/de/de_1.0/ia_css_de.host.h"

#include "isp/kernels/de/de_2/ia_css_de2.host.h"

#include "isp/kernels/dp/dp_1.0/ia_css_dp.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h"

#include "isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h"

#include "isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h"

#include "isp/kernels/gc/gc_1.0/ia_css_gc.host.h"

#include "isp/kernels/gc/gc_2/ia_css_gc2.host.h"
@@ -923,12 +923,13 @@ ia_css_process_bds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.bds.offset;



		if (size) {

			struct sh_css_isp_bds_params *p;

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



			ia_css_bds_encode((struct sh_css_isp_bds_params *)

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

					&params->bds_config,

size);

			p = (struct sh_css_isp_bds_params *)

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

			p->baf_strength = params->bds_config.strength;



			params->isp_params_changed = true;

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

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#include "ia_css_types.h"

#include "sh_css_defs.h"

#include "ia_css_debug.h"



#include "ia_css_fixedbds.host.h"



void

ia_css_bds_encode(

	struct sh_css_isp_bds_params *to,

	const struct ia_css_aa_config *from,

	unsigned size)

{

	(void)size;

	to->baf_strength = from->strength;

}



void

ia_css_bds_dump(

	const struct sh_css_isp_bds_params *bds,

	unsigned level)

{

	(void)bds;

	(void)level;

}



void

ia_css_bds_debug_dtrace(

	const struct ia_css_aa_config *config,

	unsigned level)

{

  (void)config;

  (void)level;

}

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */



#ifndef __IA_CSS_FIXEDBDS_HOST_H

#define __IA_CSS_FIXEDBDS_HOST_H



#include "ia_css_binary.h"

#include "ia_css_fixedbds_param.h"



void

ia_css_bds_encode(

	struct sh_css_isp_bds_params *to,

	const struct ia_css_aa_config *from,

	unsigned size);



void

ia_css_bds_dump(

	const struct sh_css_isp_bds_params *bds,

	unsigned level);



void

ia_css_bds_debug_dtrace(

	const struct ia_css_aa_config *config,

	unsigned level);



#endif /* __IA_CSS_FIXEDBDS_HOST_H */