diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5')
6 files changed, 0 insertions, 274 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c deleted file mode 100644 index 5ddf61fc95fa..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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" - -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -#include "ia_css_debug.h" -#endif - -#include "ia_css_macc1_5.host.h" - -const struct ia_css_macc1_5_config default_macc1_5_config = { - 1 -}; - -void -ia_css_macc1_5_encode( - struct sh_css_isp_macc1_5_params *to, - const struct ia_css_macc1_5_config *from, - unsigned int size) -{ - (void)size; - to->exp = from->exp; -} - -void -ia_css_macc1_5_vmem_encode( - struct sh_css_isp_macc1_5_vmem_params *params, - const struct ia_css_macc1_5_table *from, - unsigned int size) -{ - unsigned int i, j, k, idx; - unsigned int idx_map[] = { - 0, 1, 3, 2, 6, 7, 5, 4, 12, 13, 15, 14, 10, 11, 9, 8}; - - (void)size; - - for (k = 0; k < 4; k++) - for (i = 0; i < IA_CSS_MACC_NUM_AXES; i++) { - idx = idx_map[i] + (k * IA_CSS_MACC_NUM_AXES); - j = 4 * i; - - params->data[0][(idx)] = from->data[j]; - params->data[1][(idx)] = from->data[j + 1]; - params->data[2][(idx)] = from->data[j + 2]; - params->data[3][(idx)] = from->data[j + 3]; - } - -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_macc1_5_debug_dtrace( - const struct ia_css_macc1_5_config *config, - unsigned int level) -{ - ia_css_debug_dtrace(level, - "config.exp=%d\n", - config->exp); -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h deleted file mode 100644 index 53ef18f7e912..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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_MACC1_5_HOST_H -#define __IA_CSS_MACC1_5_HOST_H - -#include "ia_css_macc1_5_param.h" -#include "ia_css_macc1_5_table.host.h" - -extern const struct ia_css_macc1_5_config default_macc1_5_config; - -void -ia_css_macc1_5_encode( - struct sh_css_isp_macc1_5_params *to, - const struct ia_css_macc1_5_config *from, - unsigned int size); - -void -ia_css_macc1_5_vmem_encode( - struct sh_css_isp_macc1_5_vmem_params *params, - const struct ia_css_macc1_5_table *from, - unsigned int size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_macc1_5_debug_dtrace( - const struct ia_css_macc1_5_config *config, - unsigned int level); -#endif -#endif /* __IA_CSS_MACC1_5_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h deleted file mode 100644 index 41a2da460dcf..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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_MACC1_5_PARAM_H -#define __IA_CSS_MACC1_5_PARAM_H - -#include "type_support.h" -#include "vmem.h" -#include "ia_css_macc1_5_types.h" - -/* MACC */ -struct sh_css_isp_macc1_5_params { - int32_t exp; -}; - -struct sh_css_isp_macc1_5_vmem_params { - VMEM_ARRAY(data, IA_CSS_MACC_NUM_COEFS*ISP_NWAY); -}; - -#endif /* __IA_CSS_MACC1_5_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c deleted file mode 100644 index 89714bf87b52..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * 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 "system_global.h" -#include "ia_css_types.h" -#include "ia_css_macc1_5_table.host.h" - -/* Multi-Axes Color Correction table for ISP2. - * 64values = 2x2matrix for 16area, [s1.12] - * ineffective: 16 of "identity 2x2 matix" {4096,0,0,4096} - */ -const struct ia_css_macc1_5_table default_macc1_5_table = { - { 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096, - 4096, 0, 0, 4096, 4096, 0, 0, 4096 } -}; diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h deleted file mode 100644 index 10a50aa82be8..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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_MACC1_5_TABLE_HOST_H -#define __IA_CSS_MACC1_5_TABLE_HOST_H - -#include "macc/macc1_5/ia_css_macc1_5_types.h" - -extern const struct ia_css_macc1_5_table default_macc1_5_table; - -#endif /* __IA_CSS_MACC1_5_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h deleted file mode 100644 index 9cd31c2c0253..000000000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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_MACC1_5_TYPES_H -#define __IA_CSS_MACC1_5_TYPES_H - -/* @file -* CSS-API header file for Multi-Axis Color Conversion algorithm parameters. -*/ - -/* Multi-Axis Color Conversion configuration - * - * ISP2.6.1: MACC1_5 is used. - */ - - -/* Number of axes in the MACC table. */ -#define IA_CSS_MACC_NUM_AXES 16 -/* Number of coefficients per MACC axes. */ -#define IA_CSS_MACC_NUM_COEFS 4 - -/* Multi-Axes Color Correction (MACC) table. - * - * ISP block: MACC (MACC by only matrix) - * MACC1_5 (MACC by matrix and exponent(ia_css_macc_config)) - * ISP1: MACC is used. - * ISP2: MACC1_5 is used. - * - * [MACC] - * OutU = (data00 * InU + data01 * InV) >> 13 - * OutV = (data10 * InU + data11 * InV) >> 13 - * - * default/ineffective: - * OutU = (8192 * InU + 0 * InV) >> 13 - * OutV = ( 0 * InU + 8192 * InV) >> 13 - * - * [MACC1_5] - * OutU = (data00 * InU + data01 * InV) >> (13 - exp) - * OutV = (data10 * InU + data11 * InV) >> (13 - exp) - * - * default/ineffective: (exp=1) - * OutU = (4096 * InU + 0 * InV) >> (13 - 1) - * OutV = ( 0 * InU + 4096 * InV) >> (13 - 1) - */ -struct ia_css_macc1_5_table { - int16_t data[IA_CSS_MACC_NUM_COEFS * IA_CSS_MACC_NUM_AXES]; - /** 16 of 2x2 matix - MACC1_5: s[macc_config.exp].[13-macc_config.exp], [-8192,8191] - default/ineffective: (s1.12) - 16 of "identity 2x2 matix" {4096,0,0,4096} */ -}; - -/* Multi-Axes Color Correction (MACC) configuration. - * - * ISP block: MACC1_5 (MACC by matrix and exponent(ia_css_macc_config)) - * ISP2: MACC1_5 is used. - */ -struct ia_css_macc1_5_config { - uint8_t exp; /** Common exponent of ia_css_macc_table. - u8.0, [0,13], default 1, ineffective 1 */ -}; - -#endif /* __IA_CSS_MACC1_5_TYPES_H */ |