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

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
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h" #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/sdis/sdis_2/ia_css_sdis2.host.h"
#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.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/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_1.0/ia_css_xnr.host.h"
#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h" #include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
...@@ -719,12 +719,14 @@ ia_css_process_uds( ...@@ -719,12 +719,14 @@ ia_css_process_uds(
unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset; unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;
if (size) { 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_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_uds() enter:\n");
ia_css_uds_encode((struct sh_css_sp_uds_params *) p = (struct sh_css_sp_uds_params *)
&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset], &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];
&params->uds_config, p->crop_pos = params->uds_config.crop_pos;
size); p->uds = params->uds_config.uds;
params->isp_params_changed = true; params->isp_params_changed = true;
params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true; params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h" #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/sdis/sdis_2/ia_css_sdis2.host.h"
#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.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/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_1.0/ia_css_xnr.host.h"
#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h" #include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
...@@ -718,12 +718,14 @@ ia_css_process_uds( ...@@ -718,12 +718,14 @@ ia_css_process_uds(
unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset; unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;
if (size) { 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_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_uds() enter:\n");
ia_css_uds_encode((struct sh_css_sp_uds_params *) p = (struct sh_css_sp_uds_params *)
&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset], &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];
&params->uds_config, p->crop_pos = params->uds_config.crop_pos;
size); p->uds = params->uds_config.uds;
params->isp_params_changed = true; params->isp_params_changed = true;
params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true; params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h" #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/sdis/sdis_2/ia_css_sdis2.host.h"
#include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.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/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_1.0/ia_css_xnr.host.h"
#include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h" #include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h"
...@@ -718,12 +718,14 @@ ia_css_process_uds( ...@@ -718,12 +718,14 @@ ia_css_process_uds(
unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset; unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.uds.offset;
if (size) { 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_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_uds() enter:\n");
ia_css_uds_encode((struct sh_css_sp_uds_params *) p = (struct sh_css_sp_uds_params *)
&stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset], &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset];
&params->uds_config, p->crop_pos = params->uds_config.crop_pos;
size); p->uds = params->uds_config.uds;
params->isp_params_changed = true; params->isp_params_changed = true;
params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true; params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true;
......
/*
* 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);
/*
* 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 */
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
#include "s3a/s3a_1.0/ia_css_s3a.host.h" #include "s3a/s3a_1.0/ia_css_s3a.host.h"
#include "sc/sc_1.0/ia_css_sc.host.h" #include "sc/sc_1.0/ia_css_sc.host.h"
#include "tnr/tnr_1.0/ia_css_tnr.host.h" #include "tnr/tnr_1.0/ia_css_tnr.host.h"
#include "uds/uds_1.0/ia_css_uds.host.h" #include "uds/uds_1.0/ia_css_uds_param.h"
#include "wb/wb_1.0/ia_css_wb.host.h" #include "wb/wb_1.0/ia_css_wb.host.h"
#include "ynr/ynr_1.0/ia_css_ynr.host.h" #include "ynr/ynr_1.0/ia_css_ynr.host.h"
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
#include "sc/sc_1.0/ia_css_sc.host.h" #include "sc/sc_1.0/ia_css_sc.host.h"
#include "sdis/sdis_1.0/ia_css_sdis.host.h" #include "sdis/sdis_1.0/ia_css_sdis.host.h"
#include "tnr/tnr_1.0/ia_css_tnr.host.h" #include "tnr/tnr_1.0/ia_css_tnr.host.h"
#include "uds/uds_1.0/ia_css_uds.host.h" #include "uds/uds_1.0/ia_css_uds_param.h"
#include "wb/wb_1.0/ia_css_wb.host.h" #include "wb/wb_1.0/ia_css_wb.host.h"
#include "ynr/ynr_1.0/ia_css_ynr.host.h" #include "ynr/ynr_1.0/ia_css_ynr.host.h"
#include "xnr/xnr_1.0/ia_css_xnr.host.h" #include "xnr/xnr_1.0/ia_css_xnr.host.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment