Commit 7afe8f84 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

atomisp: remove UDS kernel code 



UDS is another layer which actually boils down to some trivial assignments so
remove it so inline the code.

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

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

+7 −5
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h"

#include "isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h"

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

#include "isp/kernels/uds/uds_1.0/ia_css_uds.host.h"

#include "isp/kernels/uds/uds_1.0/ia_css_uds_param.h"

#include "isp/kernels/wb/wb_1.0/ia_css_wb.host.h"

#include "isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h"

#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
@@ -719,12 +719,14 @@ ia_css_process_uds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;



		if (size) {

			struct sh_css_sp_uds_params *p;

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



			ia_css_uds_encode((struct sh_css_sp_uds_params *)

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

					&params->uds_config,

size);

			p = (struct sh_css_sp_uds_params *)

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

			p->crop_pos = params->uds_config.crop_pos;

			p->uds = params->uds_config.uds;



			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

+7 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h"

#include "isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h"

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

#include "isp/kernels/uds/uds_1.0/ia_css_uds.host.h"

#include "isp/kernels/uds/uds_1.0/ia_css_uds_param.h"

#include "isp/kernels/wb/wb_1.0/ia_css_wb.host.h"

#include "isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h"

#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
@@ -718,12 +718,14 @@ ia_css_process_uds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;



		if (size) {

			struct sh_css_sp_uds_params *p;

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



			ia_css_uds_encode((struct sh_css_sp_uds_params *)

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

					&params->uds_config,

size);

			p = (struct sh_css_sp_uds_params *)

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

			p->crop_pos = params->uds_config.crop_pos;

			p->uds = params->uds_config.uds;



			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

+7 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h"

#include "isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h"

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

#include "isp/kernels/uds/uds_1.0/ia_css_uds.host.h"

#include "isp/kernels/uds/uds_1.0/ia_css_uds_param.h"

#include "isp/kernels/wb/wb_1.0/ia_css_wb.host.h"

#include "isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h"

#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
@@ -718,12 +718,14 @@ ia_css_process_uds( 
		unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;



		if (size) {

			struct sh_css_sp_uds_params *p;

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



			ia_css_uds_encode((struct sh_css_sp_uds_params *)

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

					&params->uds_config,

size);

			p = (struct sh_css_sp_uds_params *)

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

			p->crop_pos = params->uds_config.crop_pos;

			p->uds = params->uds_config.uds;



			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/uds/uds_1.0/ia_css_uds.host.c

deleted100644 → 0
+0 −35
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_uds.host.h"



void

ia_css_uds_encode(

	struct sh_css_sp_uds_params *to,

	const struct ia_css_uds_config *from,

	unsigned size)

{

	(void)size;

	to->crop_pos = from->crop_pos;

	to->uds      = from->uds;

}



void

ia_css_uds_dump(

	const struct sh_css_sp_uds_params *uds,

	unsigned level);

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.h

deleted100644 → 0
+0 −33
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_UDS_HOST_H

#define __IA_CSS_UDS_HOST_H



#include "sh_css_params.h"



#include "ia_css_uds_param.h"



void

ia_css_uds_encode(

	struct sh_css_sp_uds_params *to,

	const struct ia_css_uds_config *from,

	unsigned size);



void

ia_css_uds_dump(

	const struct sh_css_sp_uds_params *uds,

	unsigned level);



#endif /* __IA_CSS_UDS_HOST_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE