diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels')
238 files changed, 0 insertions, 15249 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c deleted file mode 100644 index f7dd256..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.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 "ia_css_types.h" -#include "sh_css_defs.h" -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" -#endif - -#include "ia_css_aa2.host.h" - -/* YUV Anti-Aliasing configuration. */ -const struct ia_css_aa_config default_aa_config = { - 8191 /* default should be 0 */ -}; - -/* Bayer Anti-Aliasing configuration. */ -const struct ia_css_aa_config default_baa_config = { - 8191 /* default should be 0 */ -}; - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h deleted file mode 100644 index 71587d8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h +++ /dev/null @@ -1,27 +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_AA_HOST_H -#define __IA_CSS_AA_HOST_H - -#include "ia_css_aa2_types.h" -#include "ia_css_aa2_param.h" - -/* YUV Anti-Aliasing configuration. */ -extern const struct ia_css_aa_config default_aa_config; - -/* Bayer Anti-Aliasing configuration. */ -extern const struct ia_css_aa_config default_baa_config; - -#endif /* __IA_CSS_AA_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h deleted file mode 100644 index dbab4d6..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h +++ /dev/null @@ -1,24 +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_AA_PARAM_H -#define __IA_CSS_AA_PARAM_H - -#include "type_support.h" - -struct sh_css_isp_aa_params { - int32_t strength; -}; - -#endif /* __IA_CSS_AA_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h deleted file mode 100644 index 0b95bf9..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h +++ /dev/null @@ -1,48 +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_AA2_TYPES_H -#define __IA_CSS_AA2_TYPES_H - -/* @file -* CSS-API header file for Anti-Aliasing parameters. -*/ - - -/* Anti-Aliasing configuration. - * - * This structure is used both for YUV AA and Bayer AA. - * - * 1. YUV Anti-Aliasing - * struct ia_css_aa_config *aa_config - * - * ISP block: AA2 - * (ISP1: AA2 is not used.) - * ISP2: AA2 should be used. But, AA2 is not used currently. - * - * 2. Bayer Anti-Aliasing - * struct ia_css_aa_config *baa_config - * - * ISP block: BAA2 - * ISP1: BAA2 is used. - * ISP2: BAA2 is used. - */ -struct ia_css_aa_config { - uint16_t strength; /** Strength of the filter. - u0.13, [0,8191], - default/ineffective 0 */ -}; - -#endif /* __IA_CSS_AA2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c deleted file mode 100644 index edc4f1a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c +++ /dev/null @@ -1,60 +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" -#include "ia_css_debug.h" - -#include "ia_css_anr.host.h" - -const struct ia_css_anr_config default_anr_config = { - 10, - { 0, 3, 1, 2, 3, 6, 4, 5, 1, 4, 2, 3, 2, 5, 3, 4, - 0, 3, 1, 2, 3, 6, 4, 5, 1, 4, 2, 3, 2, 5, 3, 4, - 0, 3, 1, 2, 3, 6, 4, 5, 1, 4, 2, 3, 2, 5, 3, 4, - 0, 3, 1, 2, 3, 6, 4, 5, 1, 4, 2, 3, 2, 5, 3, 4}, - {10, 20, 30} -}; - -void -ia_css_anr_encode( - struct sh_css_isp_anr_params *to, - const struct ia_css_anr_config *from, - unsigned size) -{ - (void)size; - to->threshold = from->threshold; -} - -void -ia_css_anr_dump( - const struct sh_css_isp_anr_params *anr, - unsigned level) -{ - if (!anr) return; - ia_css_debug_dtrace(level, "Advance Noise Reduction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "anr_threshold", anr->threshold); -} - -void -ia_css_anr_debug_dtrace( - const struct ia_css_anr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.threshold=%d\n", - config->threshold); -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h deleted file mode 100644 index 29566c0..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h +++ /dev/null @@ -1,39 +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_ANR_HOST_H -#define __IA_CSS_ANR_HOST_H - -#include "ia_css_anr_types.h" -#include "ia_css_anr_param.h" - -extern const struct ia_css_anr_config default_anr_config; - -void -ia_css_anr_encode( - struct sh_css_isp_anr_params *to, - const struct ia_css_anr_config *from, - unsigned size); - -void -ia_css_anr_dump( - const struct sh_css_isp_anr_params *anr, - unsigned level); - -void -ia_css_anr_debug_dtrace( - const struct ia_css_anr_config *config, unsigned level) -; - -#endif /* __IA_CSS_ANR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h deleted file mode 100644 index 2621b92..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h +++ /dev/null @@ -1,25 +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_ANR_PARAM_H -#define __IA_CSS_ANR_PARAM_H - -#include "type_support.h" - -/* ANR (Advanced Noise Reduction) */ -struct sh_css_isp_anr_params { - int32_t threshold; -}; - -#endif /* __IA_CSS_ANR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h deleted file mode 100644 index dc317a8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h +++ /dev/null @@ -1,36 +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_ANR_TYPES_H -#define __IA_CSS_ANR_TYPES_H - -/* @file -* CSS-API header file for Advanced Noise Reduction kernel v1 -*/ - -/* Application specific DMA settings */ -#define ANR_BPP 10 -#define ANR_ELEMENT_BITS ((CEIL_DIV(ANR_BPP, 8))*8) - -/* Advanced Noise Reduction configuration. - * This is also known as Low-Light. - */ -struct ia_css_anr_config { - int32_t threshold; /** Threshold */ - int32_t thresholds[4*4*4]; - int32_t factors[3]; -}; - -#endif /* __IA_CSS_ANR_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c deleted file mode 100644 index b338c43..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c +++ /dev/null @@ -1,46 +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" -#include "ia_css_debug.h" - -#include "ia_css_anr2.host.h" - -void -ia_css_anr2_vmem_encode( - struct ia_css_isp_anr2_params *to, - const struct ia_css_anr_thres *from, - size_t size) -{ - unsigned i; - - (void)size; - for (i = 0; i < ANR_PARAM_SIZE; i++) { - unsigned j; - for (j = 0; j < ISP_VEC_NELEMS; j++) { - to->data[i][j] = from->data[i*ISP_VEC_NELEMS+j]; - } - } -} - -void -ia_css_anr2_debug_dtrace( - const struct ia_css_anr_thres *config, - unsigned level) -{ - (void)config; - (void)level; -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h deleted file mode 100644 index 83c37e32..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h +++ /dev/null @@ -1,35 +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_ANR2_HOST_H -#define __IA_CSS_ANR2_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_anr2_types.h" -#include "ia_css_anr_param.h" -#include "ia_css_anr2_table.host.h" - -void -ia_css_anr2_vmem_encode( - struct ia_css_isp_anr2_params *to, - const struct ia_css_anr_thres *from, - size_t size); - -void -ia_css_anr2_debug_dtrace( - const struct ia_css_anr_thres *config, unsigned level) -; - -#endif /* __IA_CSS_ANR2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c deleted file mode 100644 index 2de51fe..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c +++ /dev/null @@ -1,52 +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_anr2_table.host.h" - -#if 1 -const struct ia_css_anr_thres default_anr_thres = { -{128, 384, 640, 896, 896, 640, 384, 128, 384, 1152, 1920, 2688, 2688, 1920, 1152, 384, 640, 1920, 3200, 4480, 4480, 3200, 1920, 640, 896, 2688, 4480, 6272, 6272, 4480, 2688, 896, 896, 2688, 4480, 6272, 6272, 4480, 2688, 896, 640, 1920, 3200, 4480, 4480, 3200, 1920, 640, 384, 1152, 1920, 2688, 2688, 1920, 1152, 384, 128, 384, 640, 896, 896, 640, 384, 128, -0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, 0, 0, 30, 30, 10, 10, 20, 20, -0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, 0, 0, 60, 60, 20, 20, 40, 40, -0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, 0, 0, 90, 90, 30, 30, 60, 60, -30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, 30, 30, 60, 60, 40, 40, 50, 50, -60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, 60, 60, 120, 120, 80, 80, 100, 100, -90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, 90, 90, 180, 180, 120, 120, 150, 150, -10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, 10, 10, 40, 40, 20, 20, 30, 30, -20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, 20, 20, 80, 80, 40, 40, 60, 60, -30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, 30, 30, 120, 120, 60, 60, 90, 90, -20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, 20, 20, 50, 50, 30, 30, 40, 40, -40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, 40, 40, 100, 100, 60, 60, 80, 80, -60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120, 60, 60, 150, 150, 90, 90, 120, 120} -}; -#else -const struct ia_css_anr_thres default_anr_thres = { -{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} -}; -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h deleted file mode 100644 index 534119e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_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_ANR2_TABLE_HOST_H -#define __IA_CSS_ANR2_TABLE_HOST_H - -#include "ia_css_anr2_types.h" - -extern const struct ia_css_anr_thres default_anr_thres; - -#endif /* __IA_CSS_ANR2_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h deleted file mode 100644 index 9b61131..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h +++ /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. - */ - -#ifndef __IA_CSS_ANR2_TYPES_H -#define __IA_CSS_ANR2_TYPES_H - -/* @file -* CSS-API header file for Advanced Noise Reduction kernel v2 -*/ - -#include "type_support.h" - -#define ANR_PARAM_SIZE 13 - -/* Advanced Noise Reduction (ANR) thresholds */ -struct ia_css_anr_thres { - int16_t data[13*64]; -}; - -#endif /* __IA_CSS_ANR2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h deleted file mode 100644 index 3121417..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h +++ /dev/null @@ -1,27 +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_ANR2_PARAM_H -#define __IA_CSS_ANR2_PARAM_H - -#include "vmem.h" -#include "ia_css_anr2_types.h" - -/* Advanced Noise Reduction (ANR) thresholds */ - -struct ia_css_isp_anr2_params { - VMEM_ARRAY(data, ANR_PARAM_SIZE*ISP_VEC_NELEMS); -}; - -#endif /* __IA_CSS_ANR2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c deleted file mode 100644 index 99c80d2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c +++ /dev/null @@ -1,66 +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. - */ - -#if !defined(HAS_NO_HMEM) - -#include "memory_access.h" -#include "ia_css_types.h" -#include "sh_css_internal.h" -#include "assert_support.h" -#include "sh_css_frac.h" - -#include "ia_css_bh.host.h" - -void -ia_css_bh_hmem_decode( - struct ia_css_3a_rgby_output *out_ptr, - const struct ia_css_bh_table *hmem_buf) -{ - int i; - - /* - * No weighted histogram, hence no grid definition - */ - if(!hmem_buf) - return; - assert(sizeof_hmem(HMEM0_ID) == sizeof(*hmem_buf)); - - /* Deinterleave */ - for (i = 0; i < HMEM_UNIT_SIZE; i++) { - out_ptr[i].r = hmem_buf->hmem[BH_COLOR_R][i]; - out_ptr[i].g = hmem_buf->hmem[BH_COLOR_G][i]; - out_ptr[i].b = hmem_buf->hmem[BH_COLOR_B][i]; - out_ptr[i].y = hmem_buf->hmem[BH_COLOR_Y][i]; - /* sh_css_print ("hmem[%d] = %d, %d, %d, %d\n", - i, out_ptr[i].r, out_ptr[i].g, out_ptr[i].b, out_ptr[i].y); */ - } -} - -void -ia_css_bh_encode( - struct sh_css_isp_bh_params *to, - const struct ia_css_3a_config *from, - unsigned size) -{ - (void)size; - /* coefficients to calculate Y */ - to->y_coef_r = - uDIGIT_FITTING(from->ae_y_coef_r, 16, SH_CSS_AE_YCOEF_SHIFT); - to->y_coef_g = - uDIGIT_FITTING(from->ae_y_coef_g, 16, SH_CSS_AE_YCOEF_SHIFT); - to->y_coef_b = - uDIGIT_FITTING(from->ae_y_coef_b, 16, SH_CSS_AE_YCOEF_SHIFT); -} - -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h deleted file mode 100644 index cbb0929..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h +++ /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. - */ - -#ifndef __IA_CSS_BH_HOST_H -#define __IA_CSS_BH_HOST_H - -#include "ia_css_bh_param.h" -#include "s3a/s3a_1.0/ia_css_s3a_types.h" - -void -ia_css_bh_hmem_decode( - struct ia_css_3a_rgby_output *out_ptr, - const struct ia_css_bh_table *hmem_buf); - -void -ia_css_bh_encode( - struct sh_css_isp_bh_params *to, - const struct ia_css_3a_config *from, - unsigned size); - -#endif /* __IA_CSS_BH_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h deleted file mode 100644 index b0a8ef3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h +++ /dev/null @@ -1,40 +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_HB_PARAM_H -#define __IA_CSS_HB_PARAM_H - -#include "type_support.h" - -#ifndef PIPE_GENERATION -#define __INLINE_HMEM__ -#include "hmem.h" -#endif - -#include "ia_css_bh_types.h" - -/* AE (3A Support) */ -struct sh_css_isp_bh_params { - /* coefficients to calculate Y */ - int32_t y_coef_r; - int32_t y_coef_g; - int32_t y_coef_b; -}; - -/* This should be hmem_data_t, but that breaks the pipe generator */ -struct sh_css_isp_bh_hmem_params { - uint32_t bh[ISP_HIST_COMPONENTS][IA_CSS_HMEM_BH_UNIT_SIZE]; -}; - -#endif /* __IA_CSS_HB_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h deleted file mode 100644 index ec1688e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h +++ /dev/null @@ -1,37 +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_BH_TYPES_H -#define __IA_CSS_BH_TYPES_H - -/* Number of elements in the BH table. - * Should be consistent with hmem.h - */ -#define IA_CSS_HMEM_BH_TABLE_SIZE ISP_HIST_DEPTH -#define IA_CSS_HMEM_BH_UNIT_SIZE (ISP_HIST_DEPTH/ISP_HIST_COMPONENTS) - -#define BH_COLOR_R (0) -#define BH_COLOR_G (1) -#define BH_COLOR_B (2) -#define BH_COLOR_Y (3) -#define BH_COLOR_NUM (4) - -/* BH table */ -struct ia_css_bh_table { - uint32_t hmem[ISP_HIST_COMPONENTS][IA_CSS_HMEM_BH_UNIT_SIZE]; -}; - -#endif /* __IA_CSS_BH_TYPES_H */ - - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c deleted file mode 100644 index 6d12e03..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c +++ /dev/null @@ -1,183 +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 "type_support.h" -#include "ia_css_bnlm.host.h" - -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" /* ia_css_debug_dtrace() */ -#endif -#include <assert_support.h> - -#define BNLM_DIV_LUT_SIZE (12) -static const int32_t div_lut_nearests[BNLM_DIV_LUT_SIZE] = { - 0, 454, 948, 1484, 2070, 2710, 3412, 4184, 5035, 5978, 7025, 8191 -}; - -static const int32_t div_lut_slopes[BNLM_DIV_LUT_SIZE] = { - -7760, -6960, -6216, -5536, -4912, -4344, -3832, -3360, -2936, -2552, -2208, -2208 -}; - -static const int32_t div_lut_intercepts[BNLM_DIV_LUT_SIZE] = { - 8184, 7752, 7336, 6928, 6536, 6152, 5776, 5416, 5064, 4728, 4408, 4408 -}; - -/* Encodes a look-up table from BNLM public parameters to vmem parameters. - * Input: - * lut : bnlm_lut struct containing encoded vmem parameters look-up table - * lut_thr : array containing threshold values for lut - * lut_val : array containing output values related to lut_thr - * lut_size: Size of lut_val array - */ -static inline void -bnlm_lut_encode(struct bnlm_lut *lut, const int32_t *lut_thr, const int32_t *lut_val, const uint32_t lut_size) -{ - u32 blk, i; - const u32 block_size = 16; - const u32 total_blocks = ISP_VEC_NELEMS / block_size; - - /* Create VMEM LUTs from the threshold and value arrays. - * - * Min size of the LUT is 2 entries. - * - * Max size of the LUT is 16 entries, so that the LUT can fit into a - * single group of 16 elements inside a vector. - * Then these elements are copied into other groups inside the same - * vector. If the LUT size is less than 16, then remaining elements are - * set to 0. - */ - assert((lut_size >= 2) && (lut_size <= block_size)); - /* array lut_thr has (lut_size-1) entries */ - for (i = 0; i < lut_size-2; i++) { - /* Check if the lut_thr is monotonically increasing */ - assert(lut_thr[i] <= lut_thr[i+1]); - } - - /* Initialize */ - for (i = 0; i < total_blocks * block_size; i++) { - lut->thr[0][i] = 0; - lut->val[0][i] = 0; - } - - /* Copy all data */ - for (i = 0; i < lut_size - 1; i++) { - lut->thr[0][i] = lut_thr[i]; - lut->val[0][i] = lut_val[i]; - } - lut->val[0][i] = lut_val[i]; /* val has one more element than thr */ - - /* Copy data from first block to all blocks */ - for (blk = 1; blk < total_blocks; blk++) { - u32 blk_offset = blk * block_size; - for (i = 1; i < lut_size; i++) { - lut->thr[0][blk_offset + i] = lut->thr[0][i]; - lut->val[0][blk_offset + i] = lut->val[0][i]; - } - } -} - -/* - * - Encodes BNLM public parameters into VMEM parameters - * - Generates VMEM parameters which will needed internally ISP - */ -void -ia_css_bnlm_vmem_encode( - struct bnlm_vmem_params *to, - const struct ia_css_bnlm_config *from, - size_t size) -{ - int i; - (void)size; - - /* Initialize LUTs in VMEM parameters */ - bnlm_lut_encode(&to->mu_root_lut, from->mu_root_lut_thr, from->mu_root_lut_val, 16); - bnlm_lut_encode(&to->sad_norm_lut, from->sad_norm_lut_thr, from->sad_norm_lut_val, 16); - bnlm_lut_encode(&to->sig_detail_lut, from->sig_detail_lut_thr, from->sig_detail_lut_val, 16); - bnlm_lut_encode(&to->sig_rad_lut, from->sig_rad_lut_thr, from->sig_rad_lut_val, 16); - bnlm_lut_encode(&to->rad_pow_lut, from->rad_pow_lut_thr, from->rad_pow_lut_val, 16); - bnlm_lut_encode(&to->nl_0_lut, from->nl_0_lut_thr, from->nl_0_lut_val, 16); - bnlm_lut_encode(&to->nl_1_lut, from->nl_1_lut_thr, from->nl_1_lut_val, 16); - bnlm_lut_encode(&to->nl_2_lut, from->nl_2_lut_thr, from->nl_2_lut_val, 16); - bnlm_lut_encode(&to->nl_3_lut, from->nl_3_lut_thr, from->nl_3_lut_val, 16); - - /* Initialize arrays in VMEM parameters */ - memset(to->nl_th, 0, sizeof(to->nl_th)); - to->nl_th[0][0] = from->nl_th[0]; - to->nl_th[0][1] = from->nl_th[1]; - to->nl_th[0][2] = from->nl_th[2]; - - memset(to->match_quality_max_idx, 0, sizeof(to->match_quality_max_idx)); - to->match_quality_max_idx[0][0] = from->match_quality_max_idx[0]; - to->match_quality_max_idx[0][1] = from->match_quality_max_idx[1]; - to->match_quality_max_idx[0][2] = from->match_quality_max_idx[2]; - to->match_quality_max_idx[0][3] = from->match_quality_max_idx[3]; - - bnlm_lut_encode(&to->div_lut, div_lut_nearests, div_lut_slopes, BNLM_DIV_LUT_SIZE); - memset(to->div_lut_intercepts, 0, sizeof(to->div_lut_intercepts)); - for(i = 0; i < BNLM_DIV_LUT_SIZE; i++) { - to->div_lut_intercepts[0][i] = div_lut_intercepts[i]; - } - - memset(to->power_of_2, 0, sizeof(to->power_of_2)); - for (i = 0; i < (ISP_VEC_ELEMBITS-1); i++) { - to->power_of_2[0][i] = 1 << i; - } -} - -/* - Encodes BNLM public parameters into DMEM parameters */ -void -ia_css_bnlm_encode( - struct bnlm_dmem_params *to, - const struct ia_css_bnlm_config *from, - size_t size) -{ - (void)size; - to->rad_enable = from->rad_enable; - to->rad_x_origin = from->rad_x_origin; - to->rad_y_origin = from->rad_y_origin; - to->avg_min_th = from->avg_min_th; - to->max_min_th = from->max_min_th; - - to->exp_coeff_a = from->exp_coeff_a; - to->exp_coeff_b = from->exp_coeff_b; - to->exp_coeff_c = from->exp_coeff_c; - to->exp_exponent = from->exp_exponent; -} - -/* Prints debug traces for BNLM public parameters */ -void -ia_css_bnlm_debug_trace( - const struct ia_css_bnlm_config *config, - unsigned level) -{ - if (!config) - return; - -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(level, "BNLM:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "rad_enable", config->rad_enable); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "rad_x_origin", config->rad_x_origin); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "rad_y_origin", config->rad_y_origin); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "avg_min_th", config->avg_min_th); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "max_min_th", config->max_min_th); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "exp_coeff_a", config->exp_coeff_a); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "exp_coeff_b", config->exp_coeff_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "exp_coeff_c", config->exp_coeff_c); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "exp_exponent", config->exp_exponent); - - /* ToDo: print traces for LUTs */ -#endif /* IA_CSS_NO_DEBUG */ - -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h deleted file mode 100644 index 675f6e5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h +++ /dev/null @@ -1,40 +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_BNLM_HOST_H -#define __IA_CSS_BNLM_HOST_H - -#include "ia_css_bnlm_types.h" -#include "ia_css_bnlm_param.h" - -void -ia_css_bnlm_vmem_encode( - struct bnlm_vmem_params *to, - const struct ia_css_bnlm_config *from, - size_t size); - -void -ia_css_bnlm_encode( - struct bnlm_dmem_params *to, - const struct ia_css_bnlm_config *from, - size_t size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_bnlm_debug_trace( - const struct ia_css_bnlm_config *config, - unsigned level); -#endif - -#endif /* __IA_CSS_BNLM_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h deleted file mode 100644 index 2f4be43..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h +++ /dev/null @@ -1,63 +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_BNLM_PARAM_H -#define __IA_CSS_BNLM_PARAM_H - -#include "type_support.h" -#include "vmem.h" /* needed for VMEM_ARRAY */ - -struct bnlm_lut { - VMEM_ARRAY(thr, ISP_VEC_NELEMS); /* thresholds */ - VMEM_ARRAY(val, ISP_VEC_NELEMS); /* values */ -}; - -struct bnlm_vmem_params { - VMEM_ARRAY(nl_th, ISP_VEC_NELEMS); - VMEM_ARRAY(match_quality_max_idx, ISP_VEC_NELEMS); - struct bnlm_lut mu_root_lut; - struct bnlm_lut sad_norm_lut; - struct bnlm_lut sig_detail_lut; - struct bnlm_lut sig_rad_lut; - struct bnlm_lut rad_pow_lut; - struct bnlm_lut nl_0_lut; - struct bnlm_lut nl_1_lut; - struct bnlm_lut nl_2_lut; - struct bnlm_lut nl_3_lut; - - /* LUTs used for division approximiation */ - struct bnlm_lut div_lut; - VMEM_ARRAY(div_lut_intercepts, ISP_VEC_NELEMS); - - /* 240x does not have an ISP instruction to left shift each element of a - * vector by different shift value. Hence it will be simulated by multiplying - * the elements by required 2^shift. */ - VMEM_ARRAY(power_of_2, ISP_VEC_NELEMS); -}; - -/* BNLM ISP parameters */ -struct bnlm_dmem_params { - bool rad_enable; - int32_t rad_x_origin; - int32_t rad_y_origin; - int32_t avg_min_th; - int32_t max_min_th; - - int32_t exp_coeff_a; - uint32_t exp_coeff_b; - int32_t exp_coeff_c; - uint32_t exp_exponent; -}; - -#endif /* __IA_CSS_BNLM_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h deleted file mode 100644 index 87e0f19..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h +++ /dev/null @@ -1,106 +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_BNLM_TYPES_H -#define __IA_CSS_BNLM_TYPES_H - -/* @file -* CSS-API header file for Bayer Non-Linear Mean parameters. -*/ - -#include "type_support.h" /* int32_t */ - -/* Bayer Non-Linear Mean configuration - * - * \brief BNLM public parameters. - * \details Struct with all parameters for the BNLM kernel that can be set - * from the CSS API. - * - * ISP2.6.1: BNLM is used. - */ -struct ia_css_bnlm_config { - bool rad_enable; /** Enable a radial dependency in a weight calculation */ - int32_t rad_x_origin; /** Initial x coordinate for a radius calculation */ - int32_t rad_y_origin; /** Initial x coordinate for a radius calculation */ - /* a threshold for average of weights if this < Th, do not denoise pixel */ - int32_t avg_min_th; - /* minimum weight for denoising if max < th, do not denoise pixel */ - int32_t max_min_th; - - /**@{*/ - /* Coefficient for approximation, in the form of (1 + x / N)^N, - * that fits the first-order exp() to default exp_lut in BNLM sheet - * */ - int32_t exp_coeff_a; - uint32_t exp_coeff_b; - int32_t exp_coeff_c; - uint32_t exp_exponent; - /**@}*/ - - int32_t nl_th[3]; /** Detail thresholds */ - - /* Index for n-th maximum candidate weight for each detail group */ - int32_t match_quality_max_idx[4]; - - /**@{*/ - /* A lookup table for 1/sqrt(1+mu) approximation */ - int32_t mu_root_lut_thr[15]; - int32_t mu_root_lut_val[16]; - /**@}*/ - /**@{*/ - /* A lookup table for SAD normalization */ - int32_t sad_norm_lut_thr[15]; - int32_t sad_norm_lut_val[16]; - /**@}*/ - /**@{*/ - /* A lookup table that models a weight's dependency on textures */ - int32_t sig_detail_lut_thr[15]; - int32_t sig_detail_lut_val[16]; - /**@}*/ - /**@{*/ - /* A lookup table that models a weight's dependency on a pixel's radial distance */ - int32_t sig_rad_lut_thr[15]; - int32_t sig_rad_lut_val[16]; - /**@}*/ - /**@{*/ - /* A lookup table to control denoise power depending on a pixel's radial distance */ - int32_t rad_pow_lut_thr[15]; - int32_t rad_pow_lut_val[16]; - /**@}*/ - /**@{*/ - /* Non linear transfer functions to calculate the blending coefficient depending on detail group */ - /* detail group 0 */ - /**@{*/ - int32_t nl_0_lut_thr[15]; - int32_t nl_0_lut_val[16]; - /**@}*/ - /**@{*/ - /* detail group 1 */ - int32_t nl_1_lut_thr[15]; - int32_t nl_1_lut_val[16]; - /**@}*/ - /**@{*/ - /* detail group 2 */ - int32_t nl_2_lut_thr[15]; - int32_t nl_2_lut_val[16]; - /**@}*/ - /**@{*/ - /* detail group 3 */ - int32_t nl_3_lut_thr[15]; - int32_t nl_3_lut_val[16]; - /**@}*/ - /**@}*/ -}; - -#endif /* __IA_CSS_BNLM_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c deleted file mode 100644 index a7de6ec..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c +++ /dev/null @@ -1,122 +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 "type_support.h" -#include "ia_css_bnr2_2.host.h" - -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" /* ia_css_debug_dtrace() */ -#endif - -/* Default kernel parameters. */ -const struct ia_css_bnr2_2_config default_bnr2_2_config = { - 200, - 200, - 200, - 0, - 0, - 0, - 200, - 200, - 200, - 0, - 0, - 0, - 0, - 4096, - 8191, - 128, - 1, - 0, - 0, - 0, - 8191, - 0, - 8191 -}; - -void -ia_css_bnr2_2_encode( - struct sh_css_isp_bnr2_2_params *to, - const struct ia_css_bnr2_2_config *from, - size_t size) -{ - (void)size; - to->d_var_gain_r = from->d_var_gain_r; - to->d_var_gain_g = from->d_var_gain_g; - to->d_var_gain_b = from->d_var_gain_b; - to->d_var_gain_slope_r = from->d_var_gain_slope_r; - to->d_var_gain_slope_g = from->d_var_gain_slope_g; - to->d_var_gain_slope_b = from->d_var_gain_slope_b; - - to->n_var_gain_r = from->n_var_gain_r; - to->n_var_gain_g = from->n_var_gain_g; - to->n_var_gain_b = from->n_var_gain_b; - to->n_var_gain_slope_r = from->n_var_gain_slope_r; - to->n_var_gain_slope_g = from->n_var_gain_slope_g; - to->n_var_gain_slope_b = from->n_var_gain_slope_b; - - to->dir_thres = from->dir_thres; - to->dir_thres_w = from->dir_thres_w; - to->var_offset_coef = from->var_offset_coef; - - to->dir_gain = from->dir_gain; - to->detail_gain = from->detail_gain; - to->detail_gain_divisor = from->detail_gain_divisor; - to->detail_level_offset = from->detail_level_offset; - - to->d_var_th_min = from->d_var_th_min; - to->d_var_th_max = from->d_var_th_max; - to->n_var_th_min = from->n_var_th_min; - to->n_var_th_max = from->n_var_th_max; -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_bnr2_2_debug_dtrace( - const struct ia_css_bnr2_2_config *bnr, - unsigned level) -{ - if (!bnr) - return; - - ia_css_debug_dtrace(level, "Bayer Noise Reduction 2.2:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_r", bnr->d_var_gain_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_g", bnr->d_var_gain_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_b", bnr->d_var_gain_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_slope_r", bnr->d_var_gain_slope_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_slope_g", bnr->d_var_gain_slope_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_gain_slope_b", bnr->d_var_gain_slope_b); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_r", bnr->n_var_gain_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_g", bnr->n_var_gain_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_b", bnr->n_var_gain_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_slope_r", bnr->n_var_gain_slope_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_slope_g", bnr->n_var_gain_slope_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_gain_slope_b", bnr->n_var_gain_slope_b); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "dir_thres", bnr->dir_thres); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "dir_thres_w", bnr->dir_thres_w); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "var_offset_coef", bnr->var_offset_coef); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "dir_gain", bnr->dir_gain); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "detail_gain", bnr->detail_gain); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "detail_gain_divisor", bnr->detail_gain_divisor); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "detail_level_offset", bnr->detail_level_offset); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_th_min", bnr->d_var_th_min); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "d_var_th_max", bnr->d_var_th_max); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_th_min", bnr->n_var_th_min); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "n_var_th_max", bnr->n_var_th_max); -} -#endif /* IA_CSS_NO_DEBUG */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h deleted file mode 100644 index c94b366..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h +++ /dev/null @@ -1,35 +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_BNR2_2_HOST_H -#define __IA_CSS_BNR2_2_HOST_H - -#include "ia_css_bnr2_2_types.h" -#include "ia_css_bnr2_2_param.h" - -extern const struct ia_css_bnr2_2_config default_bnr2_2_config; - -void -ia_css_bnr2_2_encode( - struct sh_css_isp_bnr2_2_params *to, - const struct ia_css_bnr2_2_config *from, - size_t size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_bnr2_2_debug_dtrace( - const struct ia_css_bnr2_2_config *config, - unsigned level); -#endif - -#endif /* __IA_CSS_BNR2_2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h deleted file mode 100644 index 6dec27a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h +++ /dev/null @@ -1,47 +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_BNR2_2_PARAM_H -#define __IA_CSS_BNR2_2_PARAM_H - -#include "type_support.h" - -/* BNR (Bayer Noise Reduction) ISP parameters */ -struct sh_css_isp_bnr2_2_params { - int32_t d_var_gain_r; - int32_t d_var_gain_g; - int32_t d_var_gain_b; - int32_t d_var_gain_slope_r; - int32_t d_var_gain_slope_g; - int32_t d_var_gain_slope_b; - int32_t n_var_gain_r; - int32_t n_var_gain_g; - int32_t n_var_gain_b; - int32_t n_var_gain_slope_r; - int32_t n_var_gain_slope_g; - int32_t n_var_gain_slope_b; - int32_t dir_thres; - int32_t dir_thres_w; - int32_t var_offset_coef; - int32_t dir_gain; - int32_t detail_gain; - int32_t detail_gain_divisor; - int32_t detail_level_offset; - int32_t d_var_th_min; - int32_t d_var_th_max; - int32_t n_var_th_min; - int32_t n_var_th_max; -}; - -#endif /* __IA_CSS_BNR2_2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h deleted file mode 100644 index 551bd0e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h +++ /dev/null @@ -1,71 +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_BNR2_2_TYPES_H -#define __IA_CSS_BNR2_2_TYPES_H - -/* @file -* CSS-API header file for Bayer Noise Reduction parameters. -*/ - -#include "type_support.h" /* int32_t */ - -/* Bayer Noise Reduction 2.2 configuration - * - * \brief BNR2_2 public parameters. - * \details Struct with all parameters for the BNR2.2 kernel that can be set - * from the CSS API. - * - * ISP2.6.1: BNR2.2 is used. - */ -struct ia_css_bnr2_2_config { - /**@{*/ - /* Directional variance gain for R/G/B components in dark region */ - int32_t d_var_gain_r; - int32_t d_var_gain_g; - int32_t d_var_gain_b; - /**@}*/ - /**@{*/ - /* Slope of Directional variance gain between dark and bright region */ - int32_t d_var_gain_slope_r; - int32_t d_var_gain_slope_g; - int32_t d_var_gain_slope_b; - /**@}*/ - /**@{*/ - /* Non-Directional variance gain for R/G/B components in dark region */ - int32_t n_var_gain_r; - int32_t n_var_gain_g; - int32_t n_var_gain_b; - /**@}*/ - /**@{*/ - /* Slope of Non-Directional variance gain between dark and bright region */ - int32_t n_var_gain_slope_r; - int32_t n_var_gain_slope_g; - int32_t n_var_gain_slope_b; - /**@}*/ - - int32_t dir_thres; /** Threshold for directional filtering */ - int32_t dir_thres_w; /** Threshold width for directional filtering */ - int32_t var_offset_coef; /** Variance offset coefficient */ - int32_t dir_gain; /** Gain for directional coefficient */ - int32_t detail_gain; /** Gain for low contrast texture control */ - int32_t detail_gain_divisor; /** Gain divisor for low contrast texture control */ - int32_t detail_level_offset; /** Bias value for low contrast texture control */ - int32_t d_var_th_min; /** Minimum clipping value for directional variance*/ - int32_t d_var_th_max; /** Maximum clipping value for diretional variance*/ - int32_t n_var_th_min; /** Minimum clipping value for non-directional variance*/ - int32_t n_var_th_max; /** Maximum clipping value for non-directional variance*/ -}; - -#endif /* __IA_CSS_BNR2_2_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c deleted file mode 100644 index d1baca5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c +++ /dev/null @@ -1,64 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" - -#include "ia_css_bnr.host.h" - -void -ia_css_bnr_encode( - struct sh_css_isp_bnr_params *to, - const struct ia_css_nr_config *from, - unsigned size) -{ - (void)size; - /* BNR (Bayer Noise Reduction) */ - to->threshold_low = - uDIGIT_FITTING(from->direction, 16, SH_CSS_BAYER_BITS); - to->threshold_width_log2 = uFRACTION_BITS_FITTING(8); - to->threshold_width = - 1 << to->threshold_width_log2; - to->gain_all = - uDIGIT_FITTING(from->bnr_gain, 16, SH_CSS_BNR_GAIN_SHIFT); - to->gain_dir = - uDIGIT_FITTING(from->bnr_gain, 16, SH_CSS_BNR_GAIN_SHIFT); - to->clip = uDIGIT_FITTING((unsigned)16384, 16, SH_CSS_BAYER_BITS); -} - -void -ia_css_bnr_dump( - const struct sh_css_isp_bnr_params *bnr, - unsigned level) -{ - if (!bnr) return; - ia_css_debug_dtrace(level, "Bayer Noise Reduction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_gain_all", bnr->gain_all); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_gain_dir", bnr->gain_dir); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_threshold_low", - bnr->threshold_low); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_threshold_width_log2", - bnr->threshold_width_log2); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_threshold_width", - bnr->threshold_width); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "bnr_clip", bnr->clip); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h deleted file mode 100644 index ccd2abc..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h +++ /dev/null @@ -1,34 +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_BNR_HOST_H -#define __IA_CSS_BNR_HOST_H - -#include "sh_css_params.h" - -#include "ynr/ynr_1.0/ia_css_ynr_types.h" -#include "ia_css_bnr_param.h" - -void -ia_css_bnr_encode( - struct sh_css_isp_bnr_params *to, - const struct ia_css_nr_config *from, - unsigned size); - -void -ia_css_bnr_dump( - const struct sh_css_isp_bnr_params *bnr, - unsigned level); - -#endif /* __IA_CSS_DP_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h deleted file mode 100644 index 331e058..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h +++ /dev/null @@ -1,30 +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_BNR_PARAM_H -#define __IA_CSS_BNR_PARAM_H - -#include "type_support.h" - -/* BNR (Bayer Noise Reduction) */ -struct sh_css_isp_bnr_params { - int32_t gain_all; - int32_t gain_dir; - int32_t threshold_low; - int32_t threshold_width_log2; - int32_t threshold_width; - int32_t clip; -}; - -#endif /* __IA_CSS_BNR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c deleted file mode 100644 index d14fd8f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c +++ /dev/null @@ -1,28 +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" -#include "ia_css_debug.h" - -#include "ia_css_cnr.host.h" - -/* keep the interface here, it is not enabled yet because host doesn't know the size of individual state */ -void -ia_css_init_cnr_state( - void/*struct sh_css_isp_cnr_vmem_state*/ *state, - size_t size) -{ - memset(state, 0, size); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h deleted file mode 100644 index 6f00d28..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h +++ /dev/null @@ -1,25 +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_CNR_HOST_H -#define __IA_CSS_CNR_HOST_H - -#include "ia_css_cnr_param.h" - -void -ia_css_init_cnr_state( - void/*struct sh_css_isp_cnr_vmem_state*/ *state, - size_t size); - -#endif /* __IA_CSS_CNR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h deleted file mode 100644 index c1af207..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h +++ /dev/null @@ -1,24 +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_CNR_PARAM_H -#define __IA_CSS_CNR_PARAM_H - -#include "type_support.h" - -/* CNR (Chroma Noise Reduction) */ -/* Reuse YNR1 param structure */ -#include "../../ynr/ynr_1.0/ia_css_ynr_param.h" - -#endif /* __IA_CSS_CNR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c deleted file mode 100644 index 4b4b2b7..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c +++ /dev/null @@ -1,76 +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" -#include "ia_css_debug.h" - -#include "ia_css_cnr2.host.h" - -const struct ia_css_cnr_config default_cnr_config = { - 0, - 0, - 100, - 100, - 100, - 50, - 50, - 50 -}; - -void -ia_css_cnr_encode( - struct sh_css_isp_cnr_params *to, - const struct ia_css_cnr_config *from, - unsigned size) -{ - (void)size; - to->coring_u = from->coring_u; - to->coring_v = from->coring_v; - to->sense_gain_vy = from->sense_gain_vy; - to->sense_gain_vu = from->sense_gain_vu; - to->sense_gain_vv = from->sense_gain_vv; - to->sense_gain_hy = from->sense_gain_hy; - to->sense_gain_hu = from->sense_gain_hu; - to->sense_gain_hv = from->sense_gain_hv; -} - -void -ia_css_cnr_dump( - const struct sh_css_isp_cnr_params *cnr, - unsigned level); - -void -ia_css_cnr_debug_dtrace( - const struct ia_css_cnr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.coring_u=%d, config.coring_v=%d, " - "config.sense_gain_vy=%d, config.sense_gain_hy=%d, " - "config.sense_gain_vu=%d, config.sense_gain_hu=%d, " - "config.sense_gain_vv=%d, config.sense_gain_hv=%d\n", - config->coring_u, config->coring_v, - config->sense_gain_vy, config->sense_gain_hy, - config->sense_gain_vu, config->sense_gain_hu, - config->sense_gain_vv, config->sense_gain_hv); -} - -void -ia_css_init_cnr2_state( - void/*struct sh_css_isp_cnr_vmem_state*/ *state, - size_t size) -{ - memset(state, 0, size); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h deleted file mode 100644 index abcf0eb..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h +++ /dev/null @@ -1,43 +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_CNR2_HOST_H -#define __IA_CSS_CNR2_HOST_H - -#include "ia_css_cnr2_types.h" -#include "ia_css_cnr2_param.h" - -extern const struct ia_css_cnr_config default_cnr_config; - -void -ia_css_cnr_encode( - struct sh_css_isp_cnr_params *to, - const struct ia_css_cnr_config *from, - unsigned size); - -void -ia_css_cnr_dump( - const struct sh_css_isp_cnr_params *cnr, - unsigned level); - -void -ia_css_cnr_debug_dtrace( - const struct ia_css_cnr_config *config, - unsigned level); - -void -ia_css_init_cnr2_state( - void/*struct sh_css_isp_cnr_vmem_state*/ *state, - size_t size); -#endif /* __IA_CSS_CNR2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h deleted file mode 100644 index d6f490e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h +++ /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. - */ - -#ifndef __IA_CSS_CNR2_PARAM_H -#define __IA_CSS_CNR2_PARAM_H - -#include "type_support.h" - -/* CNR (Chroma Noise Reduction) */ -struct sh_css_isp_cnr_params { - int32_t coring_u; - int32_t coring_v; - int32_t sense_gain_vy; - int32_t sense_gain_vu; - int32_t sense_gain_vv; - int32_t sense_gain_hy; - int32_t sense_gain_hu; - int32_t sense_gain_hv; -}; - -#endif /* __IA_CSS_CNR2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h deleted file mode 100644 index 3ebc069..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h +++ /dev/null @@ -1,55 +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_CNR2_TYPES_H -#define __IA_CSS_CNR2_TYPES_H - -/* @file -* CSS-API header file for Chroma Noise Reduction (CNR) parameters -*/ - -/* Chroma Noise Reduction configuration. - * - * Small sensitivity of edge means strong smoothness and NR performance. - * If you see blurred color on vertical edges, - * set higher values on sense_gain_h*. - * If you see blurred color on horizontal edges, - * set higher values on sense_gain_v*. - * - * ISP block: CNR2 - * (ISP1: CNR1 is used.) - * (ISP2: CNR1 is used for Preview/Video.) - * ISP2: CNR2 is used for Still. - */ -struct ia_css_cnr_config { - uint16_t coring_u; /** Coring level of U. - u0.13, [0,8191], default/ineffective 0 */ - uint16_t coring_v; /** Coring level of V. - u0.13, [0,8191], default/ineffective 0 */ - uint16_t sense_gain_vy; /** Sensitivity of horizontal edge of Y. - u13.0, [0,8191], default 100, ineffective 8191 */ - uint16_t sense_gain_vu; /** Sensitivity of horizontal edge of U. - u13.0, [0,8191], default 100, ineffective 8191 */ - uint16_t sense_gain_vv; /** Sensitivity of horizontal edge of V. - u13.0, [0,8191], default 100, ineffective 8191 */ - uint16_t sense_gain_hy; /** Sensitivity of vertical edge of Y. - u13.0, [0,8191], default 50, ineffective 8191 */ - uint16_t sense_gain_hu; /** Sensitivity of vertical edge of U. - u13.0, [0,8191], default 50, ineffective 8191 */ - uint16_t sense_gain_hv; /** Sensitivity of vertical edge of V. - u13.0, [0,8191], default 50, ineffective 8191 */ -}; - -#endif /* __IA_CSS_CNR2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h deleted file mode 100644 index 56651ba..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h +++ /dev/null @@ -1,20 +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_CNRX_PARAM_H -#define __IA_CSS_CNRX_PARAM_H - -#include "ia_css_cnr2_param.h" - -#endif /* __IA_CSS_CNRX_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c deleted file mode 100644 index 8f25ee1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c +++ /dev/null @@ -1,36 +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 "ia_css_conversion.host.h" - -const struct ia_css_conversion_config default_conversion_config = { - 0, - 0, - 0, - 0, -}; - -void -ia_css_conversion_encode( - struct sh_css_isp_conversion_params *to, - const struct ia_css_conversion_config *from, - unsigned size) -{ - (void)size; - to->en = from->en; - to->dummy0 = from->dummy0; - to->dummy1 = from->dummy1; - to->dummy2 = from->dummy2; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h deleted file mode 100644 index da7a0a0..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h +++ /dev/null @@ -1,33 +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_CONVERSION_HOST_H -#define __IA_CSS_CONVERSION_HOST_H - -#include "ia_css_conversion_types.h" -#include "ia_css_conversion_param.h" - -extern const struct ia_css_conversion_config default_conversion_config; - -void -ia_css_conversion_encode( - struct sh_css_isp_conversion_params *to, - const struct ia_css_conversion_config *from, - unsigned size); - -#ifdef ISP2401 -/* workaround until code generation in isp_kernelparameters.host.c is fixed */ -#define ia_css_conversion_par_encode(to, from, size) ia_css_conversion_encode(to, from, size) -#endif -#endif /* __IA_CSS_CONVERSION_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h deleted file mode 100644 index 301d506..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h +++ /dev/null @@ -1,28 +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_CONVERSION_PARAM_H -#define __IA_CSS_CONVERSION_PARAM_H - -#include "type_support.h" - -/* CONVERSION */ -struct sh_css_isp_conversion_params { - uint32_t en; - uint32_t dummy0; - uint32_t dummy1; - uint32_t dummy2; -}; - -#endif /* __IA_CSS_CONVERSION_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h deleted file mode 100644 index 47a38fd..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h +++ /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. - */ - -#ifndef __IA_CSS_CONVERSION_TYPES_H -#define __IA_CSS_CONVERSION_TYPES_H - -/** - * Conversion Kernel parameters. - * Deinterleave bayer quad into isys format - * - * ISP block: CONVERSION - * - */ -struct ia_css_conversion_config { - uint32_t en; /** en parameter */ - uint32_t dummy0; /** dummy0 dummy parameter 0 */ - uint32_t dummy1; /** dummy1 dummy parameter 1 */ - uint32_t dummy2; /** dummy2 dummy parameter 2 */ -}; - -#endif /* __IA_CSS_CONVERSION_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c deleted file mode 100644 index 45e1ea8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c +++ /dev/null @@ -1,47 +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_copy_output.host.h" -#include "ia_css_binary.h" -#include "type_support.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" - -static const struct ia_css_copy_output_configuration default_config = { - .enable = false, -}; - -void -ia_css_copy_output_config( - struct sh_css_isp_copy_output_isp_config *to, - const struct ia_css_copy_output_configuration *from, - unsigned size) -{ - (void)size; - to->enable = from->enable; -} - -void -ia_css_copy_output_configure( - const struct ia_css_binary *binary, - bool enable) -{ - struct ia_css_copy_output_configuration config = default_config; - - config.enable = enable; - - ia_css_configure_copy_output(binary, &config); -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h deleted file mode 100644 index 3eb7736..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h +++ /dev/null @@ -1,34 +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_COPY_OUTPUT_HOST_H -#define __IA_CSS_COPY_OUTPUT_HOST_H - -#include "type_support.h" -#include "ia_css_binary.h" - -#include "ia_css_copy_output_param.h" - -void -ia_css_copy_output_config( - struct sh_css_isp_copy_output_isp_config *to, - const struct ia_css_copy_output_configuration *from, - unsigned size); - -void -ia_css_copy_output_configure( - const struct ia_css_binary *binary, - bool enable); - -#endif /* __IA_CSS_COPY_OUTPUT_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h deleted file mode 100644 index 622d918..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h +++ /dev/null @@ -1,26 +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_COPY_PARAM_H -#define __IA_CSS_COPY_PARAM_H - -struct ia_css_copy_output_configuration { - bool enable; -}; - -struct sh_css_isp_copy_output_isp_config { - uint32_t enable; -}; - -#endif /* __IA_CSS_COPY_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c deleted file mode 100644 index 9290522..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c +++ /dev/null @@ -1,64 +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 <assert_support.h> -#include <ia_css_frame_public.h> -#include <ia_css_frame.h> -#include <ia_css_binary.h> -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" -#include "ia_css_crop.host.h" - -static const struct ia_css_crop_configuration default_config = { - .info = (struct ia_css_frame_info *)NULL, -}; - -void -ia_css_crop_encode( - struct sh_css_isp_crop_isp_params *to, - const struct ia_css_crop_config *from, - unsigned size) -{ - (void)size; - to->crop_pos = from->crop_pos; -} - -void -ia_css_crop_config( - struct sh_css_isp_crop_isp_config *to, - const struct ia_css_crop_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, from->info); - to->width_a_over_b = elems_a / to->port_b.elems; - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); -} - -void -ia_css_crop_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - struct ia_css_crop_configuration config = default_config; - - config.info = info; - - ia_css_configure_crop(binary, &config); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h deleted file mode 100644 index 9c1a4c7..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.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_CROP_HOST_H -#define __IA_CSS_CROP_HOST_H - -#include <ia_css_frame_public.h> -#include <ia_css_binary.h> - -#include "ia_css_crop_types.h" -#include "ia_css_crop_param.h" - -void -ia_css_crop_encode( - struct sh_css_isp_crop_isp_params *to, - const struct ia_css_crop_config *from, - unsigned size); - -void -ia_css_crop_config( - struct sh_css_isp_crop_isp_config *to, - const struct ia_css_crop_configuration *from, - unsigned size); - -void -ia_css_crop_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -#endif /* __IA_CSS_CROP_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h deleted file mode 100644 index 0f1812c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h +++ /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. - */ - -#ifndef __IA_CSS_CROP_PARAM_H -#define __IA_CSS_CROP_PARAM_H - -#include <type_support.h> -#include "dma.h" -#include "sh_css_internal.h" /* sh_css_crop_pos */ - -/* Crop frame */ -struct sh_css_isp_crop_isp_config { - uint32_t width_a_over_b; - struct dma_port_config port_b; -}; - -struct sh_css_isp_crop_isp_params { - struct sh_css_crop_pos crop_pos; -}; - -#endif /* __IA_CSS_CROP_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h deleted file mode 100644 index b5d4542..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h +++ /dev/null @@ -1,35 +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_CROP_TYPES_H -#define __IA_CSS_CROP_TYPES_H - -/* Crop frame - * - * ISP block: crop frame - */ - -#include <ia_css_frame_public.h> -#include "sh_css_uds.h" /* sh_css_crop_pos */ - -struct ia_css_crop_config { - struct sh_css_crop_pos crop_pos; -}; - -struct ia_css_crop_configuration { - const struct ia_css_frame_info *info; -}; - -#endif /* __IA_CSS_CROP_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c deleted file mode 100644 index 9f94ef1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c +++ /dev/null @@ -1,132 +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_csc.host.h" - -const struct ia_css_cc_config default_cc_config = { - 8, - {255, 29, 120, 0, -374, -342, 0, -672, 301}, -}; - -void -ia_css_encode_cc( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size) -{ - (void)size; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_encode_cc() enter:\n"); -#endif - - to->m_shift = (int16_t) from->fraction_bits; - to->m00 = (int16_t) from->matrix[0]; - to->m01 = (int16_t) from->matrix[1]; - to->m02 = (int16_t) from->matrix[2]; - to->m10 = (int16_t) from->matrix[3]; - to->m11 = (int16_t) from->matrix[4]; - to->m12 = (int16_t) from->matrix[5]; - to->m20 = (int16_t) from->matrix[6]; - to->m21 = (int16_t) from->matrix[7]; - to->m22 = (int16_t) from->matrix[8]; - -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_encode_cc() leave:\n"); -#endif -} - -void -ia_css_csc_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size) -{ - ia_css_encode_cc(to, from, size); -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_cc_dump( - const struct sh_css_isp_csc_params *csc, - unsigned level, - const char *name) -{ - if (!csc) return; - ia_css_debug_dtrace(level, "%s\n", name); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m_shift", - csc->m_shift); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m00", - csc->m00); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m01", - csc->m01); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m02", - csc->m02); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m10", - csc->m10); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m11", - csc->m11); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m12", - csc->m12); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m20", - csc->m20); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m21", - csc->m21); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "m22", - csc->m22); -} - -void -ia_css_csc_dump( - const struct sh_css_isp_csc_params *csc, - unsigned level) -{ - ia_css_cc_dump(csc, level, "Color Space Conversion"); -} - -void -ia_css_cc_config_debug_dtrace( - const struct ia_css_cc_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.m[0]=%d, " - "config.m[1]=%d, config.m[2]=%d, " - "config.m[3]=%d, config.m[4]=%d, " - "config.m[5]=%d, config.m[6]=%d, " - "config.m[7]=%d, config.m[8]=%d\n", - config->matrix[0], - config->matrix[1], config->matrix[2], - config->matrix[3], config->matrix[4], - config->matrix[5], config->matrix[6], - config->matrix[7], config->matrix[8]); -} -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h deleted file mode 100644 index eb10d8a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h +++ /dev/null @@ -1,54 +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_CSC_HOST_H -#define __IA_CSS_CSC_HOST_H - -#include "ia_css_csc_types.h" -#include "ia_css_csc_param.h" - -extern const struct ia_css_cc_config default_cc_config; - -void -ia_css_encode_cc( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size); - -void -ia_css_csc_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_cc_dump( - const struct sh_css_isp_csc_params *csc, unsigned level, - const char *name); - -void -ia_css_csc_dump( - const struct sh_css_isp_csc_params *csc, - unsigned level); - -void -ia_css_cc_config_debug_dtrace( - const struct ia_css_cc_config *config, - unsigned level); - -#define ia_css_csc_debug_dtrace ia_css_cc_config_debug_dtrace -#endif - -#endif /* __IA_CSS_CSC_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h deleted file mode 100644 index 0b054a9..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h +++ /dev/null @@ -1,34 +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_CSC_PARAM_H -#define __IA_CSS_CSC_PARAM_H - -#include "type_support.h" -/* CSC (Color Space Conversion) */ -struct sh_css_isp_csc_params { - uint16_t m_shift; - int16_t m00; - int16_t m01; - int16_t m02; - int16_t m10; - int16_t m11; - int16_t m12; - int16_t m20; - int16_t m21; - int16_t m22; -}; - - -#endif /* __IA_CSS_CSC_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h deleted file mode 100644 index 1040438..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h +++ /dev/null @@ -1,78 +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_CSC_TYPES_H -#define __IA_CSS_CSC_TYPES_H - -/* @file -* CSS-API header file for Color Space Conversion parameters. -*/ - -/* Color Correction configuration. - * - * This structure is used for 3 cases. - * ("YCgCo" is the output format of Demosaic.) - * - * 1. Color Space Conversion (YCgCo to YUV) for ISP1. - * ISP block: CSC1 (Color Space Conversion) - * struct ia_css_cc_config *cc_config - * - * 2. Color Correction Matrix (YCgCo to RGB) for ISP2. - * ISP block: CCM2 (Color Correction Matrix) - * struct ia_css_cc_config *yuv2rgb_cc_config - * - * 3. Color Space Conversion (RGB to YUV) for ISP2. - * ISP block: CSC2 (Color Space Conversion) - * struct ia_css_cc_config *rgb2yuv_cc_config - * - * default/ineffective: - * 1. YCgCo -> YUV - * 1 0.174 0.185 - * 0 -0.66252 -0.66874 - * 0 -0.83738 0.58131 - * - * fraction_bits = 12 - * 4096 713 758 - * 0 -2714 -2739 - * 0 -3430 2381 - * - * 2. YCgCo -> RGB - * 1 -1 1 - * 1 1 0 - * 1 -1 -1 - * - * fraction_bits = 12 - * 4096 -4096 4096 - * 4096 4096 0 - * 4096 -4096 -4096 - * - * 3. RGB -> YUV - * 0.299 0.587 0.114 - * -0.16874 -0.33126 0.5 - * 0.5 -0.41869 -0.08131 - * - * fraction_bits = 13 - * 2449 4809 934 - * -1382 -2714 4096 - * 4096 -3430 -666 - */ -struct ia_css_cc_config { - uint32_t fraction_bits;/** Fractional bits of matrix. - u8.0, [0,13] */ - int32_t matrix[3 * 3]; /** Conversion matrix. - s[13-fraction_bits].[fraction_bits], - [-8192,8191] */ -}; - -#endif /* __IA_CSS_CSC_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c deleted file mode 100644 index e27648c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c +++ /dev/null @@ -1,120 +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" -#include "ia_css_debug.h" -#include "assert_support.h" - -#include "ctc/ctc_1.0/ia_css_ctc.host.h" -#include "ia_css_ctc1_5.host.h" - -static void ctc_gradient( - int *dydx, int *shift, - int y1, int y0, int x1, int x0) -{ - int frc_bits = max(IA_CSS_CTC_COEF_SHIFT, 16); - int dy = y1 - y0; - int dx = x1 - x0; - int dydx_int; - int dydx_frc; - int sft; - /* max_dydx = the maxinum gradient = the maximum y (gain) */ - int max_dydx = (1 << IA_CSS_CTC_COEF_SHIFT) - 1; - - if (dx == 0) { - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ctc_gradient() error, illegal division operation\n"); - return; - } else { - dydx_int = dy / dx; - dydx_frc = ((dy - dydx_int * dx) << frc_bits) / dx; - } - - assert(y0 >= 0 && y0 <= max_dydx); - assert(y1 >= 0 && y1 <= max_dydx); - assert(x0 < x1); - assert(dydx != NULL); - assert(shift != NULL); - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ctc_gradient() enter:\n"); - - /* search "sft" which meets this condition: - (1 << (IA_CSS_CTC_COEF_SHIFT - 1)) - <= (((float)dy / (float)dx) * (1 << sft)) - <= ((1 << IA_CSS_CTC_COEF_SHIFT) - 1) */ - for (sft = 0; sft <= IA_CSS_CTC_COEF_SHIFT; sft++) { - int tmp_dydx = (dydx_int << sft) - + (dydx_frc >> (frc_bits - sft)); - if (tmp_dydx <= max_dydx) { - *dydx = tmp_dydx; - *shift = sft; - } - if (tmp_dydx >= max_dydx) - break; - } - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ctc_gradient() leave:\n"); -} - -void -ia_css_ctc_encode( - struct sh_css_isp_ctc_params *to, - const struct ia_css_ctc_config *from, - unsigned size) -{ - (void)size; - to->y0 = from->y0; - to->y1 = from->y1; - to->y2 = from->y2; - to->y3 = from->y3; - to->y4 = from->y4; - to->y5 = from->y5; - - to->ce_gain_exp = from->ce_gain_exp; - - to->x1 = from->x1; - to->x2 = from->x2; - to->x3 = from->x3; - to->x4 = from->x4; - - ctc_gradient(&(to->dydx0), - &(to->dydx0_shift), - from->y1, from->y0, - from->x1, 0); - - ctc_gradient(&(to->dydx1), - &(to->dydx1_shift), - from->y2, from->y1, - from->x2, from->x1); - - ctc_gradient(&to->dydx2, - &to->dydx2_shift, - from->y3, from->y2, - from->x3, from->x2); - - ctc_gradient(&to->dydx3, - &to->dydx3_shift, - from->y4, from->y3, - from->x4, from->x3); - - ctc_gradient(&(to->dydx4), - &(to->dydx4_shift), - from->y5, from->y4, - SH_CSS_BAYER_MAXVAL, from->x4); -} - -void -ia_css_ctc_dump( - const struct sh_css_isp_ctc_params *ctc, - unsigned level); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h deleted file mode 100644 index d943aff..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h +++ /dev/null @@ -1,33 +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_CTC1_5_HOST_H -#define __IA_CSS_CTC1_5_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_ctc1_5_param.h" - -void -ia_css_ctc_encode( - struct sh_css_isp_ctc_params *to, - const struct ia_css_ctc_config *from, - unsigned size); - -void -ia_css_ctc_dump( - const struct sh_css_isp_ctc_params *ctc, - unsigned level); - -#endif /* __IA_CSS_CTC1_5_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h deleted file mode 100644 index 8d9ac2b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h +++ /dev/null @@ -1,46 +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_CTC1_5_PARAM_H -#define __IA_CSS_CTC1_5_PARAM_H - -#include "type_support.h" -#include "ctc/ctc_1.0/ia_css_ctc_param.h" /* vamem params */ - -/* CTC (Color Tone Control) */ -struct sh_css_isp_ctc_params { - int32_t y0; - int32_t y1; - int32_t y2; - int32_t y3; - int32_t y4; - int32_t y5; - int32_t ce_gain_exp; - int32_t x1; - int32_t x2; - int32_t x3; - int32_t x4; - int32_t dydx0; - int32_t dydx0_shift; - int32_t dydx1; - int32_t dydx1_shift; - int32_t dydx2; - int32_t dydx2_shift; - int32_t dydx3; - int32_t dydx3_shift; - int32_t dydx4; - int32_t dydx4_shift; -}; - -#endif /* __IA_CSS_CTC1_5_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h deleted file mode 100644 index dcd471f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h +++ /dev/null @@ -1,20 +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_CTCX_PARAM_H -#define __IA_CSS_CTCX_PARAM_H - -#include "ia_css_ctc1_5_param.h" - -#endif /* __IA_CSS_CTCX_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c deleted file mode 100644 index 07bd24e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c +++ /dev/null @@ -1,156 +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" -#include "assert_support.h" - -#include "ia_css_ctc2.host.h" - -#define INEFFECTIVE_VAL 4096 -#define BASIC_VAL 819 - -/*Default configuration of parameters for Ctc2*/ -const struct ia_css_ctc2_config default_ctc2_config = { - INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, - INEFFECTIVE_VAL, INEFFECTIVE_VAL, INEFFECTIVE_VAL, - BASIC_VAL * 2, BASIC_VAL * 4, BASIC_VAL * 6, - BASIC_VAL * 8, INEFFECTIVE_VAL, INEFFECTIVE_VAL, - BASIC_VAL >> 1, BASIC_VAL}; - -/* (dydx) = ctc2_slope(y1, y0, x1, x0) - * ----------------------------------------------- - * Calculation of the Slope of a Line = ((y1 - y0) >> 8)/(x1 - x0) - * - * Note: y1, y0 , x1 & x0 must lie within the range 0 <-> 8191 - */ -static int ctc2_slope(int y1, int y0, int x1, int x0) -{ - const int shift_val = 8; - const int max_slope = (1 << IA_CSS_CTC_COEF_SHIFT) - 1; - int dy = y1 - y0; - int dx = x1 - x0; - int rounding = (dx + 1) >> 1; - int dy_shift = dy << shift_val; - int slope, dydx; - - /*Protection for paramater values, & avoiding zero divisions*/ - assert(y0 >= 0 && y0 <= max_slope); - assert(y1 >= 0 && y1 <= max_slope); - assert(x0 >= 0 && x0 <= max_slope); - assert(x1 > 0 && x1 <= max_slope); - assert(dx > 0); - - if (dy < 0) - rounding = -rounding; - slope = (int) (dy_shift + rounding) / dx; - - /*the slope must lie within the range - (-max_slope-1) >= (dydx) >= (max_slope) - */ - if (slope <= -max_slope-1) { - dydx = -max_slope-1; - } else if (slope >= max_slope) { - dydx = max_slope; - } else { - dydx = slope; - } - - return dydx; -} - -/* (void) = ia_css_ctc2_vmem_encode(*to, *from) - * ----------------------------------------------- - * VMEM Encode Function to translate Y parameters from userspace into ISP space - */ -void ia_css_ctc2_vmem_encode(struct ia_css_isp_ctc2_vmem_params *to, - const struct ia_css_ctc2_config *from, - size_t size) -{ - unsigned i, j; - const unsigned shffl_blck = 4; - const unsigned lenght_zeros = 11; - short dydx0, dydx1, dydx2, dydx3, dydx4; - - (void)size; - /* - * Calculation of slopes of lines interconnecting - * 0.0 -> y_x1 -> y_x2 -> y _x3 -> y_x4 -> 1.0 - */ - dydx0 = ctc2_slope(from->y_y1, from->y_y0, - from->y_x1, 0); - dydx1 = ctc2_slope(from->y_y2, from->y_y1, - from->y_x2, from->y_x1); - dydx2 = ctc2_slope(from->y_y3, from->y_y2, - from->y_x3, from->y_x2); - dydx3 = ctc2_slope(from->y_y4, from->y_y3, - from->y_x4, from->y_x3); - dydx4 = ctc2_slope(from->y_y5, from->y_y4, - SH_CSS_BAYER_MAXVAL, from->y_x4); - - /*Fill 3 arrays with: - * - Luma input gain values y_y0, y_y1, y_y2, y_3, y_y4 - * - Luma kneepoints 0, y_x1, y_x2, y_x3, y_x4 - * - Calculated slopes dydx0, dyxd1, dydx2, dydx3, dydx4 - * - * - Each 64-element array is divided in blocks of 16 elements: - * the 5 parameters + zeros in the remaining 11 positions - * - All blocks of the same array will contain the same data - */ - for (i = 0; i < shffl_blck; i++) { - to->y_x[0][(i << shffl_blck)] = 0; - to->y_x[0][(i << shffl_blck) + 1] = from->y_x1; - to->y_x[0][(i << shffl_blck) + 2] = from->y_x2; - to->y_x[0][(i << shffl_blck) + 3] = from->y_x3; - to->y_x[0][(i << shffl_blck) + 4] = from->y_x4; - - to->y_y[0][(i << shffl_blck)] = from->y_y0; - to->y_y[0][(i << shffl_blck) + 1] = from->y_y1; - to->y_y[0][(i << shffl_blck) + 2] = from->y_y2; - to->y_y[0][(i << shffl_blck) + 3] = from->y_y3; - to->y_y[0][(i << shffl_blck) + 4] = from->y_y4; - - to->e_y_slope[0][(i << shffl_blck)] = dydx0; - to->e_y_slope[0][(i << shffl_blck) + 1] = dydx1; - to->e_y_slope[0][(i << shffl_blck) + 2] = dydx2; - to->e_y_slope[0][(i << shffl_blck) + 3] = dydx3; - to->e_y_slope[0][(i << shffl_blck) + 4] = dydx4; - - for (j = 0; j < lenght_zeros; j++) { - to->y_x[0][(i << shffl_blck) + 5 + j] = 0; - to->y_y[0][(i << shffl_blck) + 5 + j] = 0; - to->e_y_slope[0][(i << shffl_blck)+ 5 + j] = 0; - } - } -} - -/* (void) = ia_css_ctc2_encode(*to, *from) - * ----------------------------------------------- - * DMEM Encode Function to translate UV parameters from userspace into ISP space - */ -void ia_css_ctc2_encode(struct ia_css_isp_ctc2_dmem_params *to, - struct ia_css_ctc2_config *from, - size_t size) -{ - (void)size; - - to->uv_y0 = from->uv_y0; - to->uv_y1 = from->uv_y1; - to->uv_x0 = from->uv_x0; - to->uv_x1 = from->uv_x1; - - /*Slope Calculation*/ - to->uv_dydx = ctc2_slope(from->uv_y1, from->uv_y0, - from->uv_x1, from->uv_x0); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h deleted file mode 100644 index 3733aee..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h +++ /dev/null @@ -1,33 +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_CTC2_HOST_H -#define __IA_CSS_CTC2_HOST_H - -#include "ia_css_ctc2_param.h" -#include "ia_css_ctc2_types.h" - -extern const struct ia_css_ctc2_config default_ctc2_config; - -/*Encode Functions to translate parameters from userspace into ISP space*/ - -void ia_css_ctc2_vmem_encode(struct ia_css_isp_ctc2_vmem_params *to, - const struct ia_css_ctc2_config *from, - size_t size); - -void ia_css_ctc2_encode(struct ia_css_isp_ctc2_dmem_params *to, - struct ia_css_ctc2_config *from, - size_t size); - -#endif /* __IA_CSS_CTC2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h deleted file mode 100644 index ad7040c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h +++ /dev/null @@ -1,49 +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_CTC2_PARAM_H -#define __IA_CSS_CTC2_PARAM_H - -#define IA_CSS_CTC_COEF_SHIFT 13 -#include "vmem.h" /* needed for VMEM_ARRAY */ - -/* CTC (Chroma Tone Control)ISP Parameters */ - -/*VMEM Luma params*/ -struct ia_css_isp_ctc2_vmem_params { - /** Gains by Y(Luma) at Y = 0.0,Y_X1, Y_X2, Y_X3, Y_X4*/ - VMEM_ARRAY(y_x, ISP_VEC_NELEMS); - /* kneepoints by Y(Luma) 0.0, y_x1, y_x2, y _x3, y_x4*/ - VMEM_ARRAY(y_y, ISP_VEC_NELEMS); - /* Slopes of lines interconnecting - * 0.0 -> y_x1 -> y_x2 -> y _x3 -> y_x4 -> 1.0*/ - VMEM_ARRAY(e_y_slope, ISP_VEC_NELEMS); -}; - -/*DMEM Chroma params*/ -struct ia_css_isp_ctc2_dmem_params { - - /* Gains by UV(Chroma) under kneepoints uv_x0 and uv_x1*/ - int32_t uv_y0; - int32_t uv_y1; - - /* Kneepoints by UV(Chroma)- uv_x0 and uv_x1*/ - int32_t uv_x0; - int32_t uv_x1; - - /* Slope of line interconnecting uv_x0 -> uv_x1*/ - int32_t uv_dydx; - -}; -#endif /* __IA_CSS_CTC2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h deleted file mode 100644 index 1222cf3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h +++ /dev/null @@ -1,55 +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_CTC2_TYPES_H -#define __IA_CSS_CTC2_TYPES_H - -/* Chroma Tone Control configuration. -* -* ISP block: CTC2 (CTC by polygonal approximation) -* (ISP1: CTC1 (CTC by look-up table) is used.) -* ISP2: CTC2 is used. -* ISP261: CTC2 (CTC by Fast Approximate Distance) -*/ -struct ia_css_ctc2_config { - - /** Gains by Y(Luma) at Y =0.0,Y_X1, Y_X2, Y_X3, Y_X4 and Y_X5 - * --default/ineffective value: 4096(0.5f) - */ - int32_t y_y0; - int32_t y_y1; - int32_t y_y2; - int32_t y_y3; - int32_t y_y4; - int32_t y_y5; - /* 1st-4th kneepoints by Y(Luma) --default/ineffective value:n/a - * requirement: 0.0 < y_x1 < y_x2 <y _x3 < y_x4 < 1.0 - */ - int32_t y_x1; - int32_t y_x2; - int32_t y_x3; - int32_t y_x4; - /* Gains by UV(Chroma) under threholds uv_x0 and uv_x1 - * --default/ineffective value: 4096(0.5f) - */ - int32_t uv_y0; - int32_t uv_y1; - /* Minimum and Maximum Thresholds by UV(Chroma)- uv_x0 and uv_x1 - * --default/ineffective value: n/a - */ - int32_t uv_x0; - int32_t uv_x1; - }; - -#endif /* __IA_CSS_CTC2_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c deleted file mode 100644 index 7c1a367..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c +++ /dev/null @@ -1,63 +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" -#include "ia_css_debug.h" -#include "assert_support.h" - -#include "ia_css_ctc.host.h" - -const struct ia_css_ctc_config default_ctc_config = { - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - ((1 << IA_CSS_CTC_COEF_SHIFT) + 1) / 2, /* 0.5 */ - 1, - SH_CSS_BAYER_MAXVAL / 5, /* To be implemented */ - SH_CSS_BAYER_MAXVAL * 2 / 5, /* To be implemented */ - SH_CSS_BAYER_MAXVAL * 3 / 5, /* To be implemented */ - SH_CSS_BAYER_MAXVAL * 4 / 5, /* To be implemented */ -}; - -void -ia_css_ctc_vamem_encode( - struct sh_css_isp_ctc_vamem_params *to, - const struct ia_css_ctc_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->ctc, &from->data, sizeof(to->ctc)); -} - -void -ia_css_ctc_debug_dtrace( - const struct ia_css_ctc_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.ce_gain_exp=%d, config.y0=%d, " - "config.x1=%d, config.y1=%d, " - "config.x2=%d, config.y2=%d, " - "config.x3=%d, config.y3=%d, " - "config.x4=%d, config.y4=%d\n", - config->ce_gain_exp, config->y0, - config->x1, config->y1, - config->x2, config->y2, - config->x3, config->y3, - config->x4, config->y4); -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h deleted file mode 100644 index bec52a6..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h +++ /dev/null @@ -1,36 +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_CTC_HOST_H -#define __IA_CSS_CTC_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_ctc_param.h" -#include "ia_css_ctc_table.host.h" - -extern const struct ia_css_ctc_config default_ctc_config; - -void -ia_css_ctc_vamem_encode( - struct sh_css_isp_ctc_vamem_params *to, - const struct ia_css_ctc_table *from, - unsigned size); - -void -ia_css_ctc_debug_dtrace( - const struct ia_css_ctc_config *config, unsigned level) -; - -#endif /* __IA_CSS_CTC_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h deleted file mode 100644 index 6e88ad3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h +++ /dev/null @@ -1,44 +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_CTC_PARAM_H -#define __IA_CSS_CTC_PARAM_H - -#include "type_support.h" -#include <system_global.h> - -#include "ia_css_ctc_types.h" - -#ifndef PIPE_GENERATION -#if defined(HAS_VAMEM_VERSION_2) -#define SH_CSS_ISP_CTC_TABLE_SIZE_LOG2 IA_CSS_VAMEM_2_CTC_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_CTC_TABLE_SIZE IA_CSS_VAMEM_2_CTC_TABLE_SIZE -#elif defined(HAS_VAMEM_VERSION_1) -#define SH_CSS_ISP_CTC_TABLE_SIZE_LOG2 IA_CSS_VAMEM_1_CTC_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_CTC_TABLE_SIZE IA_CSS_VAMEM_1_CTC_TABLE_SIZE -#else -#error "VAMEM should be {VERSION1, VERSION2}" -#endif - -#else -/* For pipe generation, the size is not relevant */ -#define SH_CSS_ISP_CTC_TABLE_SIZE 0 -#endif - -/* This should be vamem_data_t, but that breaks the pipe generator */ -struct sh_css_isp_ctc_vamem_params { - uint16_t ctc[SH_CSS_ISP_CTC_TABLE_SIZE]; -}; - -#endif /* __IA_CSS_CTC_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c deleted file mode 100644 index edf85ab..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c +++ /dev/null @@ -1,215 +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 <type_support.h> -#include <string_support.h> /* memcpy */ -#include "system_global.h" -#include "vamem.h" -#include "ia_css_types.h" -#include "ia_css_ctc_table.host.h" - -struct ia_css_ctc_table default_ctc_table; - -#if defined(HAS_VAMEM_VERSION_2) - -static const uint16_t -default_ctc_table_data[IA_CSS_VAMEM_2_CTC_TABLE_SIZE] = { - 0, 384, 837, 957, 1011, 1062, 1083, 1080, -1078, 1077, 1053, 1039, 1012, 992, 969, 951, - 929, 906, 886, 866, 845, 823, 809, 790, - 772, 758, 741, 726, 711, 701, 688, 675, - 666, 656, 648, 639, 633, 626, 618, 612, - 603, 594, 582, 572, 557, 545, 529, 516, - 504, 491, 480, 467, 459, 447, 438, 429, - 419, 412, 404, 397, 389, 382, 376, 368, - 363, 357, 351, 345, 340, 336, 330, 326, - 321, 318, 312, 308, 304, 300, 297, 294, - 291, 286, 284, 281, 278, 275, 271, 268, - 261, 257, 251, 245, 240, 235, 232, 225, - 223, 218, 213, 209, 206, 204, 199, 197, - 193, 189, 186, 185, 183, 179, 177, 175, - 172, 170, 169, 167, 164, 164, 162, 160, - 158, 157, 156, 154, 154, 152, 151, 150, - 149, 148, 146, 147, 146, 144, 143, 143, - 142, 141, 140, 141, 139, 138, 138, 138, - 137, 136, 136, 135, 134, 134, 134, 133, - 132, 132, 131, 130, 131, 130, 129, 128, - 129, 127, 127, 127, 127, 125, 125, 125, - 123, 123, 122, 120, 118, 115, 114, 111, - 110, 108, 106, 105, 103, 102, 100, 99, - 97, 97, 96, 95, 94, 93, 93, 91, - 91, 91, 90, 90, 89, 89, 88, 88, - 89, 88, 88, 87, 87, 87, 87, 86, - 87, 87, 86, 87, 86, 86, 84, 84, - 82, 80, 78, 76, 74, 72, 70, 68, - 67, 65, 62, 60, 58, 56, 55, 54, - 53, 51, 49, 49, 47, 45, 45, 45, - 41, 40, 39, 39, 34, 33, 34, 32, - 25, 23, 24, 20, 13, 9, 12, 0, - 0 -}; - -#elif defined(HAS_VAMEM_VERSION_1) - -/* Default Parameters */ -static const uint16_t -default_ctc_table_data[IA_CSS_VAMEM_1_CTC_TABLE_SIZE] = { - 0, 0, 256, 384, 384, 497, 765, 806, - 837, 851, 888, 901, 957, 981, 993, 1001, - 1011, 1029, 1028, 1039, 1062, 1059, 1073, 1080, - 1083, 1085, 1085, 1098, 1080, 1084, 1085, 1093, - 1078, 1073, 1070, 1069, 1077, 1066, 1072, 1063, - 1053, 1044, 1046, 1053, 1039, 1028, 1025, 1024, - 1012, 1013, 1016, 996, 992, 990, 990, 980, - 969, 968, 961, 955, 951, 949, 933, 930, - 929, 925, 921, 916, 906, 901, 895, 893, - 886, 877, 872, 869, 866, 861, 857, 849, - 845, 838, 836, 832, 823, 821, 815, 813, - 809, 805, 796, 793, 790, 785, 784, 778, - 772, 768, 766, 763, 758, 752, 749, 745, - 741, 740, 736, 730, 726, 724, 723, 718, - 711, 709, 706, 704, 701, 698, 691, 689, - 688, 683, 683, 678, 675, 673, 671, 669, - 666, 663, 661, 660, 656, 656, 653, 650, - 648, 647, 646, 643, 639, 638, 637, 635, - 633, 632, 629, 627, 626, 625, 622, 621, - 618, 618, 614, 614, 612, 609, 606, 606, - 603, 600, 600, 597, 594, 591, 590, 586, - 582, 581, 578, 575, 572, 569, 563, 560, - 557, 554, 551, 548, 545, 539, 536, 533, - 529, 527, 524, 519, 516, 513, 510, 507, - 504, 501, 498, 493, 491, 488, 485, 484, - 480, 476, 474, 471, 467, 466, 464, 460, - 459, 455, 453, 449, 447, 446, 443, 441, - 438, 435, 432, 432, 429, 427, 426, 422, - 419, 418, 416, 414, 412, 410, 408, 406, - 404, 402, 401, 398, 397, 395, 393, 390, - 389, 388, 387, 384, 382, 380, 378, 377, - 376, 375, 372, 370, 368, 368, 366, 364, - 363, 361, 360, 358, 357, 355, 354, 352, - 351, 350, 349, 346, 345, 344, 344, 342, - 340, 339, 337, 337, 336, 335, 333, 331, - 330, 329, 328, 326, 326, 324, 324, 322, - 321, 320, 318, 318, 318, 317, 315, 313, - 312, 311, 311, 310, 308, 307, 306, 306, - 304, 304, 302, 301, 300, 300, 299, 297, - 297, 296, 296, 294, 294, 292, 291, 291, - 291, 290, 288, 287, 286, 286, 287, 285, - 284, 283, 282, 282, 281, 281, 279, 278, - 278, 278, 276, 276, 275, 274, 274, 273, - 271, 270, 269, 268, 268, 267, 265, 262, - 261, 260, 260, 259, 257, 254, 252, 252, - 251, 251, 249, 246, 245, 244, 243, 242, - 240, 239, 239, 237, 235, 235, 233, 231, - 232, 230, 229, 226, 225, 224, 225, 224, - 223, 220, 219, 219, 218, 217, 217, 214, - 213, 213, 212, 211, 209, 209, 209, 208, - 206, 205, 204, 203, 204, 203, 201, 200, - 199, 197, 198, 198, 197, 195, 194, 194, - 193, 192, 192, 191, 189, 190, 189, 188, - 186, 187, 186, 185, 185, 184, 183, 181, - 183, 182, 181, 180, 179, 178, 178, 178, - 177, 176, 175, 176, 175, 174, 174, 173, - 172, 173, 172, 171, 170, 170, 169, 169, - 169, 168, 167, 166, 167, 167, 166, 165, - 164, 164, 164, 163, 164, 163, 162, 163, - 162, 161, 160, 161, 160, 160, 160, 159, - 158, 157, 158, 158, 157, 157, 156, 156, - 156, 156, 155, 155, 154, 154, 154, 154, - 154, 153, 152, 153, 152, 152, 151, 152, - 151, 152, 151, 150, 150, 149, 149, 150, - 149, 149, 148, 148, 148, 149, 148, 147, - 146, 146, 147, 146, 147, 146, 145, 146, - 146, 145, 144, 145, 144, 145, 144, 144, - 143, 143, 143, 144, 143, 142, 142, 142, - 142, 142, 142, 141, 141, 141, 141, 140, - 140, 141, 140, 140, 141, 140, 139, 139, - 139, 140, 139, 139, 138, 138, 137, 139, - 138, 138, 138, 137, 138, 137, 137, 137, - 137, 136, 137, 136, 136, 136, 136, 135, - 136, 135, 135, 135, 135, 136, 135, 135, - 134, 134, 133, 135, 134, 134, 134, 133, - 134, 133, 134, 133, 133, 132, 133, 133, - 132, 133, 132, 132, 132, 132, 131, 131, - 131, 132, 131, 131, 130, 131, 130, 132, - 131, 130, 130, 129, 130, 129, 130, 129, - 129, 129, 130, 129, 128, 128, 128, 128, - 129, 128, 128, 127, 127, 128, 128, 127, - 127, 126, 126, 127, 127, 126, 126, 126, - 127, 126, 126, 126, 125, 125, 126, 125, - 125, 124, 124, 124, 125, 125, 124, 124, - 123, 124, 124, 123, 123, 122, 122, 122, - 122, 122, 121, 120, 120, 119, 118, 118, - 118, 117, 117, 116, 115, 115, 115, 114, - 114, 113, 113, 112, 111, 111, 111, 110, - 110, 109, 109, 108, 108, 108, 107, 107, - 106, 106, 105, 105, 105, 104, 104, 103, - 103, 102, 102, 102, 102, 101, 101, 100, - 100, 99, 99, 99, 99, 99, 99, 98, - 97, 98, 97, 97, 97, 96, 96, 95, - 96, 95, 96, 95, 95, 94, 94, 95, - 94, 94, 94, 93, 93, 92, 93, 93, - 93, 93, 92, 92, 91, 92, 92, 92, - 91, 91, 90, 90, 91, 91, 91, 90, - 90, 90, 90, 91, 90, 90, 90, 89, - 89, 89, 90, 89, 89, 89, 89, 89, - 88, 89, 89, 88, 88, 88, 88, 87, - 89, 88, 88, 88, 88, 88, 87, 88, - 88, 88, 87, 87, 87, 87, 87, 88, - 87, 87, 87, 87, 87, 87, 88, 87, - 87, 87, 87, 86, 86, 87, 87, 87, - 87, 86, 86, 86, 87, 87, 86, 87, - 86, 86, 86, 87, 87, 86, 86, 86, - 86, 86, 87, 87, 86, 85, 85, 85, - 84, 85, 85, 84, 84, 83, 83, 82, - 82, 82, 81, 81, 80, 79, 79, 79, - 78, 77, 77, 76, 76, 76, 75, 74, - 74, 74, 73, 73, 72, 71, 71, 71, - 70, 70, 69, 69, 68, 68, 67, 67, - 67, 66, 66, 65, 65, 64, 64, 63, - 62, 62, 62, 61, 60, 60, 59, 59, - 58, 58, 57, 57, 56, 56, 56, 55, - 55, 54, 55, 55, 54, 53, 53, 52, - 53, 53, 52, 51, 51, 50, 51, 50, - 49, 49, 50, 49, 49, 48, 48, 47, - 47, 48, 46, 45, 45, 45, 46, 45, - 45, 44, 45, 45, 45, 43, 42, 42, - 41, 43, 41, 40, 40, 39, 40, 41, - 39, 39, 39, 39, 39, 38, 35, 35, - 34, 37, 36, 34, 33, 33, 33, 35, - 34, 32, 32, 31, 32, 30, 29, 26, - 25, 25, 27, 26, 23, 23, 23, 25, - 24, 24, 22, 21, 20, 19, 16, 14, - 13, 13, 13, 10, 9, 7, 7, 7, - 12, 12, 12, 7, 0, 0, 0, 0 -}; - -#else -#error "VAMEM version must be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}" -#endif - -void -ia_css_config_ctc_table(void) -{ -#if defined(HAS_VAMEM_VERSION_2) - memcpy(default_ctc_table.data.vamem_2, default_ctc_table_data, - sizeof(default_ctc_table_data)); - default_ctc_table.vamem_type = IA_CSS_VAMEM_TYPE_2; -#else - memcpy(default_ctc_table.data.vamem_1, default_ctc_table_data, - sizeof(default_ctc_table_data)); - default_ctc_table.vamem_type = 1IA_CSS_VAMEM_TYPE_1; -#endif -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h deleted file mode 100644 index a350dec..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h +++ /dev/null @@ -1,24 +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_CTC_TABLE_HOST_H -#define __IA_CSS_CTC_TABLE_HOST_H - -#include "ia_css_ctc_types.h" - -extern struct ia_css_ctc_table default_ctc_table; - -void ia_css_config_ctc_table(void); - -#endif /* __IA_CSS_CTC_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h deleted file mode 100644 index 4ac47ce..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h +++ /dev/null @@ -1,110 +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_CTC_TYPES_H -#define __IA_CSS_CTC_TYPES_H - -/* @file -* CSS-API header file for Chroma Tone Control parameters. -*/ - -/* Fractional bits for CTC gain (used only for ISP1). - * - * IA_CSS_CTC_COEF_SHIFT(=13) includes not only the fractional bits - * of gain(=8), but also the bits(=5) to convert chroma - * from 13bit precision to 8bit precision. - * - * Gain (struct ia_css_ctc_table) : u5.8 - * Input(Chorma) : s0.12 (13bit precision) - * Output(Chorma): s0.7 (8bit precision) - * Output = (Input * Gain) >> IA_CSS_CTC_COEF_SHIFT - */ -#define IA_CSS_CTC_COEF_SHIFT 13 - -/* Number of elements in the CTC table. */ -#define IA_CSS_VAMEM_1_CTC_TABLE_SIZE_LOG2 10 -/* Number of elements in the CTC table. */ -#define IA_CSS_VAMEM_1_CTC_TABLE_SIZE (1U<<IA_CSS_VAMEM_1_CTC_TABLE_SIZE_LOG2) - -/* Number of elements in the CTC table. */ -#define IA_CSS_VAMEM_2_CTC_TABLE_SIZE_LOG2 8 -/* Number of elements in the CTC table. */ -#define IA_CSS_VAMEM_2_CTC_TABLE_SIZE ((1U<<IA_CSS_VAMEM_2_CTC_TABLE_SIZE_LOG2) + 1) - -enum ia_css_vamem_type { - IA_CSS_VAMEM_TYPE_1, - IA_CSS_VAMEM_TYPE_2 -}; - -/* Chroma Tone Control configuration. - * - * ISP block: CTC2 (CTC by polygonal line approximation) - * (ISP1: CTC1 (CTC by look-up table) is used.) - * ISP2: CTC2 is used. - */ -struct ia_css_ctc_config { - uint16_t y0; /** 1st kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t y1; /** 2nd kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t y2; /** 3rd kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t y3; /** 4th kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t y4; /** 5th kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t y5; /** 6th kneepoint gain. - u[ce_gain_exp].[13-ce_gain_exp], [0,8191], - default/ineffective 4096(0.5) */ - uint16_t ce_gain_exp; /** Common exponent of y-axis gain. - u8.0, [0,13], - default/ineffective 1 */ - uint16_t x1; /** 2nd kneepoint luma. - u0.13, [0,8191], constraints: 0<x1<x2, - default/ineffective 1024 */ - uint16_t x2; /** 3rd kneepoint luma. - u0.13, [0,8191], constraints: x1<x2<x3, - default/ineffective 2048 */ - uint16_t x3; /** 4th kneepoint luma. - u0.13, [0,8191], constraints: x2<x3<x4, - default/ineffective 6144 */ - uint16_t x4; /** 5tn kneepoint luma. - u0.13, [0,8191], constraints: x3<x4<8191, - default/ineffective 7168 */ -}; - -union ia_css_ctc_data { - uint16_t vamem_1[IA_CSS_VAMEM_1_CTC_TABLE_SIZE]; - uint16_t vamem_2[IA_CSS_VAMEM_2_CTC_TABLE_SIZE]; -}; - -/* CTC table, used for Chroma Tone Control. - * - * ISP block: CTC1 (CTC by look-up table) - * ISP1: CTC1 is used. - * (ISP2: CTC2 (CTC by polygonal line approximation) is used.) - */ -struct ia_css_ctc_table { - enum ia_css_vamem_type vamem_type; - union ia_css_ctc_data data; -}; - -#endif /* __IA_CSS_CTC_TYPES_H */ - - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c deleted file mode 100644 index fbab2f1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c +++ /dev/null @@ -1,79 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" -#include "ia_css_de.host.h" - -const struct ia_css_de_config default_de_config = { - 0, - 0, - 0 -}; - -void -ia_css_de_encode( - struct sh_css_isp_de_params *to, - const struct ia_css_de_config *from, - unsigned size) -{ - (void)size; - to->pixelnoise = - uDIGIT_FITTING(from->pixelnoise, 16, SH_CSS_BAYER_BITS); - to->c1_coring_threshold = - uDIGIT_FITTING(from->c1_coring_threshold, 16, - SH_CSS_BAYER_BITS); - to->c2_coring_threshold = - uDIGIT_FITTING(from->c2_coring_threshold, 16, - SH_CSS_BAYER_BITS); -} - -void -ia_css_de_dump( - const struct sh_css_isp_de_params *de, - unsigned level) -{ - if (!de) return; - ia_css_debug_dtrace(level, "Demosaic:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "de_pixelnoise", de->pixelnoise); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "de_c1_coring_threshold", - de->c1_coring_threshold); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "de_c2_coring_threshold", - de->c2_coring_threshold); -} - -void -ia_css_de_debug_dtrace( - const struct ia_css_de_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.pixelnoise=%d, " - "config.c1_coring_threshold=%d, config.c2_coring_threshold=%d\n", - config->pixelnoise, - config->c1_coring_threshold, config->c2_coring_threshold); -} - -void -ia_css_init_de_state( - void/*struct sh_css_isp_de_vmem_state*/ *state, - size_t size) -{ - memset(state, 0, size); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h deleted file mode 100644 index 5dd6f06..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h +++ /dev/null @@ -1,44 +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_DE_HOST_H -#define __IA_CSS_DE_HOST_H - -#include "ia_css_de_types.h" -#include "ia_css_de_param.h" - -extern const struct ia_css_de_config default_de_config; - -void -ia_css_de_encode( - struct sh_css_isp_de_params *to, - const struct ia_css_de_config *from, - unsigned size); - -void -ia_css_de_dump( - const struct sh_css_isp_de_params *de, - unsigned level); - -void -ia_css_de_debug_dtrace( - const struct ia_css_de_config *config, - unsigned level); - -void -ia_css_init_de_state( - void/*struct sh_css_isp_de_vmem_state*/ *state, - size_t size); - -#endif /* __IA_CSS_DE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h deleted file mode 100644 index 833c80a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h +++ /dev/null @@ -1,27 +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_DE_PARAM_H -#define __IA_CSS_DE_PARAM_H - -#include "type_support.h" - -/* DE (Demosaic) */ -struct sh_css_isp_de_params { - int32_t pixelnoise; - int32_t c1_coring_threshold; - int32_t c2_coring_threshold; -}; - -#endif /* __IA_CSS_DE_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h deleted file mode 100644 index d645117..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h +++ /dev/null @@ -1,26 +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_DE_STATE_H -#define __IA_CSS_DE_STATE_H - -#include "type_support.h" -#include "vmem.h" - -/* DE (Demosaic) */ -struct sh_css_isp_de_vmem_state { - VMEM_ARRAY(de_buf[4], MAX_VECTORS_PER_BUF_LINE*ISP_NWAY); -}; - -#endif /* __IA_CSS_DE_STATE_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h deleted file mode 100644 index 803be68..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h +++ /dev/null @@ -1,43 +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_DE_TYPES_H -#define __IA_CSS_DE_TYPES_H - -/* @file -* CSS-API header file for Demosaic (bayer-to-YCgCo) parameters. -*/ - -/* Demosaic (bayer-to-YCgCo) configuration. - * - * ISP block: DE1 - * ISP1: DE1 is used. - * (ISP2: DE2 is used.) - */ -struct ia_css_de_config { - ia_css_u0_16 pixelnoise; /** Pixel noise used in moire elimination. - u0.16, [0,65535], - default 0, ineffective 0 */ - ia_css_u0_16 c1_coring_threshold; /** Coring threshold for C1. - This is the same as nr_config.threshold_cb. - u0.16, [0,65535], - default 128(0.001953125), ineffective 0 */ - ia_css_u0_16 c2_coring_threshold; /** Coring threshold for C2. - This is the same as nr_config.threshold_cr. - u0.16, [0,65535], - default 128(0.001953125), ineffective 0 */ -}; - -#endif /* __IA_CSS_DE_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c deleted file mode 100644 index a5247a5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c +++ /dev/null @@ -1,54 +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" -#include "ia_css_debug.h" - -#include "ia_css_de2.host.h" - -const struct ia_css_ecd_config default_ecd_config = { - (1 << (ISP_VEC_ELEMBITS - 1)) * 2 / 3, /* 2/3 */ - (1 << (ISP_VEC_ELEMBITS - 1)) - 1, /* 1.0 */ - 0, /* 0.0 */ -}; - -void -ia_css_ecd_encode( - struct sh_css_isp_ecd_params *to, - const struct ia_css_ecd_config *from, - unsigned size) -{ - (void)size; - to->zip_strength = from->zip_strength; - to->fc_strength = from->fc_strength; - to->fc_debias = from->fc_debias; -} - -void -ia_css_ecd_dump( - const struct sh_css_isp_ecd_params *ecd, - unsigned level); - -void -ia_css_ecd_debug_dtrace( - const struct ia_css_ecd_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.zip_strength=%d, " - "config.fc_strength=%d, config.fc_debias=%d\n", - config->zip_strength, - config->fc_strength, config->fc_debias); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h deleted file mode 100644 index f7cd844..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h +++ /dev/null @@ -1,38 +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_DE2_HOST_H -#define __IA_CSS_DE2_HOST_H - -#include "ia_css_de2_types.h" -#include "ia_css_de2_param.h" - -extern const struct ia_css_ecd_config default_ecd_config; - -void -ia_css_ecd_encode( - struct sh_css_isp_ecd_params *to, - const struct ia_css_ecd_config *from, - unsigned size); - -void -ia_css_ecd_dump( - const struct sh_css_isp_ecd_params *ecd, - unsigned level); - -void -ia_css_ecd_debug_dtrace( - const struct ia_css_ecd_config *config, unsigned level); - -#endif /* __IA_CSS_DE2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h deleted file mode 100644 index ea2da73..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h +++ /dev/null @@ -1,30 +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_DE2_PARAM_H -#define __IA_CSS_DE2_PARAM_H - -#include "type_support.h" - -/* Reuse DE1 params and extend them */ -#include "../de_1.0/ia_css_de_param.h" - -/* DE (Demosaic) */ -struct sh_css_isp_ecd_params { - int32_t zip_strength; - int32_t fc_strength; - int32_t fc_debias; -}; - -#endif /* __IA_CSS_DE2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h deleted file mode 100644 index 50bdde4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h +++ /dev/null @@ -1,42 +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_DE2_TYPES_H -#define __IA_CSS_DE2_TYPES_H - -/* @file -* CSS-API header file for Demosaicing parameters. -*/ - -/* Eigen Color Demosaicing configuration. - * - * ISP block: DE2 - * (ISP1: DE1 is used.) - * ISP2: DE2 is used. - */ -struct ia_css_ecd_config { - uint16_t zip_strength; /** Strength of zipper reduction. - u0.13, [0,8191], - default 5489(0.67), ineffective 0 */ - uint16_t fc_strength; /** Strength of false color reduction. - u0.13, [0,8191], - default 8191(almost 1.0), ineffective 0 */ - uint16_t fc_debias; /** Prevent color change - on noise or Gr/Gb imbalance. - u0.13, [0,8191], - default 0, ineffective 0 */ -}; - -#endif /* __IA_CSS_DE2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h deleted file mode 100644 index 59af952..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h +++ /dev/null @@ -1,20 +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_DEX_PARAM_H -#define __IA_CSS_DEX_PARAM_H - -#include "ia_css_de2_param.h" - -#endif /* __IA_CSS_DEX_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h deleted file mode 100644 index f2c65ba..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h +++ /dev/null @@ -1,21 +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_DE2_STATE_H -#define __IA_CSS_DE2_STATE_H - -/* Reuse DE1 states */ -#include "../de_1.0/ia_css_de_state.h" - -#endif /* __IA_CSS_DE2_STATE_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c deleted file mode 100644 index b1f9dc8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c +++ /dev/null @@ -1,132 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" - -#include "ia_css_dp.host.h" - -#ifdef ISP2401 -/* We use a different set of DPC configuration parameters when - * DPC is used before OBC and NORM. Currently these parameters - * are used in usecases which selects both BDS and DPC. - **/ -const struct ia_css_dp_config default_dp_10bpp_config = { - 1024, - 2048, - 32768, - 32768, - 32768, - 32768 -}; -#endif -const struct ia_css_dp_config default_dp_config = { - 8192, - 2048, - 32768, - 32768, - 32768, - 32768 -}; - -void -ia_css_dp_encode( - struct sh_css_isp_dp_params *to, - const struct ia_css_dp_config *from, - unsigned size) -{ - int gain = from->gain; - int gr = from->gr; - int r = from->r; - int b = from->b; - int gb = from->gb; - - (void)size; - to->threshold_single = - SH_CSS_BAYER_MAXVAL; - to->threshold_2adjacent = - uDIGIT_FITTING(from->threshold, 16, SH_CSS_BAYER_BITS); - to->gain = - uDIGIT_FITTING(from->gain, 8, SH_CSS_DP_GAIN_SHIFT); - - to->coef_rr_gr = - uDIGIT_FITTING (gain * gr / r, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_rr_gb = - uDIGIT_FITTING (gain * gb / r, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_bb_gb = - uDIGIT_FITTING (gain * gb / b, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_bb_gr = - uDIGIT_FITTING (gain * gr / b, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_gr_rr = - uDIGIT_FITTING (gain * r / gr, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_gr_bb = - uDIGIT_FITTING (gain * b / gr, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_gb_bb = - uDIGIT_FITTING (gain * b / gb, 8, SH_CSS_DP_GAIN_SHIFT); - to->coef_gb_rr = - uDIGIT_FITTING (gain * r / gb, 8, SH_CSS_DP_GAIN_SHIFT); -} - -void -ia_css_dp_dump( - const struct sh_css_isp_dp_params *dp, - unsigned level) -{ - if (!dp) return; - ia_css_debug_dtrace(level, "Defect Pixel Correction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dp_threshold_single_w_2adj_on", - dp->threshold_single); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dp_threshold_2adj_w_2adj_on", - dp->threshold_2adjacent); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dp_gain", dp->gain); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_rr_gr", dp->coef_rr_gr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_rr_gb", dp->coef_rr_gb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_bb_gb", dp->coef_bb_gb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_bb_gr", dp->coef_bb_gr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_gr_rr", dp->coef_gr_rr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_gr_bb", dp->coef_gr_bb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_gb_bb", dp->coef_gb_bb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "dpc_coef_gb_rr", dp->coef_gb_rr); -} - -void -ia_css_dp_debug_dtrace( - const struct ia_css_dp_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.threshold=%d, config.gain=%d\n", - config->threshold, config->gain); -} - -void -ia_css_init_dp_state( - void/*struct sh_css_isp_dp_vmem_state*/ *state, - size_t size) -{ - memset(state, 0, size); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h deleted file mode 100644 index db21814..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h +++ /dev/null @@ -1,47 +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_DP_HOST_H -#define __IA_CSS_DP_HOST_H - -#include "ia_css_dp_types.h" -#include "ia_css_dp_param.h" - -extern const struct ia_css_dp_config default_dp_config; -#ifdef ISP2401 -extern const struct ia_css_dp_config default_dp_10bpp_config; -#endif - -void -ia_css_dp_encode( - struct sh_css_isp_dp_params *to, - const struct ia_css_dp_config *from, - unsigned size); - -void -ia_css_dp_dump( - const struct sh_css_isp_dp_params *dp, - unsigned level); - -void -ia_css_dp_debug_dtrace( - const struct ia_css_dp_config *config, - unsigned level); - -void -ia_css_init_dp_state( - void/*struct sh_css_isp_dp_vmem_state*/ *state, - size_t size); - -#endif /* __IA_CSS_DP_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h deleted file mode 100644 index fc9035a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h +++ /dev/null @@ -1,36 +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_DP_PARAM_H -#define __IA_CSS_DP_PARAM_H - -#include "type_support.h" -#include "bnr/bnr_1.0/ia_css_bnr_param.h" - -/* DP (Defect Pixel Correction) */ -struct sh_css_isp_dp_params { - int32_t threshold_single; - int32_t threshold_2adjacent; - int32_t gain; - int32_t coef_rr_gr; - int32_t coef_rr_gb; - int32_t coef_bb_gb; - int32_t coef_bb_gr; - int32_t coef_gr_rr; - int32_t coef_gr_bb; - int32_t coef_gb_bb; - int32_t coef_gb_rr; -}; - -#endif /* __IA_CSS_DP_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h deleted file mode 100644 index 1bf6dce..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h +++ /dev/null @@ -1,50 +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_DP_TYPES_H -#define __IA_CSS_DP_TYPES_H - -/* @file -* CSS-API header file for Defect Pixel Correction (DPC) parameters. -*/ - - -/* Defect Pixel Correction configuration. - * - * ISP block: DPC1 (DPC after WB) - * DPC2 (DPC before WB) - * ISP1: DPC1 is used. - * ISP2: DPC2 is used. - */ -struct ia_css_dp_config { - ia_css_u0_16 threshold; /** The threshold of defect pixel correction, - representing the permissible difference of - intensity between one pixel and its - surrounding pixels. Smaller values result - in more frequent pixel corrections. - u0.16, [0,65535], - default 8192, ineffective 65535 */ - ia_css_u8_8 gain; /** The sensitivity of mis-correction. ISP will - miss a lot of defects if the value is set - too large. - u8.8, [0,65535], - default 4096, ineffective 65535 */ - uint32_t gr; /* unsigned <integer_bits>.<16-integer_bits> */ - uint32_t r; /* unsigned <integer_bits>.<16-integer_bits> */ - uint32_t b; /* unsigned <integer_bits>.<16-integer_bits> */ - uint32_t gb; /* unsigned <integer_bits>.<16-integer_bits> */ -}; - -#endif /* __IA_CSS_DP_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c deleted file mode 100644 index bc14b85..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c +++ /dev/null @@ -1,65 +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_dpc2.host.h" -#include "assert_support.h" - -void -ia_css_dpc2_encode( - struct ia_css_isp_dpc2_params *to, - const struct ia_css_dpc2_config *from, - size_t size) -{ - (void)size; - - assert ((from->metric1 >= 0) && (from->metric1 <= METRIC1_ONE_FP)); - assert ((from->metric3 >= 0) && (from->metric3 <= METRIC3_ONE_FP)); - assert ((from->metric2 >= METRIC2_ONE_FP) && - (from->metric2 < 256*METRIC2_ONE_FP)); - assert ((from->wb_gain_gr > 0) && (from->wb_gain_gr < 16*WBGAIN_ONE_FP)); - assert ((from->wb_gain_r > 0) && (from->wb_gain_r < 16*WBGAIN_ONE_FP)); - assert ((from->wb_gain_b > 0) && (from->wb_gain_b < 16*WBGAIN_ONE_FP)); - assert ((from->wb_gain_gb > 0) && (from->wb_gain_gb < 16*WBGAIN_ONE_FP)); - - to->metric1 = from->metric1; - to->metric2 = from->metric2; - to->metric3 = from->metric3; - - to->wb_gain_gr = from->wb_gain_gr; - to->wb_gain_r = from->wb_gain_r; - to->wb_gain_b = from->wb_gain_b; - to->wb_gain_gb = from->wb_gain_gb; -} - -/* TODO: AM: This needs a proper implementation. */ -void -ia_css_init_dpc2_state( - void *state, - size_t size) -{ - (void)state; - (void)size; -} - -#ifndef IA_CSS_NO_DEBUG -/* TODO: AM: This needs a proper implementation. */ -void -ia_css_dpc2_debug_dtrace( - const struct ia_css_dpc2_config *config, - unsigned level) -{ - (void)config; - (void)level; -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h deleted file mode 100644 index 38d10a5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h +++ /dev/null @@ -1,39 +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_DPC2_HOST_H -#define __IA_CSS_DPC2_HOST_H - -#include "ia_css_dpc2_types.h" -#include "ia_css_dpc2_param.h" - -void -ia_css_dpc2_encode( - struct ia_css_isp_dpc2_params *to, - const struct ia_css_dpc2_config *from, - size_t size); - -void -ia_css_init_dpc2_state( - void *state, - size_t size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_dpc2_debug_dtrace( - const struct ia_css_dpc2_config *config, - unsigned level); -#endif - -#endif /* __IA_CSS_DPC2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h deleted file mode 100644 index ef668d5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h +++ /dev/null @@ -1,53 +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_DPC2_PARAM_H -#define __IA_CSS_DPC2_PARAM_H - -#include "type_support.h" -#include "vmem.h" /* for VMEM_ARRAY*/ - - -/* 4 planes : GR, R, B, GB */ -#define NUM_PLANES 4 - -/* ToDo: Move this to testsetup */ -#define MAX_FRAME_SIMDWIDTH 30 - -/* 3 lines state per color plane input_line_state */ -#define DPC2_STATE_INPUT_BUFFER_HEIGHT (3 * NUM_PLANES) -/* Each plane has width equal to half frame line */ -#define DPC2_STATE_INPUT_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line state per color plane for local deviation state*/ -#define DPC2_STATE_LOCAL_DEVIATION_BUFFER_HEIGHT (1 * NUM_PLANES) -/* Each plane has width equal to half frame line */ -#define DPC2_STATE_LOCAL_DEVIATION_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* MINMAX state buffer stores 1 full input line (GR-R color line) */ -#define DPC2_STATE_SECOND_MINMAX_BUFFER_HEIGHT 1 -#define DPC2_STATE_SECOND_MINMAX_BUFFER_WIDTH MAX_FRAME_SIMDWIDTH - - -struct ia_css_isp_dpc2_params { - int32_t metric1; - int32_t metric2; - int32_t metric3; - int32_t wb_gain_gr; - int32_t wb_gain_r; - int32_t wb_gain_b; - int32_t wb_gain_gb; -}; - -#endif /* __IA_CSS_DPC2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h deleted file mode 100644 index 6727682..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h +++ /dev/null @@ -1,59 +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_DPC2_TYPES_H -#define __IA_CSS_DPC2_TYPES_H - -/* @file -* CSS-API header file for Defect Pixel Correction 2 (DPC2) parameters. -*/ - -#include "type_support.h" - -/**@{*/ -/* Floating point constants for different metrics. */ -#define METRIC1_ONE_FP (1<<12) -#define METRIC2_ONE_FP (1<<5) -#define METRIC3_ONE_FP (1<<12) -#define WBGAIN_ONE_FP (1<<9) -/**@}*/ - -/**@{*/ -/* Defect Pixel Correction 2 configuration. - * - * \brief DPC2 public parameters. - * \details Struct with all parameters for the Defect Pixel Correction 2 - * kernel that can be set from the CSS API. - * - * ISP block: DPC1 (DPC after WB) - * DPC2 (DPC before WB) - * ISP1: DPC1 is used. - * ISP2: DPC2 is used. - * - */ -struct ia_css_dpc2_config { - /**@{*/ - int32_t metric1; - int32_t metric2; - int32_t metric3; - int32_t wb_gain_gr; - int32_t wb_gain_r; - int32_t wb_gain_b; - int32_t wb_gain_gb; - /**@}*/ -}; -/**@}*/ - -#endif /* __IA_CSS_DPC2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c deleted file mode 100644 index 955adc4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +++ /dev/null @@ -1,306 +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_frame_public.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" - -#include "ia_css_types.h" -#include "ia_css_host_data.h" -#include "sh_css_param_dvs.h" -#include "sh_css_params.h" -#include "ia_css_binary.h" -#include "ia_css_debug.h" -#include "memory_access.h" -#include "assert_support.h" - -#include "ia_css_dvs.host.h" - -static const struct ia_css_dvs_configuration default_config = { - .info = (struct ia_css_frame_info *)NULL, -}; - -void -ia_css_dvs_config( - struct sh_css_isp_dvs_isp_config *to, - const struct ia_css_dvs_configuration *from, - unsigned size) -{ - (void)size; - to->num_horizontal_blocks = - DVS_NUM_BLOCKS_X(from->info->res.width); - to->num_vertical_blocks = - DVS_NUM_BLOCKS_Y(from->info->res.height); -} - -void -ia_css_dvs_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - struct ia_css_dvs_configuration config = default_config; - - config.info = info; - - ia_css_configure_dvs(binary, &config); -} - -static void -convert_coords_to_ispparams( - struct ia_css_host_data *gdc_warp_table, - const struct ia_css_dvs_6axis_config *config, - unsigned int i_stride, - unsigned int o_width, - unsigned int o_height, - unsigned int uv_flag) -{ - unsigned int i, j; -#ifndef ISP2401 - /* Coverity CID 298073 - initialize */ -#endif - gdc_warp_param_mem_t s = { 0 }; - unsigned int x00, x01, x10, x11, - y00, y01, y10, y11; - - unsigned int xmin, ymin, xmax, ymax; - unsigned int topleft_x, topleft_y, bottom_x, bottom_y, - topleft_x_frac, topleft_y_frac; - unsigned int dvs_interp_envelope = (DVS_GDC_INTERP_METHOD == HRT_GDC_BLI_MODE ? - DVS_GDC_BLI_INTERP_ENVELOPE : DVS_GDC_BCI_INTERP_ENVELOPE); - - /* number of blocks per height and width */ - unsigned int num_blocks_y = (uv_flag ? DVS_NUM_BLOCKS_Y_CHROMA(o_height) : DVS_NUM_BLOCKS_Y(o_height) ); - unsigned int num_blocks_x = (uv_flag ? DVS_NUM_BLOCKS_X_CHROMA(o_width) : DVS_NUM_BLOCKS_X(o_width) ); // round num_x up to blockdim_x, if it concerns the Y0Y1 block (uv_flag==0) round up to even - - - unsigned int in_stride = i_stride * DVS_INPUT_BYTES_PER_PIXEL; - unsigned width, height; - unsigned int *xbuff = NULL; - unsigned int *ybuff = NULL; - struct gdc_warp_param_mem_s *ptr; - - assert(config != NULL); - assert(gdc_warp_table != NULL); - assert(gdc_warp_table->address != NULL); - - ptr = (struct gdc_warp_param_mem_s *)gdc_warp_table->address; - - ptr += (2 * uv_flag); /* format is Y0 Y1 UV, so UV starts at 3rd position */ - - if(uv_flag == 0) - { - xbuff = config->xcoords_y; - ybuff = config->ycoords_y; - width = config->width_y; - height = config->height_y; - } - else - { - xbuff = config->xcoords_uv; - ybuff = config->ycoords_uv; - width = config->width_uv; - height = config->height_uv; - } - - IA_CSS_LOG("blockdim_x %d blockdim_y %d", - DVS_BLOCKDIM_X, DVS_BLOCKDIM_Y_LUMA >> uv_flag); - IA_CSS_LOG("num_blocks_x %d num_blocks_y %d", num_blocks_x,num_blocks_y); - IA_CSS_LOG("width %d height %d", width, height); - - assert(width == num_blocks_x + 1); // the width and height of the provided morphing table should be 1 more than the number of blocks - assert(height == num_blocks_y + 1); - - for (j = 0; j < num_blocks_y; j++) { - for (i = 0; i < num_blocks_x; i++) { - - x00 = xbuff[j * width + i]; - x01 = xbuff[j * width + (i+1)]; - x10 = xbuff[(j+1) * width + i]; - x11 = xbuff[(j+1) * width + (i+1)]; - - y00 = ybuff[j * width + i]; - y01 = ybuff[j * width + (i+1)]; - y10 = ybuff[(j+1) * width + i]; - y11 = ybuff[(j+1) * width + (i+1)]; - - xmin = min(x00, x10); - xmax = max(x01, x11); - ymin = min(y00, y01); - ymax = max(y10, y11); - - /* Assert that right column's X is greater */ - assert ( x01 >= xmin); - assert ( x11 >= xmin); - /* Assert that bottom row's Y is greater */ - assert ( y10 >= ymin); - assert ( y11 >= ymin); - - topleft_y = ymin >> DVS_COORD_FRAC_BITS; - topleft_x = ((xmin >> DVS_COORD_FRAC_BITS) - >> XMEM_ALIGN_LOG2) - << (XMEM_ALIGN_LOG2); - s.in_addr_offset = topleft_y * in_stride + topleft_x; - - /* similar to topleft_y calculation, but round up if ymax - * has any fraction bits */ - bottom_y = CEIL_DIV(ymax, 1 << DVS_COORD_FRAC_BITS); - s.in_block_height = bottom_y - topleft_y + dvs_interp_envelope; - - bottom_x = CEIL_DIV(xmax, 1 << DVS_COORD_FRAC_BITS); - s.in_block_width = bottom_x - topleft_x + dvs_interp_envelope; - - topleft_x_frac = topleft_x << (DVS_COORD_FRAC_BITS); - topleft_y_frac = topleft_y << (DVS_COORD_FRAC_BITS); - - s.p0_x = x00 - topleft_x_frac; - s.p1_x = x01 - topleft_x_frac; - s.p2_x = x10 - topleft_x_frac; - s.p3_x = x11 - topleft_x_frac; - - s.p0_y = y00 - topleft_y_frac; - s.p1_y = y01 - topleft_y_frac; - s.p2_y = y10 - topleft_y_frac; - s.p3_y = y11 - topleft_y_frac; - - // block should fit within the boundingbox. - assert(s.p0_x < (s.in_block_width << DVS_COORD_FRAC_BITS)); - assert(s.p1_x < (s.in_block_width << DVS_COORD_FRAC_BITS)); - assert(s.p2_x < (s.in_block_width << DVS_COORD_FRAC_BITS)); - assert(s.p3_x < (s.in_block_width << DVS_COORD_FRAC_BITS)); - assert(s.p0_y < (s.in_block_height << DVS_COORD_FRAC_BITS)); - assert(s.p1_y < (s.in_block_height << DVS_COORD_FRAC_BITS)); - assert(s.p2_y < (s.in_block_height << DVS_COORD_FRAC_BITS)); - assert(s.p3_y < (s.in_block_height << DVS_COORD_FRAC_BITS)); - - // block size should be greater than zero. - assert(s.p0_x < s.p1_x); - assert(s.p2_x < s.p3_x); - assert(s.p0_y < s.p2_y); - assert(s.p1_y < s.p3_y); - -#if 0 - printf("j: %d\ti:%d\n", j, i); - printf("offset: %d\n", s.in_addr_offset); - printf("p0_x: %d\n", s.p0_x); - printf("p0_y: %d\n", s.p0_y); - printf("p1_x: %d\n", s.p1_x); - printf("p1_y: %d\n", s.p1_y); - printf("p2_x: %d\n", s.p2_x); - printf("p2_y: %d\n", s.p2_y); - printf("p3_x: %d\n", s.p3_x); - printf("p3_y: %d\n", s.p3_y); - - printf("p0_x_nofrac[0]: %d\n", s.p0_x>>DVS_COORD_FRAC_BITS); - printf("p0_y_nofrac[1]: %d\n", s.p0_y>>DVS_COORD_FRAC_BITS); - printf("p1_x_nofrac[2]: %d\n", s.p1_x>>DVS_COORD_FRAC_BITS); - printf("p1_y_nofrac[3]: %d\n", s.p1_y>>DVS_COORD_FRAC_BITS); - printf("p2_x_nofrac[0]: %d\n", s.p2_x>>DVS_COORD_FRAC_BITS); - printf("p2_y_nofrac[1]: %d\n", s.p2_y>>DVS_COORD_FRAC_BITS); - printf("p3_x_nofrac[2]: %d\n", s.p3_x>>DVS_COORD_FRAC_BITS); - printf("p3_y_nofrac[3]: %d\n", s.p3_y>>DVS_COORD_FRAC_BITS); - printf("\n"); -#endif - - *ptr = s; - - // storage format: - // Y0 Y1 UV0 Y2 Y3 UV1 - /* if uv_flag equals true increment with 2 incase x is odd, this to - skip the uv position. */ - if (uv_flag) - ptr += 3; - else - ptr += (1 + (i&1)); - } - } -} - -struct ia_css_host_data * -convert_allocate_dvs_6axis_config( - const struct ia_css_dvs_6axis_config *dvs_6axis_config, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *dvs_in_frame_info) -{ - unsigned int i_stride; - unsigned int o_width; - unsigned int o_height; - struct ia_css_host_data *me; - struct gdc_warp_param_mem_s *isp_data_ptr; - - assert(binary != NULL); - assert(dvs_6axis_config != NULL); - assert(dvs_in_frame_info != NULL); - - me = ia_css_host_data_allocate((size_t)((DVS_6AXIS_BYTES(binary) / 2) * 3)); - - if (!me) - return NULL; - - /*DVS only supports input frame of YUV420 or NV12. Fail for all other cases*/ - assert((dvs_in_frame_info->format == IA_CSS_FRAME_FORMAT_NV12) - || (dvs_in_frame_info->format == IA_CSS_FRAME_FORMAT_YUV420)); - - isp_data_ptr = (struct gdc_warp_param_mem_s *)me->address; - - i_stride = dvs_in_frame_info->padded_width; - - o_width = binary->out_frame_info[0].res.width; - o_height = binary->out_frame_info[0].res.height; - - /* Y plane */ - convert_coords_to_ispparams(me, dvs_6axis_config, - i_stride, o_width, o_height, 0); - - if (dvs_in_frame_info->format == IA_CSS_FRAME_FORMAT_YUV420) { - /*YUV420 has half the stride for U/V plane*/ - i_stride /=2; - } - - /* UV plane (packed inside the y plane) */ - convert_coords_to_ispparams(me, dvs_6axis_config, - i_stride, o_width/2, o_height/2, 1); - - return me; -} - -enum ia_css_err -store_dvs_6axis_config( - const struct ia_css_dvs_6axis_config *dvs_6axis_config, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *dvs_in_frame_info, - hrt_vaddress ddr_addr_y) -{ - - struct ia_css_host_data *me; - assert(dvs_6axis_config != NULL); - assert(ddr_addr_y != mmgr_NULL); - assert(dvs_in_frame_info != NULL); - - me = convert_allocate_dvs_6axis_config(dvs_6axis_config, - binary, - dvs_in_frame_info); - - if (!me) { - IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY); - return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; - } - - ia_css_params_store_ia_css_host_data( - ddr_addr_y, - me); - ia_css_host_data_free(me); - - return IA_CSS_SUCCESS; -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h deleted file mode 100644 index 2f513e2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h +++ /dev/null @@ -1,60 +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_DVS_HOST_H -#define __IA_CSS_DVS_HOST_H - -#include "ia_css_frame_public.h" -#include "ia_css_binary.h" -#include "sh_css_params.h" - -#include "ia_css_types.h" -#include "ia_css_dvs_types.h" -#include "ia_css_dvs_param.h" - -/* For bilinear interpolation, we need to add +1 to input block height calculation. - * For bicubic interpolation, we will need to add +3 instaed */ -#define DVS_GDC_BLI_INTERP_ENVELOPE 1 -#define DVS_GDC_BCI_INTERP_ENVELOPE 3 - -void -ia_css_dvs_config( - struct sh_css_isp_dvs_isp_config *to, - const struct ia_css_dvs_configuration *from, - unsigned size); - -void -ia_css_dvs_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -void -convert_dvs_6axis_config( - struct ia_css_isp_parameters *params, - const struct ia_css_binary *binary); - -struct ia_css_host_data * -convert_allocate_dvs_6axis_config( - const struct ia_css_dvs_6axis_config *dvs_6axis_config, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *dvs_in_frame_info); - -enum ia_css_err -store_dvs_6axis_config( - const struct ia_css_dvs_6axis_config *dvs_6axis_config, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *dvs_in_frame_info, - hrt_vaddress ddr_addr_y); - -#endif /* __IA_CSS_DVS_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h deleted file mode 100644 index 66a7e58..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h +++ /dev/null @@ -1,39 +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_DVS_PARAM_H -#define __IA_CSS_DVS_PARAM_H - -#include <type_support.h> -#ifdef ISP2401 - -#if !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) && !defined(PARAMBIN_GENERATION) -#endif -#include "dma.h" -#ifdef ISP2401 -#endif /* !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) */ - -#endif -#include "uds/uds_1.0/ia_css_uds_param.h" - -#ifdef ISP2401 - -#endif -/* dvserence frame */ -struct sh_css_isp_dvs_isp_config { - uint32_t num_horizontal_blocks; - uint32_t num_vertical_blocks; -}; - -#endif /* __IA_CSS_DVS_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h deleted file mode 100644 index 30772d2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h +++ /dev/null @@ -1,30 +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_DVS_TYPES_H -#define __IA_CSS_DVS_TYPES_H - -/* DVS frame - * - * ISP block: dvs frame - */ - -#include "ia_css_frame_public.h" - -struct ia_css_dvs_configuration { - const struct ia_css_frame_info *info; -}; - -#endif /* __IA_CSS_DVS_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c deleted file mode 100644 index 47bb504..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c +++ /dev/null @@ -1,321 +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_NO_DEBUG -#include "ia_css_debug.h" -#endif - -#include "type_support.h" -#include "assert_support.h" -#include "math_support.h" /* for min and max */ - -#include "ia_css_eed1_8.host.h" - -/* WARNING1: Number of inv points should be less or equal to 16, - * due to implementation limitation. See kernel design document - * for more details. - * WARNING2: Do not modify the number of inv points without correcting - * the EED1_8 kernel implementation assumptions. - */ -#define NUMBER_OF_CHGRINV_POINTS 15 -#define NUMBER_OF_TCINV_POINTS 9 -#define NUMBER_OF_FCINV_POINTS 9 - -static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = { -0, 16, 64, 144, 272, 448, 672, 976, -1376, 1888, 2528, 3312, 4256, 5376, 6688}; - -static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = { --7171, -256, -29, -3456, -1071, -475, -189, -102, --48, -38, -10, -9, -7, -6, 0}; - -static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = { -8191, 1021, 256, 114, 60, 37, 24, 17, -12, 9, 6, 5, 4, 3, 2}; - -static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = { -1, 1, 1, 0, 0, 0, 0, 0, -0, 0, 0, 0, 0, 0, 0}; - -static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = { -0, 4, 11, 23, 42, 68, 102, 148, 205}; - -static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = { --6364, -631, -126, -34, -13, -6, -4452, -2156, 0}; - -static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = { -8191, 1828, 726, 352, 197, 121, 80, 55, 40}; - -static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = { -1, 1, 1, 1, 1, 1, 0, 0, 0}; - -static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = { -0, 80, 216, 456, 824, 1344, 2040, 2952, 4096}; - -static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = { --5244, -486, -86, -2849, -961, -400, -180, -86, 0}; - -static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = { -8191, 1637, 607, 287, 159, 98, 64, 44, 32}; - -static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = { -1, 1, 1, 0, 0, 0, 0, 0, 0}; - - -void -ia_css_eed1_8_vmem_encode( - struct eed1_8_vmem_params *to, - const struct ia_css_eed1_8_config *from, - size_t size) -{ - unsigned i, j, base; - const unsigned total_blocks = 4; - const unsigned shuffle_block = 16; - - (void)size; - - /* Init */ - for (i = 0; i < ISP_VEC_NELEMS; i++) { - to->e_dew_enh_x[0][i] = 0; - to->e_dew_enh_y[0][i] = 0; - to->e_dew_enh_a[0][i] = 0; - to->e_dew_enh_f[0][i] = 0; - to->chgrinv_x[0][i] = 0; - to->chgrinv_a[0][i] = 0; - to->chgrinv_b[0][i] = 0; - to->chgrinv_c[0][i] = 0; - to->tcinv_x[0][i] = 0; - to->tcinv_a[0][i] = 0; - to->tcinv_b[0][i] = 0; - to->tcinv_c[0][i] = 0; - to->fcinv_x[0][i] = 0; - to->fcinv_a[0][i] = 0; - to->fcinv_b[0][i] = 0; - to->fcinv_c[0][i] = 0; - } - - /* Constraints on dew_enhance_seg_x and dew_enhance_seg_y: - * - values should be greater or equal to 0. - * - values should be ascending. - * - value of index zero is equal to 0. - */ - - /* Checking constraints: */ - /* TODO: investigate if an assert is the right way to report that - * the constraints are violated. - */ - for (j = 0; j < IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS; j++) { - assert(from->dew_enhance_seg_x[j] > -1); - assert(from->dew_enhance_seg_y[j] > -1); - } - - for (j = 1; j < IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS; j++) { - assert(from->dew_enhance_seg_x[j] > from->dew_enhance_seg_x[j-1]); - assert(from->dew_enhance_seg_y[j] > from->dew_enhance_seg_y[j-1]); - } - - assert(from->dew_enhance_seg_x[0] == 0); - assert(from->dew_enhance_seg_y[0] == 0); - - /* Constraints on chgrinv_x, tcinv_x and fcinv_x: - * - values should be greater or equal to 0. - * - values should be ascending. - * - value of index zero is equal to 0. - */ - assert(chgrinv_x[0] == 0); - assert(tcinv_x[0] == 0); - assert(fcinv_x[0] == 0); - - for (j = 1; j < NUMBER_OF_CHGRINV_POINTS; j++) { - assert(chgrinv_x[j] > chgrinv_x[j-1]); - } - - for (j = 1; j < NUMBER_OF_TCINV_POINTS; j++) { - assert(tcinv_x[j] > tcinv_x[j-1]); - } - - for (j = 1; j < NUMBER_OF_FCINV_POINTS; j++) { - assert(fcinv_x[j] > fcinv_x[j-1]); - } - - /* The implementation of the calulating 1/x is based on the availability - * of the OP_vec_shuffle16 operation. - * A 64 element vector is split up in 4 blocks of 16 element. Each array is copied to - * a vector 4 times, (starting at 0, 16, 32 and 48). All array elements are copied or - * initialised as described in the KFS. The remaining elements of a vector are set to 0. - */ - /* TODO: guard this code with above assumptions */ - for(i = 0; i < total_blocks; i++) { - base = shuffle_block * i; - - for (j = 0; j < IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS; j++) { - to->e_dew_enh_x[0][base + j] = min(max(from->dew_enhance_seg_x[j], 0), 8191); - to->e_dew_enh_y[0][base + j] = min(max(from->dew_enhance_seg_y[j], -8192), 8191); - } - - for (j = 0; j < (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1); j++) { - to->e_dew_enh_a[0][base + j] = min(max(from->dew_enhance_seg_slope[j], -8192), 8191); - /* Convert dew_enhance_seg_exp to flag: - * 0 -> 0 - * 1...13 -> 1 - */ - to->e_dew_enh_f[0][base + j] = (min(max(from->dew_enhance_seg_exp[j], 0), 13) > 0); - } - - /* Hard-coded to 0, in order to be able to handle out of - * range input in the same way as the other segments. - * See KFS for more details. - */ - to->e_dew_enh_a[0][base + (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1)] = 0; - to->e_dew_enh_f[0][base + (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1)] = 0; - - for (j = 0; j < NUMBER_OF_CHGRINV_POINTS; j++) { - to->chgrinv_x[0][base + j] = chgrinv_x[j]; - to->chgrinv_a[0][base + j] = chgrinv_a[j]; - to->chgrinv_b[0][base + j] = chgrinv_b[j]; - to->chgrinv_c[0][base + j] = chgrinv_c[j]; - } - - for (j = 0; j < NUMBER_OF_TCINV_POINTS; j++) { - to->tcinv_x[0][base + j] = tcinv_x[j]; - to->tcinv_a[0][base + j] = tcinv_a[j]; - to->tcinv_b[0][base + j] = tcinv_b[j]; - to->tcinv_c[0][base + j] = tcinv_c[j]; - } - - for (j = 0; j < NUMBER_OF_FCINV_POINTS; j++) { - to->fcinv_x[0][base + j] = fcinv_x[j]; - to->fcinv_a[0][base + j] = fcinv_a[j]; - to->fcinv_b[0][base + j] = fcinv_b[j]; - to->fcinv_c[0][base + j] = fcinv_c[j]; - } - } -} - - -void -ia_css_eed1_8_encode( - struct eed1_8_dmem_params *to, - const struct ia_css_eed1_8_config *from, - size_t size) -{ - int i; - int min_exp = 0; - - (void)size; - - to->rbzp_strength = from->rbzp_strength; - - to->fcstrength = from->fcstrength; - to->fcthres_0 = from->fcthres_0; - to->fc_sat_coef = from->fc_sat_coef; - to->fc_coring_prm = from->fc_coring_prm; - to->fc_slope = from->fcthres_1 - from->fcthres_0; - - to->aerel_thres0 = from->aerel_thres0; - to->aerel_gain0 = from->aerel_gain0; - to->aerel_thres_diff = from->aerel_thres1 - from->aerel_thres0; - to->aerel_gain_diff = from->aerel_gain1 - from->aerel_gain0; - - to->derel_thres0 = from->derel_thres0; - to->derel_gain0 = from->derel_gain0; - to->derel_thres_diff = (from->derel_thres1 - from->derel_thres0); - to->derel_gain_diff = (from->derel_gain1 - from->derel_gain0); - - to->coring_pos0 = from->coring_pos0; - to->coring_pos_diff = (from->coring_pos1 - from->coring_pos0); - to->coring_neg0 = from->coring_neg0; - to->coring_neg_diff = (from->coring_neg1 - from->coring_neg0); - - /* Note: (ISP_VEC_ELEMBITS -1) - * TODO: currently the testbench does not support to use - * ISP_VEC_ELEMBITS. Investigate how to fix this - */ - to->gain_exp = (13 - from->gain_exp); - to->gain_pos0 = from->gain_pos0; - to->gain_pos_diff = (from->gain_pos1 - from->gain_pos0); - to->gain_neg0 = from->gain_neg0; - to->gain_neg_diff = (from->gain_neg1 - from->gain_neg0); - - to->margin_pos0 = from->pos_margin0; - to->margin_pos_diff = (from->pos_margin1 - from->pos_margin0); - to->margin_neg0 = from->neg_margin0; - to->margin_neg_diff = (from->neg_margin1 - from->neg_margin0); - - /* Encode DEWEnhance exp (e_dew_enh_asr) */ - for (i = 0; i < (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1); i++) { - min_exp = max(min_exp, from->dew_enhance_seg_exp[i]); - } - to->e_dew_enh_asr = 13 - min(max(min_exp, 0), 13); - - to->dedgew_max = from->dedgew_max; -} - - -void -ia_css_init_eed1_8_state( - void *state, - size_t size) -{ - memset(state, 0, size); -} - - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_eed1_8_debug_dtrace( - const struct ia_css_eed1_8_config *eed, - unsigned level) -{ - if (!eed) - return; - - ia_css_debug_dtrace(level, "Edge Enhancing Demosaic 1.8:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "rbzp_strength", eed->rbzp_strength); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "fcstrength", eed->fcstrength); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "fcthres_0", eed->fcthres_0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "fcthres_1", eed->fcthres_1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "fc_sat_coef", eed->fc_sat_coef); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "fc_coring_prm", eed->fc_coring_prm); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "aerel_thres0", eed->aerel_thres0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "aerel_gain0", eed->aerel_gain0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "aerel_thres1", eed->aerel_thres1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "aerel_gain1", eed->aerel_gain1); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "derel_thres0", eed->derel_thres0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "derel_gain0", eed->derel_gain0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "derel_thres1", eed->derel_thres1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "derel_gain1", eed->derel_gain1); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "coring_pos0", eed->coring_pos0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "coring_pos1", eed->coring_pos1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "coring_neg0", eed->coring_neg0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "coring_neg1", eed->coring_neg1); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "gain_exp", eed->gain_exp); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "gain_pos0", eed->gain_pos0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "gain_pos1", eed->gain_pos1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "gain_neg0", eed->gain_neg0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "gain_neg1", eed->gain_neg1); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "pos_margin0", eed->pos_margin0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "pos_margin1", eed->pos_margin1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "neg_margin0", eed->neg_margin0); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "neg_margin1", eed->neg_margin1); - - ia_css_debug_dtrace(level, "\t%-32s = %d\n", "dedgew_max", eed->dedgew_max); -} -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h deleted file mode 100644 index fff932c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h +++ /dev/null @@ -1,45 +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_EED1_8_HOST_H -#define __IA_CSS_EED1_8_HOST_H - -#include "ia_css_eed1_8_types.h" -#include "ia_css_eed1_8_param.h" - -void -ia_css_eed1_8_vmem_encode( - struct eed1_8_vmem_params *to, - const struct ia_css_eed1_8_config *from, - size_t size); - -void -ia_css_eed1_8_encode( - struct eed1_8_dmem_params *to, - const struct ia_css_eed1_8_config *from, - size_t size); - -void -ia_css_init_eed1_8_state( - void *state, - size_t size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_eed1_8_debug_dtrace( - const struct ia_css_eed1_8_config *config, - unsigned level); -#endif - -#endif /* __IA_CSS_EED1_8_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h deleted file mode 100644 index bc3a07f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h +++ /dev/null @@ -1,154 +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_EED1_8_PARAM_H -#define __IA_CSS_EED1_8_PARAM_H - -#include "type_support.h" -#include "vmem.h" /* needed for VMEM_ARRAY */ - -#include "ia_css_eed1_8_types.h" /* IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS */ - - -/* Configuration parameters: */ - -/* Enable median for false color correction - * 0: Do not use median - * 1: Use median - * Default: 1 - */ -#define EED1_8_FC_ENABLE_MEDIAN 1 - -/* Coring Threshold minima - * Used in Tint color suppression. - * Default: 1 - */ -#define EED1_8_CORINGTHMIN 1 - -/* Define size of the state..... TODO: check if this is the correct place */ -/* 4 planes : GR, R, B, GB */ -#define NUM_PLANES 4 - -/* 5 lines state per color plane input_line_state */ -#define EED1_8_STATE_INPUT_BUFFER_HEIGHT (5 * NUM_PLANES) - -/* Each plane has width equal to half frame line */ -#define EED1_8_STATE_INPUT_BUFFER_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line state per color plane LD_H state */ -#define EED1_8_STATE_LD_H_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_LD_H_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line state per color plane LD_V state */ -#define EED1_8_STATE_LD_V_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_LD_V_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line (single plane) state for D_Hr state */ -#define EED1_8_STATE_D_HR_HEIGHT 1 -#define EED1_8_STATE_D_HR_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line (single plane) state for D_Hb state */ -#define EED1_8_STATE_D_HB_HEIGHT 1 -#define EED1_8_STATE_D_HB_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 2 lines (single plane) state for D_Vr state */ -#define EED1_8_STATE_D_VR_HEIGHT 2 -#define EED1_8_STATE_D_VR_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 2 line (single plane) state for D_Vb state */ -#define EED1_8_STATE_D_VB_HEIGHT 2 -#define EED1_8_STATE_D_VB_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 2 lines state for R and B (= 2 planes) rb_zipped_state */ -#define EED1_8_STATE_RB_ZIPPED_HEIGHT (2 * 2) -#define EED1_8_STATE_RB_ZIPPED_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -#if EED1_8_FC_ENABLE_MEDIAN -/* 1 full input line (GR-R color line) for Yc state */ -#define EED1_8_STATE_YC_HEIGHT 1 -#define EED1_8_STATE_YC_WIDTH MAX_FRAME_SIMDWIDTH - -/* 1 line state per color plane Cg_state */ -#define EED1_8_STATE_CG_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_CG_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 line state per color plane Co_state */ -#define EED1_8_STATE_CO_HEIGHT (1 * NUM_PLANES) -#define EED1_8_STATE_CO_WIDTH CEIL_DIV(MAX_FRAME_SIMDWIDTH, 2) - -/* 1 full input line (GR-R color line) for AbsK state */ -#define EED1_8_STATE_ABSK_HEIGHT 1 -#define EED1_8_STATE_ABSK_WIDTH MAX_FRAME_SIMDWIDTH -#endif - -struct eed1_8_vmem_params { - VMEM_ARRAY(e_dew_enh_x, ISP_VEC_NELEMS); - VMEM_ARRAY(e_dew_enh_y, ISP_VEC_NELEMS); - VMEM_ARRAY(e_dew_enh_a, ISP_VEC_NELEMS); - VMEM_ARRAY(e_dew_enh_f, ISP_VEC_NELEMS); - VMEM_ARRAY(chgrinv_x, ISP_VEC_NELEMS); - VMEM_ARRAY(chgrinv_a, ISP_VEC_NELEMS); - VMEM_ARRAY(chgrinv_b, ISP_VEC_NELEMS); - VMEM_ARRAY(chgrinv_c, ISP_VEC_NELEMS); - VMEM_ARRAY(fcinv_x, ISP_VEC_NELEMS); - VMEM_ARRAY(fcinv_a, ISP_VEC_NELEMS); - VMEM_ARRAY(fcinv_b, ISP_VEC_NELEMS); - VMEM_ARRAY(fcinv_c, ISP_VEC_NELEMS); - VMEM_ARRAY(tcinv_x, ISP_VEC_NELEMS); - VMEM_ARRAY(tcinv_a, ISP_VEC_NELEMS); - VMEM_ARRAY(tcinv_b, ISP_VEC_NELEMS); - VMEM_ARRAY(tcinv_c, ISP_VEC_NELEMS); -}; - -/* EED (Edge Enhancing Demosaic) ISP parameters */ -struct eed1_8_dmem_params { - int32_t rbzp_strength; - - int32_t fcstrength; - int32_t fcthres_0; - int32_t fc_sat_coef; - int32_t fc_coring_prm; - int32_t fc_slope; - - int32_t aerel_thres0; - int32_t aerel_gain0; - int32_t aerel_thres_diff; - int32_t aerel_gain_diff; - - int32_t derel_thres0; - int32_t derel_gain0; - int32_t derel_thres_diff; - int32_t derel_gain_diff; - - int32_t coring_pos0; - int32_t coring_pos_diff; - int32_t coring_neg0; - int32_t coring_neg_diff; - - int32_t gain_exp; - int32_t gain_pos0; - int32_t gain_pos_diff; - int32_t gain_neg0; - int32_t gain_neg_diff; - - int32_t margin_pos0; - int32_t margin_pos_diff; - int32_t margin_neg0; - int32_t margin_neg_diff; - - int32_t e_dew_enh_asr; - int32_t dedgew_max; -}; - -#endif /* __IA_CSS_EED1_8_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h deleted file mode 100644 index 32e9182..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h +++ /dev/null @@ -1,86 +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_EED1_8_TYPES_H -#define __IA_CSS_EED1_8_TYPES_H - -/* @file -* CSS-API header file for Edge Enhanced Demosaic parameters. -*/ - - -#include "type_support.h" - -/** - * \brief EED1_8 public parameters. - * \details Struct with all parameters for the EED1.8 kernel that can be set - * from the CSS API. - */ - -/* parameter list is based on ISP261 CSS API public parameter list_all.xlsx from 28-01-2015 */ - -/* Number of segments + 1 segment used in edge reliability enhancement - * Ineffective: N/A - * Default: 9 - */ -#define IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS 9 - -/* Edge Enhanced Demosaic configuration - * - * ISP2.6.1: EED1_8 is used. - */ - -struct ia_css_eed1_8_config { - int32_t rbzp_strength; /** Strength of zipper reduction. */ - - int32_t fcstrength; /** Strength of false color reduction. */ - int32_t fcthres_0; /** Threshold to prevent chroma coring due to noise or green disparity in dark region. */ - int32_t fcthres_1; /** Threshold to prevent chroma coring due to noise or green disparity in bright region. */ - int32_t fc_sat_coef; /** How much color saturation to maintain in high color saturation region. */ - int32_t fc_coring_prm; /** Chroma coring coefficient for tint color suppression. */ - - int32_t aerel_thres0; /** Threshold for Non-Directional Reliability at dark region. */ - int32_t aerel_gain0; /** Gain for Non-Directional Reliability at dark region. */ - int32_t aerel_thres1; /** Threshold for Non-Directional Reliability at bright region. */ - int32_t aerel_gain1; /** Gain for Non-Directional Reliability at bright region. */ - - int32_t derel_thres0; /** Threshold for Directional Reliability at dark region. */ - int32_t derel_gain0; /** Gain for Directional Reliability at dark region. */ - int32_t derel_thres1; /** Threshold for Directional Reliability at bright region. */ - int32_t derel_gain1; /** Gain for Directional Reliability at bright region. */ - - int32_t coring_pos0; /** Positive Edge Coring Threshold in dark region. */ - int32_t coring_pos1; /** Positive Edge Coring Threshold in bright region. */ - int32_t coring_neg0; /** Negative Edge Coring Threshold in dark region. */ - int32_t coring_neg1; /** Negative Edge Coring Threshold in bright region. */ - - int32_t gain_exp; /** Common Exponent of Gain. */ - int32_t gain_pos0; /** Gain for Positive Edge in dark region. */ - int32_t gain_pos1; /** Gain for Positive Edge in bright region. */ - int32_t gain_neg0; /** Gain for Negative Edge in dark region. */ - int32_t gain_neg1; /** Gain for Negative Edge in bright region. */ - - int32_t pos_margin0; /** Margin for Positive Edge in dark region. */ - int32_t pos_margin1; /** Margin for Positive Edge in bright region. */ - int32_t neg_margin0; /** Margin for Negative Edge in dark region. */ - int32_t neg_margin1; /** Margin for Negative Edge in bright region. */ - - int32_t dew_enhance_seg_x[IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS]; /** Segment data for directional edge weight: X. */ - int32_t dew_enhance_seg_y[IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS]; /** Segment data for directional edge weight: Y. */ - int32_t dew_enhance_seg_slope[(IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1)]; /** Segment data for directional edge weight: Slope. */ - int32_t dew_enhance_seg_exp[(IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1)]; /** Segment data for directional edge weight: Exponent. */ - int32_t dedgew_max; /** Max Weight for Directional Edge. */ -}; - -#endif /* __IA_CSS_EED1_8_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c deleted file mode 100644 index 94631ee..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c +++ /dev/null @@ -1,62 +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_formats.host.h" -#include "ia_css_types.h" -#include "sh_css_defs.h" - -/*#include "sh_css_frac.h"*/ -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -#include "ia_css_debug.h" -#endif - -const struct ia_css_formats_config default_formats_config = { - 1 -}; - -void -ia_css_formats_encode( - struct sh_css_isp_formats_params *to, - const struct ia_css_formats_config *from, - unsigned size) -{ - (void)size; - to->video_full_range_flag = from->video_full_range_flag; -} -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -void -ia_css_formats_dump( - const struct sh_css_isp_formats_params *formats, - unsigned level) -{ - if (!formats) return; - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "video_full_range_flag", formats->video_full_range_flag); -} -#endif - -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -void -ia_css_formats_debug_dtrace( - const struct ia_css_formats_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.video_full_range_flag=%d\n", - config->video_full_range_flag); -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h deleted file mode 100644 index 8a90cd8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h +++ /dev/null @@ -1,45 +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_FORMATS_HOST_H -#define __IA_CSS_FORMATS_HOST_H - -#include "ia_css_formats_types.h" -#include "ia_css_formats_param.h" - -extern const struct ia_css_formats_config default_formats_config; - -void -ia_css_formats_encode( - struct sh_css_isp_formats_params *to, - const struct ia_css_formats_config *from, - unsigned size); -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -void -ia_css_formats_dump( - const struct sh_css_isp_formats_params *formats, - unsigned level); -#endif - -#ifndef IA_CSS_NO_DEBUG -/* FIXME: See BZ 4427 */ -void -ia_css_formats_debug_dtrace( - const struct ia_css_formats_config *formats, - unsigned level); -#endif /*IA_CSS_NO_DEBUG*/ - -#endif /* __IA_CSS_FORMATS_HOST_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h deleted file mode 100644 index 2eb6030..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h +++ /dev/null @@ -1,25 +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_FORMATS_PARAM_H -#define __IA_CSS_FORMATS_PARAM_H - -#include "type_support.h" - -/* FORMATS (Format conversion) */ -struct sh_css_isp_formats_params { - int32_t video_full_range_flag; -}; - -#endif /* __IA_CSS_FORMATS_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h deleted file mode 100644 index 4947957..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h +++ /dev/null @@ -1,38 +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_FORMATS_TYPES_H -#define __IA_CSS_FORMATS_TYPES_H - -/* @file -* CSS-API header file for output format parameters. -*/ - -#include "type_support.h" - -/* Formats configuration. - * - * ISP block: FORMATS - * ISP1: FORMATS is used. - * ISP2: FORMATS is used. - */ -struct ia_css_formats_config { - uint32_t video_full_range_flag; /** selects the range of YUV output. - u8.0, [0,1], - default 1, ineffective n/a\n - 1 - full range, luma 0-255, chroma 0-255\n - 0 - reduced range, luma 16-235, chroma 16-240 */ -}; - -#endif /* __IA_CSS_FORMATS_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h deleted file mode 100644 index cc8dd1a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h +++ /dev/null @@ -1,33 +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_FIXEDBDS_PARAM_H -#define __IA_CSS_FIXEDBDS_PARAM_H - -#include "type_support.h" - -#ifdef ISP2401 -#define BDS_UNIT 8 -#define FRAC_LOG 3 -#define FRAC_ACC (1<<FRAC_LOG) -#if FRAC_ACC != BDS_UNIT -#error "FRAC_ACC and BDS_UNIT need to be merged into one define" -#endif - -#endif -struct sh_css_isp_bds_params { - int baf_strength; -}; - -#endif /* __IA_CSS_FIXEDBDS_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h deleted file mode 100644 index 5b59d9d..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h +++ /dev/null @@ -1,26 +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_FIXEDBDS_TYPES_H -#define __IA_CSS_FIXEDBDS_TYPES_H - - -struct sh_css_bds_factor { - unsigned numerator; - unsigned denominator; - unsigned int bds_factor; -}; - - -#endif /*__IA_CSS_FIXEDBDS_TYPES_H*/ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c deleted file mode 100644 index 1fb9f27..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c +++ /dev/null @@ -1,89 +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 <assert_support.h> -#include <ia_css_frame_public.h> -#include <ia_css_frame.h> -#include <ia_css_binary.h> -#include <ia_css_types.h> -#include <sh_css_defs.h> -#include <ia_css_debug.h> - -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" - -#include "ia_css_fpn.host.h" - -void -ia_css_fpn_encode( - struct sh_css_isp_fpn_params *to, - const struct ia_css_fpn_table *from, - unsigned size) -{ - (void)size; - to->shift = from->shift; - to->enabled = from->data != NULL; -} - -void -ia_css_fpn_dump( - const struct sh_css_isp_fpn_params *fpn, - unsigned level) -{ - if (!fpn) return; - ia_css_debug_dtrace(level, "Fixed Pattern Noise Reduction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "fpn_shift", fpn->shift); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "fpn_enabled", fpn->enabled); -} - -void -ia_css_fpn_config( - struct sh_css_isp_fpn_isp_config *to, - const struct ia_css_fpn_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, from->info); - to->width_a_over_b = elems_a / to->port_b.elems; - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); -} - -void -ia_css_fpn_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - struct ia_css_frame_info my_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO; - const struct ia_css_fpn_configuration config = { - &my_info - }; - - my_info.res.width = CEIL_DIV(info->res.width, 2); /* Packed by 2x */ - my_info.res.height = info->res.height; - my_info.padded_width = CEIL_DIV(info->padded_width, 2); /* Packed by 2x */ - my_info.format = info->format; - my_info.raw_bit_depth = FPN_BITS_PER_PIXEL; - my_info.raw_bayer_order = info->raw_bayer_order; - my_info.crop_info = info->crop_info; - - ia_css_configure_fpn(binary, &config); -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h deleted file mode 100644 index bb905c8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h +++ /dev/null @@ -1,44 +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_FPN_HOST_H -#define __IA_CSS_FPN_HOST_H - -#include "ia_css_binary.h" -#include "ia_css_fpn_types.h" -#include "ia_css_fpn_param.h" - -void -ia_css_fpn_encode( - struct sh_css_isp_fpn_params *to, - const struct ia_css_fpn_table *from, - unsigned size); - -void -ia_css_fpn_dump( - const struct sh_css_isp_fpn_params *fpn, - unsigned level); - -void -ia_css_fpn_config( - struct sh_css_isp_fpn_isp_config *to, - const struct ia_css_fpn_configuration *from, - unsigned size); - -void -ia_css_fpn_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -#endif /* __IA_CSS_FPN_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h deleted file mode 100644 index 68765c3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h +++ /dev/null @@ -1,35 +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_FPN_PARAM_H -#define __IA_CSS_FPN_PARAM_H - -#include "type_support.h" - -#include "dma.h" - -#define FPN_BITS_PER_PIXEL 16 - -/* FPNR (Fixed Pattern Noise Reduction) */ -struct sh_css_isp_fpn_params { - int32_t shift; - int32_t enabled; -}; - -struct sh_css_isp_fpn_isp_config { - uint32_t width_a_over_b; - struct dma_port_config port_b; -}; - -#endif /* __IA_CSS_FPN_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h deleted file mode 100644 index ef287fa..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h +++ /dev/null @@ -1,52 +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_FPN_TYPES_H -#define __IA_CSS_FPN_TYPES_H - -/* @file -* CSS-API header file for Fixed Pattern Noise parameters. -*/ - -/* Fixed Pattern Noise table. - * - * This contains the fixed patterns noise values - * obtained from a black frame capture. - * - * "shift" should be set as the smallest value - * which satisfies the requirement the maximum data is less than 64. - * - * ISP block: FPN1 - * ISP1: FPN1 is used. - * ISP2: FPN1 is used. - */ - -struct ia_css_fpn_table { - int16_t *data; /** Table content (fixed patterns noise). - u0.[13-shift], [0,63] */ - uint32_t width; /** Table width (in pixels). - This is the input frame width. */ - uint32_t height; /** Table height (in pixels). - This is the input frame height. */ - uint32_t shift; /** Common exponent of table content. - u8.0, [0,13] */ - uint32_t enabled; /** Fpn is enabled. - bool */ -}; - -struct ia_css_fpn_configuration { - const struct ia_css_frame_info *info; -}; - -#endif /* __IA_CSS_FPN_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c deleted file mode 100644 index 0cfb5c9..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c +++ /dev/null @@ -1,118 +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 "sh_css_frac.h" -#include "vamem.h" - -#include "ia_css_gc.host.h" - -const struct ia_css_gc_config default_gc_config = { - 0, - 0 -}; - -const struct ia_css_ce_config default_ce_config = { - 0, - 255 -}; - -void -ia_css_gc_encode( - struct sh_css_isp_gc_params *to, - const struct ia_css_gc_config *from, - unsigned size) -{ - (void)size; - to->gain_k1 = - uDIGIT_FITTING((int)from->gain_k1, 16, - IA_CSS_GAMMA_GAIN_K_SHIFT); - to->gain_k2 = - uDIGIT_FITTING((int)from->gain_k2, 16, - IA_CSS_GAMMA_GAIN_K_SHIFT); -} - -void -ia_css_ce_encode( - struct sh_css_isp_ce_params *to, - const struct ia_css_ce_config *from, - unsigned size) -{ - (void)size; - to->uv_level_min = from->uv_level_min; - to->uv_level_max = from->uv_level_max; -} - -void -ia_css_gc_vamem_encode( - struct sh_css_isp_gc_vamem_params *to, - const struct ia_css_gamma_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->gc, &from->data, sizeof(to->gc)); -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_gc_dump( - const struct sh_css_isp_gc_params *gc, - unsigned level) -{ - if (!gc) return; - ia_css_debug_dtrace(level, "Gamma Correction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "gamma_gain_k1", gc->gain_k1); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "gamma_gain_k2", gc->gain_k2); -} - -void -ia_css_ce_dump( - const struct sh_css_isp_ce_params *ce, - unsigned level) -{ - ia_css_debug_dtrace(level, "Chroma Enhancement:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ce_uv_level_min", ce->uv_level_min); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ce_uv_level_max", ce->uv_level_max); -} - -void -ia_css_gc_debug_dtrace( - const struct ia_css_gc_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.gain_k1=%d, config.gain_k2=%d\n", - config->gain_k1, config->gain_k2); -} - -void -ia_css_ce_debug_dtrace( - const struct ia_css_ce_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.uv_level_min=%d, config.uv_level_max=%d\n", - config->uv_level_min, config->uv_level_max); -} -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h deleted file mode 100644 index 06f0884..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h +++ /dev/null @@ -1,65 +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_GC_HOST_H -#define __IA_CSS_GC_HOST_H - -#include "ia_css_gc_param.h" -#include "ia_css_gc_table.host.h" - -extern const struct ia_css_gc_config default_gc_config; -extern const struct ia_css_ce_config default_ce_config; - -void -ia_css_gc_encode( - struct sh_css_isp_gc_params *to, - const struct ia_css_gc_config *from, - unsigned size); - -void -ia_css_gc_vamem_encode( - struct sh_css_isp_gc_vamem_params *to, - const struct ia_css_gamma_table *from, - unsigned size); - -void -ia_css_ce_encode( - struct sh_css_isp_ce_params *to, - const struct ia_css_ce_config *from, - unsigned size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_gc_dump( - const struct sh_css_isp_gc_params *gc, - unsigned level); - -void -ia_css_ce_dump( - const struct sh_css_isp_ce_params *ce, - unsigned level); - -void -ia_css_gc_debug_dtrace( - const struct ia_css_gc_config *config, - unsigned level); - -void -ia_css_ce_debug_dtrace( - const struct ia_css_ce_config *config, - unsigned level); - -#endif - -#endif /* __IA_CSS_GC_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h deleted file mode 100644 index 52972b1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h +++ /dev/null @@ -1,61 +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_GC_PARAM_H -#define __IA_CSS_GC_PARAM_H - -#include "type_support.h" -#ifndef PIPE_GENERATION -#ifdef __ISP -#define __INLINE_VAMEM__ -#endif -#include "vamem.h" -#include "ia_css_gc_types.h" - -#if defined(IS_VAMEM_VERSION_1) -#define SH_CSS_ISP_GAMMA_TABLE_SIZE_LOG2 IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_GC_TABLE_SIZE IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE -#elif defined(IS_VAMEM_VERSION_2) -#define SH_CSS_ISP_GAMMA_TABLE_SIZE_LOG2 IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_GC_TABLE_SIZE IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE -#else -#error "Undefined vamem version" -#endif - -#else -/* For pipe generation, the size is not relevant */ -#define SH_CSS_ISP_GC_TABLE_SIZE 0 -#endif - -#define GAMMA_OUTPUT_BITS 8 -#define GAMMA_OUTPUT_MAX_VAL ((1<<GAMMA_OUTPUT_BITS)-1) - -/* GC (Gamma Correction) */ -struct sh_css_isp_gc_params { - int32_t gain_k1; - int32_t gain_k2; -}; - -/* CE (Chroma Enhancement) */ -struct sh_css_isp_ce_params { - int32_t uv_level_min; - int32_t uv_level_max; -}; - -/* This should be vamem_data_t, but that breaks the pipe generator */ -struct sh_css_isp_gc_vamem_params { - uint16_t gc[SH_CSS_ISP_GC_TABLE_SIZE]; -}; - -#endif /* __IA_CSS_GC_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c deleted file mode 100644 index 082db22..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c +++ /dev/null @@ -1,214 +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 <type_support.h> -#include <string_support.h> /* memcpy */ -#include "system_global.h" -#include "vamem.h" -#include "ia_css_types.h" -#include "ia_css_gc_table.host.h" - -#if defined(HAS_VAMEM_VERSION_2) - -struct ia_css_gamma_table default_gamma_table; - -static const uint16_t -default_gamma_table_data[IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE] = { - 0, 4, 8, 12, 17, 21, 27, 32, - 38, 44, 49, 55, 61, 66, 71, 76, - 80, 84, 88, 92, 95, 98, 102, 105, -108, 110, 113, 116, 118, 121, 123, 126, -128, 130, 132, 135, 137, 139, 141, 143, -145, 146, 148, 150, 152, 153, 155, 156, -158, 160, 161, 162, 164, 165, 166, 168, -169, 170, 171, 172, 174, 175, 176, 177, -178, 179, 180, 181, 182, 183, 184, 184, -185, 186, 187, 188, 189, 189, 190, 191, -192, 192, 193, 194, 195, 195, 196, 197, -197, 198, 198, 199, 200, 200, 201, 201, -202, 203, 203, 204, 204, 205, 205, 206, -206, 207, 207, 208, 208, 209, 209, 210, -210, 210, 211, 211, 212, 212, 213, 213, -214, 214, 214, 215, 215, 216, 216, 216, -217, 217, 218, 218, 218, 219, 219, 220, -220, 220, 221, 221, 222, 222, 222, 223, -223, 223, 224, 224, 225, 225, 225, 226, -226, 226, 227, 227, 227, 228, 228, 228, -229, 229, 229, 230, 230, 230, 231, 231, -231, 232, 232, 232, 233, 233, 233, 234, -234, 234, 234, 235, 235, 235, 236, 236, -236, 237, 237, 237, 237, 238, 238, 238, -239, 239, 239, 239, 240, 240, 240, 241, -241, 241, 241, 242, 242, 242, 242, 243, -243, 243, 243, 244, 244, 244, 245, 245, -245, 245, 246, 246, 246, 246, 247, 247, -247, 247, 248, 248, 248, 248, 249, 249, -249, 249, 250, 250, 250, 250, 251, 251, -251, 251, 252, 252, 252, 252, 253, 253, -253, 253, 254, 254, 254, 254, 255, 255, -255 -}; - -#elif defined(HAS_VAMEM_VERSION_1) - -static const uint16_t -default_gamma_table_data[IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE] = { - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 16, - 17, 18, 19, 20, 21, 23, 24, 25, - 27, 28, 29, 31, 32, 33, 35, 36, - 38, 39, 41, 42, 44, 45, 47, 48, - 49, 51, 52, 54, 55, 57, 58, 60, - 61, 62, 64, 65, 66, 68, 69, 70, - 71, 72, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 93, 94, - 95, 96, 97, 98, 98, 99, 100, 101, - 102, 102, 103, 104, 105, 105, 106, 107, - 108, 108, 109, 110, 110, 111, 112, 112, - 113, 114, 114, 115, 116, 116, 117, 118, - 118, 119, 120, 120, 121, 121, 122, 123, - 123, 124, 125, 125, 126, 126, 127, 127, /* 128 */ - 128, 129, 129, 130, 130, 131, 131, 132, - 132, 133, 134, 134, 135, 135, 136, 136, - 137, 137, 138, 138, 139, 139, 140, 140, - 141, 141, 142, 142, 143, 143, 144, 144, - 145, 145, 145, 146, 146, 147, 147, 148, - 148, 149, 149, 150, 150, 150, 151, 151, - 152, 152, 152, 153, 153, 154, 154, 155, - 155, 155, 156, 156, 156, 157, 157, 158, - 158, 158, 159, 159, 160, 160, 160, 161, - 161, 161, 162, 162, 162, 163, 163, 163, - 164, 164, 164, 165, 165, 165, 166, 166, - 166, 167, 167, 167, 168, 168, 168, 169, - 169, 169, 170, 170, 170, 170, 171, 171, - 171, 172, 172, 172, 172, 173, 173, 173, - 174, 174, 174, 174, 175, 175, 175, 176, - 176, 176, 176, 177, 177, 177, 177, 178, /* 256 */ - 178, 178, 178, 179, 179, 179, 179, 180, - 180, 180, 180, 181, 181, 181, 181, 182, - 182, 182, 182, 182, 183, 183, 183, 183, - 184, 184, 184, 184, 184, 185, 185, 185, - 185, 186, 186, 186, 186, 186, 187, 187, - 187, 187, 187, 188, 188, 188, 188, 188, - 189, 189, 189, 189, 189, 190, 190, 190, - 190, 190, 191, 191, 191, 191, 191, 192, - 192, 192, 192, 192, 192, 193, 193, 193, - 193, 193, 194, 194, 194, 194, 194, 194, - 195, 195, 195, 195, 195, 195, 196, 196, - 196, 196, 196, 196, 197, 197, 197, 197, - 197, 197, 198, 198, 198, 198, 198, 198, - 198, 199, 199, 199, 199, 199, 199, 200, - 200, 200, 200, 200, 200, 200, 201, 201, - 201, 201, 201, 201, 201, 202, 202, 202, /* 384 */ - 202, 202, 202, 202, 203, 203, 203, 203, - 203, 203, 203, 204, 204, 204, 204, 204, - 204, 204, 204, 205, 205, 205, 205, 205, - 205, 205, 205, 206, 206, 206, 206, 206, - 206, 206, 206, 207, 207, 207, 207, 207, - 207, 207, 207, 208, 208, 208, 208, 208, - 208, 208, 208, 209, 209, 209, 209, 209, - 209, 209, 209, 209, 210, 210, 210, 210, - 210, 210, 210, 210, 210, 211, 211, 211, - 211, 211, 211, 211, 211, 211, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 213, - 213, 213, 213, 213, 213, 213, 213, 213, - 214, 214, 214, 214, 214, 214, 214, 214, - 214, 214, 215, 215, 215, 215, 215, 215, - 215, 215, 215, 216, 216, 216, 216, 216, - 216, 216, 216, 216, 216, 217, 217, 217, /* 512 */ - 217, 217, 217, 217, 217, 217, 217, 218, - 218, 218, 218, 218, 218, 218, 218, 218, - 218, 219, 219, 219, 219, 219, 219, 219, - 219, 219, 219, 220, 220, 220, 220, 220, - 220, 220, 220, 220, 220, 221, 221, 221, - 221, 221, 221, 221, 221, 221, 221, 221, - 222, 222, 222, 222, 222, 222, 222, 222, - 222, 222, 223, 223, 223, 223, 223, 223, - 223, 223, 223, 223, 223, 224, 224, 224, - 224, 224, 224, 224, 224, 224, 224, 224, - 225, 225, 225, 225, 225, 225, 225, 225, - 225, 225, 225, 226, 226, 226, 226, 226, - 226, 226, 226, 226, 226, 226, 226, 227, - 227, 227, 227, 227, 227, 227, 227, 227, - 227, 227, 228, 228, 228, 228, 228, 228, - 228, 228, 228, 228, 228, 228, 229, 229, - 229, 229, 229, 229, 229, 229, 229, 229, - 229, 229, 230, 230, 230, 230, 230, 230, - 230, 230, 230, 230, 230, 230, 231, 231, - 231, 231, 231, 231, 231, 231, 231, 231, - 231, 231, 231, 232, 232, 232, 232, 232, - 232, 232, 232, 232, 232, 232, 232, 233, - 233, 233, 233, 233, 233, 233, 233, 233, - 233, 233, 233, 233, 234, 234, 234, 234, - 234, 234, 234, 234, 234, 234, 234, 234, - 234, 235, 235, 235, 235, 235, 235, 235, - 235, 235, 235, 235, 235, 235, 236, 236, - 236, 236, 236, 236, 236, 236, 236, 236, - 236, 236, 236, 236, 237, 237, 237, 237, - 237, 237, 237, 237, 237, 237, 237, 237, - 237, 237, 238, 238, 238, 238, 238, 238, - 238, 238, 238, 238, 238, 238, 238, 238, - 239, 239, 239, 239, 239, 239, 239, 239, - 239, 239, 239, 239, 239, 239, 240, 240, - 240, 240, 240, 240, 240, 240, 240, 240, - 240, 240, 240, 240, 241, 241, 241, 241, - 241, 241, 241, 241, 241, 241, 241, 241, - 241, 241, 241, 242, 242, 242, 242, 242, - 242, 242, 242, 242, 242, 242, 242, 242, - 242, 242, 243, 243, 243, 243, 243, 243, - 243, 243, 243, 243, 243, 243, 243, 243, - 243, 244, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 244, - 245, 245, 245, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 245, 246, - 246, 246, 246, 246, 246, 246, 246, 246, - 246, 246, 246, 246, 246, 246, 246, 247, - 247, 247, 247, 247, 247, 247, 247, 247, - 247, 247, 247, 247, 247, 247, 247, 248, - 248, 248, 248, 248, 248, 248, 248, 248, - 248, 248, 248, 248, 248, 248, 248, 249, - 249, 249, 249, 249, 249, 249, 249, 249, - 249, 249, 249, 249, 249, 249, 249, 250, - 250, 250, 250, 250, 250, 250, 250, 250, - 250, 250, 250, 250, 250, 250, 250, 251, - 251, 251, 251, 251, 251, 251, 251, 251, - 251, 251, 251, 251, 251, 251, 251, 252, - 252, 252, 252, 252, 252, 252, 252, 252, - 252, 252, 252, 252, 252, 252, 252, 253, - 253, 253, 253, 253, 253, 253, 253, 253, - 253, 253, 253, 253, 253, 253, 253, 253, - 254, 254, 254, 254, 254, 254, 254, 254, - 254, 254, 254, 254, 254, 254, 254, 254, - 255, 255, 255, 255, 255, 255, 255, 255 -}; - -#else -#error "VAMEM version must be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}" -#endif - -void -ia_css_config_gamma_table(void) -{ -#if defined(HAS_VAMEM_VERSION_2) - memcpy(default_gamma_table.data.vamem_2, default_gamma_table_data, - sizeof(default_gamma_table_data)); - default_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_2; -#else - memcpy(default_gamma_table.data.vamem_1, default_gamma_table_data, - sizeof(default_gamma_table_data)); - default_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_1; -#endif -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h deleted file mode 100644 index 9686623..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h +++ /dev/null @@ -1,24 +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_GC_TABLE_HOST_H -#define __IA_CSS_GC_TABLE_HOST_H - -#include "ia_css_gc_types.h" - -extern struct ia_css_gamma_table default_gamma_table; - -void ia_css_config_gamma_table(void); - -#endif /* __IA_CSS_GC_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h deleted file mode 100644 index 594807f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h +++ /dev/null @@ -1,97 +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_GC_TYPES_H -#define __IA_CSS_GC_TYPES_H - -/* @file -* CSS-API header file for Gamma Correction parameters. -*/ - -#include "isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h" /* FIXME: Needed for ia_css_vamem_type */ - -/* Fractional bits for GAMMA gain */ -#define IA_CSS_GAMMA_GAIN_K_SHIFT 13 - -/* Number of elements in the gamma table. */ -#define IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE_LOG2 10 -#define IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE (1U<<IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE_LOG2) - -/* Number of elements in the gamma table. */ -#define IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE_LOG2 8 -#define IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE ((1U<<IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE_LOG2) + 1) - -/* Gamma table, used for Y(Luma) Gamma Correction. - * - * ISP block: GC1 (YUV Gamma Correction) - * ISP1: GC1 is used. - * (ISP2: GC2(sRGB Gamma Correction) is used.) - */ -/** IA_CSS_VAMEM_TYPE_1(ISP2300) or - IA_CSS_VAMEM_TYPE_2(ISP2400) */ -union ia_css_gc_data { - uint16_t vamem_1[IA_CSS_VAMEM_1_GAMMA_TABLE_SIZE]; - /** Y(Luma) Gamma table on vamem type 1. u0.8, [0,255] */ - uint16_t vamem_2[IA_CSS_VAMEM_2_GAMMA_TABLE_SIZE]; - /** Y(Luma) Gamma table on vamem type 2. u0.8, [0,255] */ -}; - -struct ia_css_gamma_table { - enum ia_css_vamem_type vamem_type; - union ia_css_gc_data data; -}; - -/* Gamma Correction configuration (used only for YUV Gamma Correction). - * - * ISP block: GC1 (YUV Gamma Correction) - * ISP1: GC1 is used. - * (ISP2: GC2 (sRGB Gamma Correction) is used.) - */ -struct ia_css_gc_config { - uint16_t gain_k1; /** Gain to adjust U after YUV Gamma Correction. - u0.16, [0,65535], - default/ineffective 19000(0.29) */ - uint16_t gain_k2; /** Gain to adjust V after YUV Gamma Correction. - u0.16, [0,65535], - default/ineffective 19000(0.29) */ -}; - -/* Chroma Enhancement configuration. - * - * This parameter specifies range of chroma output level. - * The standard range is [0,255] or [16,240]. - * - * ISP block: CE1 - * ISP1: CE1 is used. - * (ISP2: CE1 is not used.) - */ -struct ia_css_ce_config { - uint8_t uv_level_min; /** Minimum of chroma output level. - u0.8, [0,255], default/ineffective 0 */ - uint8_t uv_level_max; /** Maximum of chroma output level. - u0.8, [0,255], default/ineffective 255 */ -}; - -/* Multi-Axes Color Correction (MACC) configuration. - * - * ISP block: MACC2 (MACC by matrix and exponent(ia_css_macc_config)) - * (ISP1: MACC1 (MACC by only matrix) is used.) - * ISP2: MACC2 is used. - */ -struct ia_css_macc_config { - uint8_t exp; /** Common exponent of ia_css_macc_table. - u8.0, [0,13], default 1, ineffective 1 */ -}; - -#endif /* __IA_CSS_GC_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c deleted file mode 100644 index 0fb1a91..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c +++ /dev/null @@ -1,110 +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 "csc/csc_1.0/ia_css_csc.host.h" -#include "vamem.h" - -#include "ia_css_gc2.host.h" - -const struct ia_css_cc_config default_yuv2rgb_cc_config = { - 12, - {4096, -4096, 4096, 4096, 4096, 0, 4096, -4096, -4096} -}; - -const struct ia_css_cc_config default_rgb2yuv_cc_config = { - 13, - {2449, 4809, 934, -1382, -2714, 4096, 4096, -3430, -666} -}; - -void -ia_css_yuv2rgb_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size) -{ - ia_css_encode_cc(to, from, size); -} - -void -ia_css_rgb2yuv_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size) -{ - ia_css_encode_cc(to, from, size); -} - -void -ia_css_r_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->gc, &from->data, sizeof(to->gc)); -} - -void -ia_css_g_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->gc, &from->data, sizeof(to->gc)); -} - -void -ia_css_b_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->gc, &from->data, sizeof(to->gc)); -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_yuv2rgb_dump( - const struct sh_css_isp_csc_params *yuv2rgb, - unsigned level) -{ - ia_css_cc_dump(yuv2rgb, level, "YUV to RGB Conversion"); -} - -void -ia_css_rgb2yuv_dump( - const struct sh_css_isp_csc_params *rgb2yuv, - unsigned level) -{ - ia_css_cc_dump(rgb2yuv, level, "RGB to YUV Conversion"); -} - -void -ia_css_rgb_gamma_table_debug_dtrace( - const struct ia_css_rgb_gamma_table *config, - unsigned level) -{ - (void)config; - (void)level; -} -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h deleted file mode 100644 index ba140ee..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h +++ /dev/null @@ -1,79 +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_GC2_HOST_H -#define __IA_CSS_GC2_HOST_H - -#include "ia_css_gc2_types.h" -#include "ia_css_gc2_param.h" -#include "ia_css_gc2_table.host.h" - -extern const struct ia_css_cc_config default_yuv2rgb_cc_config; -extern const struct ia_css_cc_config default_rgb2yuv_cc_config; - -void -ia_css_yuv2rgb_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size); - -void -ia_css_rgb2yuv_encode( - struct sh_css_isp_csc_params *to, - const struct ia_css_cc_config *from, - unsigned size); - -void -ia_css_r_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size); - -void -ia_css_g_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size); - -void -ia_css_b_gamma_vamem_encode( - struct sh_css_isp_rgb_gamma_vamem_params *to, - const struct ia_css_rgb_gamma_table *from, - unsigned size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_yuv2rgb_dump( - const struct sh_css_isp_csc_params *yuv2rgb, - unsigned level); - -void -ia_css_rgb2yuv_dump( - const struct sh_css_isp_csc_params *rgb2yuv, - unsigned level); - -void -ia_css_rgb_gamma_table_debug_dtrace( - const struct ia_css_rgb_gamma_table *config, - unsigned level); - -#define ia_css_yuv2rgb_debug_dtrace ia_css_cc_config_debug_dtrace -#define ia_css_rgb2yuv_debug_dtrace ia_css_cc_config_debug_dtrace -#define ia_css_r_gamma_debug_dtrace ia_css_rgb_gamma_table_debug_dtrace -#define ia_css_g_gamma_debug_dtrace ia_css_rgb_gamma_table_debug_dtrace -#define ia_css_b_gamma_debug_dtrace ia_css_rgb_gamma_table_debug_dtrace - -#endif - -#endif /* __IA_CSS_GC2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h deleted file mode 100644 index d25239f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h +++ /dev/null @@ -1,43 +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_GC2_PARAM_H -#define __IA_CSS_GC2_PARAM_H - -#include "type_support.h" -/* Extend GC1 */ -#include "ia_css_gc2_types.h" -#include "gc/gc_1.0/ia_css_gc_param.h" -#include "csc/csc_1.0/ia_css_csc_param.h" - -#ifndef PIPE_GENERATION -#if defined(IS_VAMEM_VERSION_1) -#define SH_CSS_ISP_RGB_GAMMA_TABLE_SIZE IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE -#elif defined(IS_VAMEM_VERSION_2) -#define SH_CSS_ISP_RGB_GAMMA_TABLE_SIZE IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE -#else -#error "Undefined vamem version" -#endif - -#else -/* For pipe generation, the size is not relevant */ -#define SH_CSS_ISP_RGB_GAMMA_TABLE_SIZE 0 -#endif - -/* This should be vamem_data_t, but that breaks the pipe generator */ -struct sh_css_isp_rgb_gamma_vamem_params { - uint16_t gc[SH_CSS_ISP_RGB_GAMMA_TABLE_SIZE]; -}; - -#endif /* __IA_CSS_GC2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c deleted file mode 100644 index f14a66b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c +++ /dev/null @@ -1,132 +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 <type_support.h> -#include <string_support.h> /* memcpy */ -#include "system_global.h" -#include "vamem.h" -#include "ia_css_types.h" -#include "ia_css_gc2_table.host.h" - -struct ia_css_rgb_gamma_table default_r_gamma_table; -struct ia_css_rgb_gamma_table default_g_gamma_table; -struct ia_css_rgb_gamma_table default_b_gamma_table; - -/* Identical default gamma table for R, G, and B. */ - -#if defined(HAS_VAMEM_VERSION_2) - -static const uint16_t -default_gamma_table_data[IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE] = { - 0, 72, 144, 216, 288, 360, 426, 486, - 541, 592, 641, 687, 730, 772, 812, 850, - 887, 923, 958, 991, 1024, 1055, 1086, 1117, -1146, 1175, 1203, 1230, 1257, 1284, 1310, 1335, -1360, 1385, 1409, 1433, 1457, 1480, 1502, 1525, -1547, 1569, 1590, 1612, 1632, 1653, 1674, 1694, -1714, 1734, 1753, 1772, 1792, 1811, 1829, 1848, -1866, 1884, 1902, 1920, 1938, 1955, 1973, 1990, -2007, 2024, 2040, 2057, 2074, 2090, 2106, 2122, -2138, 2154, 2170, 2185, 2201, 2216, 2231, 2247, -2262, 2277, 2291, 2306, 2321, 2335, 2350, 2364, -2378, 2393, 2407, 2421, 2435, 2449, 2462, 2476, -2490, 2503, 2517, 2530, 2543, 2557, 2570, 2583, -2596, 2609, 2622, 2634, 2647, 2660, 2673, 2685, -2698, 2710, 2722, 2735, 2747, 2759, 2771, 2783, -2795, 2807, 2819, 2831, 2843, 2855, 2867, 2878, -2890, 2901, 2913, 2924, 2936, 2947, 2958, 2970, -2981, 2992, 3003, 3014, 3025, 3036, 3047, 3058, -3069, 3080, 3091, 3102, 3112, 3123, 3134, 3144, -3155, 3165, 3176, 3186, 3197, 3207, 3217, 3228, -3238, 3248, 3258, 3268, 3279, 3289, 3299, 3309, -3319, 3329, 3339, 3349, 3358, 3368, 3378, 3388, -3398, 3407, 3417, 3427, 3436, 3446, 3455, 3465, -3474, 3484, 3493, 3503, 3512, 3521, 3531, 3540, -3549, 3559, 3568, 3577, 3586, 3595, 3605, 3614, -3623, 3632, 3641, 3650, 3659, 3668, 3677, 3686, -3694, 3703, 3712, 3721, 3730, 3739, 3747, 3756, -3765, 3773, 3782, 3791, 3799, 3808, 3816, 3825, -3833, 3842, 3850, 3859, 3867, 3876, 3884, 3893, -3901, 3909, 3918, 3926, 3934, 3942, 3951, 3959, -3967, 3975, 3984, 3992, 4000, 4008, 4016, 4024, -4032, 4040, 4048, 4056, 4064, 4072, 4080, 4088, -4095 -}; -#elif defined(HAS_VAMEM_VERSION_1) - -static const uint16_t -default_gamma_table_data[IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE] = { - 0, 72, 144, 216, 288, 360, 426, 486, - 541, 592, 641, 687, 730, 772, 812, 850, - 887, 923, 958, 991, 1024, 1055, 1086, 1117, -1146, 1175, 1203, 1230, 1257, 1284, 1310, 1335, -1360, 1385, 1409, 1433, 1457, 1480, 1502, 1525, -1547, 1569, 1590, 1612, 1632, 1653, 1674, 1694, -1714, 1734, 1753, 1772, 1792, 1811, 1829, 1848, -1866, 1884, 1902, 1920, 1938, 1955, 1973, 1990, -2007, 2024, 2040, 2057, 2074, 2090, 2106, 2122, -2138, 2154, 2170, 2185, 2201, 2216, 2231, 2247, -2262, 2277, 2291, 2306, 2321, 2335, 2350, 2364, -2378, 2393, 2407, 2421, 2435, 2449, 2462, 2476, -2490, 2503, 2517, 2530, 2543, 2557, 2570, 2583, -2596, 2609, 2622, 2634, 2647, 2660, 2673, 2685, -2698, 2710, 2722, 2735, 2747, 2759, 2771, 2783, -2795, 2807, 2819, 2831, 2843, 2855, 2867, 2878, -2890, 2901, 2913, 2924, 2936, 2947, 2958, 2970, -2981, 2992, 3003, 3014, 3025, 3036, 3047, 3058, -3069, 3080, 3091, 3102, 3112, 3123, 3134, 3144, -3155, 3165, 3176, 3186, 3197, 3207, 3217, 3228, -3238, 3248, 3258, 3268, 3279, 3289, 3299, 3309, -3319, 3329, 3339, 3349, 3358, 3368, 3378, 3388, -3398, 3407, 3417, 3427, 3436, 3446, 3455, 3465, -3474, 3484, 3493, 3503, 3512, 3521, 3531, 3540, -3549, 3559, 3568, 3577, 3586, 3595, 3605, 3614, -3623, 3632, 3641, 3650, 3659, 3668, 3677, 3686, -3694, 3703, 3712, 3721, 3730, 3739, 3747, 3756, -3765, 3773, 3782, 3791, 3799, 3808, 3816, 3825, -3833, 3842, 3850, 3859, 3867, 3876, 3884, 3893, -3901, 3909, 3918, 3926, 3934, 3942, 3951, 3959, -3967, 3975, 3984, 3992, 4000, 4008, 4016, 4024, -4032, 4040, 4048, 4056, 4064, 4072, 4080, 4088 -}; -#else -#error "VAMEM version must be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}" -#endif - -void -ia_css_config_rgb_gamma_tables(void) -{ -#if defined(HAS_VAMEM_VERSION_2) - default_r_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_2; - default_g_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_2; - default_b_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_2; - memcpy(default_r_gamma_table.data.vamem_2, default_gamma_table_data, - sizeof(default_gamma_table_data)); - memcpy(default_g_gamma_table.data.vamem_2, default_gamma_table_data, - sizeof(default_gamma_table_data)); - memcpy(default_b_gamma_table.data.vamem_2, default_gamma_table_data, - sizeof(default_gamma_table_data)); -#else - memcpy(default_r_gamma_table.data.vamem_1, default_gamma_table_data, - sizeof(default_gamma_table_data)); - memcpy(default_g_gamma_table.data.vamem_1, default_gamma_table_data, - sizeof(default_gamma_table_data)); - memcpy(default_b_gamma_table.data.vamem_1, default_gamma_table_data, - sizeof(default_gamma_table_data)); - default_r_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_1; - default_g_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_1; - default_b_gamma_table.vamem_type = IA_CSS_VAMEM_TYPE_1; -#endif -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h deleted file mode 100644 index 8686e6e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h +++ /dev/null @@ -1,26 +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_GC2_TABLE_HOST_H -#define __IA_CSS_GC2_TABLE_HOST_H - -#include "ia_css_gc2_types.h" - -extern struct ia_css_rgb_gamma_table default_r_gamma_table; -extern struct ia_css_rgb_gamma_table default_g_gamma_table; -extern struct ia_css_rgb_gamma_table default_b_gamma_table; - -void ia_css_config_rgb_gamma_tables(void); - -#endif /* __IA_CSS_GC2_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h deleted file mode 100644 index fab7467..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h +++ /dev/null @@ -1,54 +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_GC2_TYPES_H -#define __IA_CSS_GC2_TYPES_H - -#include "isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h" /* FIXME: needed for ia_css_vamem_type */ - -/* @file -* CSS-API header file for Gamma Correction parameters. -*/ - -/* sRGB Gamma table, used for sRGB Gamma Correction. - * - * ISP block: GC2 (sRGB Gamma Correction) - * (ISP1: GC1(YUV Gamma Correction) is used.) - * ISP2: GC2 is used. - */ - -/* Number of elements in the sRGB gamma table. */ -#define IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE_LOG2 8 -#define IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE (1U<<IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE_LOG2) - -/* Number of elements in the sRGB gamma table. */ -#define IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE_LOG2 8 -#define IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE ((1U<<IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE_LOG2) + 1) - -/** IA_CSS_VAMEM_TYPE_1(ISP2300) or - IA_CSS_VAMEM_TYPE_2(ISP2400) */ -union ia_css_rgb_gamma_data { - uint16_t vamem_1[IA_CSS_VAMEM_1_RGB_GAMMA_TABLE_SIZE]; - /** RGB Gamma table on vamem type1. This table is not used, - because sRGB Gamma Correction is not implemented for ISP2300. */ - uint16_t vamem_2[IA_CSS_VAMEM_2_RGB_GAMMA_TABLE_SIZE]; - /** RGB Gamma table on vamem type2. u0.12, [0,4095] */ -}; - -struct ia_css_rgb_gamma_table { - enum ia_css_vamem_type vamem_type; - union ia_css_rgb_gamma_data data; -}; - -#endif /* __IA_CSS_GC2_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c deleted file mode 100644 index 8215ae4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ -/* Release Version: irci_ecr-master_20150911_0724 */ -/* - * 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_hdr.host.h" - -void -ia_css_hdr_init_config( - struct sh_css_isp_hdr_params *to, - const struct ia_css_hdr_config *from, - unsigned size) -{ - int i; - (void)size; - - for (i = 0; i < HDR_NUM_INPUT_FRAMES - 1; i++) { - to->irradiance.match_shift[i] = from->irradiance.match_shift[i]; - to->irradiance.match_mul[i] = from->irradiance.match_mul[i]; - to->irradiance.thr_low[i] = from->irradiance.thr_low[i]; - to->irradiance.thr_high[i] = from->irradiance.thr_high[i]; - to->irradiance.thr_coeff[i] = from->irradiance.thr_coeff[i]; - to->irradiance.thr_shift[i] = from->irradiance.thr_shift[i]; - } - to->irradiance.test_irr = from->irradiance.test_irr; - to->irradiance.weight_bpp = from->irradiance.weight_bpp; - - to->deghost.test_deg = from->deghost.test_deg; - to->exclusion.test_excl = from->exclusion.test_excl; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h deleted file mode 100644 index 8f89bc8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ -/* Release Version: irci_ecr-master_20150911_0724 */ -/* - * 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_HDR_HOST_H -#define __IA_CSS_HDR_HOST_H - -#include "ia_css_hdr_param.h" -#include "ia_css_hdr_types.h" - -extern const struct ia_css_hdr_config default_hdr_config; - -void -ia_css_hdr_init_config( - struct sh_css_isp_hdr_params *to, - const struct ia_css_hdr_config *from, - unsigned size); - -#endif /* __IA_CSS_HDR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h deleted file mode 100644 index 1c053af..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h +++ /dev/null @@ -1,53 +0,0 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ -/* Release Version: irci_ecr-master_20150911_0724 */ -/* - * 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_HDR_PARAMS_H -#define __IA_CSS_HDR_PARAMS_H - -#include "type_support.h" - -#define HDR_NUM_INPUT_FRAMES (3) - -/* HDR irradiance map parameters on ISP. */ -struct sh_css_hdr_irradiance_params { - int32_t test_irr; - int32_t match_shift[HDR_NUM_INPUT_FRAMES - 1]; /* Histogram matching shift parameter */ - int32_t match_mul[HDR_NUM_INPUT_FRAMES - 1]; /* Histogram matching multiplication parameter */ - int32_t thr_low[HDR_NUM_INPUT_FRAMES - 1]; /* Weight map soft threshold low bound parameter */ - int32_t thr_high[HDR_NUM_INPUT_FRAMES - 1]; /* Weight map soft threshold high bound parameter */ - int32_t thr_coeff[HDR_NUM_INPUT_FRAMES - 1]; /* Soft threshold linear function coefficient */ - int32_t thr_shift[HDR_NUM_INPUT_FRAMES - 1]; /* Soft threshold precision shift parameter */ - int32_t weight_bpp; /* Weight map bits per pixel */ -}; - -/* HDR deghosting parameters on ISP */ -struct sh_css_hdr_deghost_params { - int32_t test_deg; -}; - -/* HDR exclusion parameters on ISP */ -struct sh_css_hdr_exclusion_params { - int32_t test_excl; -}; - -/* HDR ISP parameters */ -struct sh_css_isp_hdr_params { - struct sh_css_hdr_irradiance_params irradiance; - struct sh_css_hdr_deghost_params deghost; - struct sh_css_hdr_exclusion_params exclusion; -}; - -#endif /* __IA_CSS_HDR_PARAMS_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h deleted file mode 100644 index 2646442..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ -/* Release Version: irci_ecr-master_20150911_0724 */ -/* - * 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_HDR_TYPES_H -#define __IA_CSS_HDR_TYPES_H - -#define IA_CSS_HDR_MAX_NUM_INPUT_FRAMES (3) - -/** - * \brief HDR Irradiance Parameters - * \detail Currently HDR paramters are used only for testing purposes - */ -struct ia_css_hdr_irradiance_params { - int test_irr; /** Test parameter */ - int match_shift[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Histogram matching shift parameter */ - int match_mul[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Histogram matching multiplication parameter */ - int thr_low[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Weight map soft threshold low bound parameter */ - int thr_high[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Weight map soft threshold high bound parameter */ - int thr_coeff[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Soft threshold linear function coefficien */ - int thr_shift[IA_CSS_HDR_MAX_NUM_INPUT_FRAMES - 1]; /** Soft threshold precision shift parameter */ - int weight_bpp; /** Weight map bits per pixel */ -}; - -/** - * \brief HDR Deghosting Parameters - * \detail Currently HDR paramters are used only for testing purposes - */ -struct ia_css_hdr_deghost_params { - int test_deg; /** Test parameter */ -}; - -/** - * \brief HDR Exclusion Parameters - * \detail Currently HDR paramters are used only for testing purposes - */ -struct ia_css_hdr_exclusion_params { - int test_excl; /** Test parameter */ -}; - -/** - * \brief HDR public paramterers. - * \details Struct with all paramters for HDR that can be seet from - * the CSS API. Currenly, only test paramters are defined. - */ -struct ia_css_hdr_config { - struct ia_css_hdr_irradiance_params irradiance; /** HDR irradiance paramaters */ - struct ia_css_hdr_deghost_params deghost; /** HDR deghosting parameters */ - struct ia_css_hdr_exclusion_params exclusion; /** HDR exclusion parameters */ -}; - -#endif /* __IA_CSS_HDR_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 100644 index a31c9e8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1,86 +0,0 @@ -#ifndef ISP2401 -/* - * 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_bayer_io.host.h" -#include "dma.h" -#include "math_support.h" -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" -#endif -#include "ia_css_isp_params.h" -#include "ia_css_frame.h" - -void -ia_css_bayer_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args) -{ - const struct ia_css_frame *in_frame = args->in_frame; - const struct ia_css_frame **out_frames = (const struct ia_css_frame **)& args->out_frame; - const struct ia_css_frame_info *in_frame_info = (in_frame) ? &in_frame->info : &binary->in_frame_info; - - const unsigned ddr_bits_per_element = sizeof(short) * 8; - const unsigned ddr_elems_per_word = ceil_div(HIVE_ISP_DDR_WORD_BITS, ddr_bits_per_element); - unsigned size_get = 0, size_put = 0; - unsigned offset = 0; - - if (binary->info->mem_offsets.offsets.param) { - size_get = binary->info->mem_offsets.offsets.param->dmem.get.size; - offset = binary->info->mem_offsets.offsets.param->dmem.get.offset; - } - - if (size_get) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() get part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, in_frame_info); - // The base_address of the input frame will be set in the ISP - to->width = in_frame_info->res.width; - to->height = in_frame_info->res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() get part leave:\n"); -#endif - } - - if (binary->info->mem_offsets.offsets.param) { - size_put = binary->info->mem_offsets.offsets.param->dmem.put.size; - offset = binary->info->mem_offsets.offsets.param->dmem.put.offset; - } - - if (size_put) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() put part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, &out_frames[0]->info); - to->base_address = out_frames[0]->data; - to->width = out_frames[0]->info.res.width; - to->height = out_frames[0]->info.res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; - -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() put part leave:\n"); -#endif - } -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 100644 index 7e5d4cf..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef ISP2401 -/* - * 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 __BAYER_IO_HOST_H -#define __BAYER_IO_HOST_H - -#include "ia_css_bayer_io_param.h" -#include "ia_css_bayer_io_types.h" -#include "ia_css_binary.h" -#include "sh_css_internal.h" - - -void -ia_css_bayer_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args); - -#endif /*__BAYER_IO_HOST_H */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 100644 index 7b6f581..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISP2401 -/* - * 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_BAYER_IO_PARAM -#define __IA_CSS_BAYER_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif /* __IA_CSS_BAYER_IO_PARAM */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 100644 index 2291b01..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISP2401 -/* - * 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_BAYER_IO_TYPES_H -#define __IA_CSS_BAYER_IO_TYPES_H - -#include "../common/ia_css_common_io_types.h" - -#endif /* __IA_CSS_BAYER_IO_TYPES_H */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h deleted file mode 100644 index f1ce03a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISP2401 -/* - * 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_COMMON_IO_PARAM -#define __IA_CSS_COMMON_IO_PARAM - -#include "../common/ia_css_common_io_types.h" - -#endif /* __IA_CSS_COMMON_IO_PARAM */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h deleted file mode 100644 index 8a9a970..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef ISP2401 -/* - * 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_COMMON_IO_TYPES -#define __IA_CSS_COMMON_IO_TYPES - -#define MAX_IO_DMA_CHANNELS 2 - -struct ia_css_common_io_config { - unsigned base_address; - unsigned width; - unsigned height; - unsigned stride; - unsigned ddr_elems_per_word; - unsigned dma_channel[MAX_IO_DMA_CHANNELS]; -}; - -#endif /* __IA_CSS_COMMON_IO_TYPES */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 100644 index 91fb516..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISP2401 -/* - * 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_YUV444_IO_PARAM -#define __IA_CSS_YUV444_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 100644 index dac4403..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef ISP2401 -/* - * 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_YUV444_IO_TYPES -#define __IA_CSS_YUV444_IO_TYPES - -#include "../common/ia_css_common_io_types.h" - -#endif -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 100644 index f80480c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1,86 +0,0 @@ -#ifdef ISP2401 -/* -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_bayer_io.host.h" -#include "dma.h" -#include "math_support.h" -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" -#endif -#include "ia_css_isp_params.h" -#include "ia_css_frame.h" - -void -ia_css_bayer_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args) -{ - const struct ia_css_frame *in_frame = args->in_frame; - const struct ia_css_frame **out_frames = (const struct ia_css_frame **)& args->out_frame; - const struct ia_css_frame_info *in_frame_info = (in_frame) ? &in_frame->info : &binary->in_frame_info; - - const unsigned ddr_bits_per_element = sizeof(short) * 8; - const unsigned ddr_elems_per_word = ceil_div(HIVE_ISP_DDR_WORD_BITS, ddr_bits_per_element); - unsigned size_get = 0, size_put = 0; - unsigned offset = 0; - - if (binary->info->mem_offsets.offsets.param) { - size_get = binary->info->mem_offsets.offsets.param->dmem.get.size; - offset = binary->info->mem_offsets.offsets.param->dmem.get.offset; - } - - if (size_get) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() get part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, in_frame_info); - // The base_address of the input frame will be set in the ISP - to->width = in_frame_info->res.width; - to->height = in_frame_info->res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() get part leave:\n"); -#endif - } - - if (binary->info->mem_offsets.offsets.param) { - size_put = binary->info->mem_offsets.offsets.param->dmem.put.size; - offset = binary->info->mem_offsets.offsets.param->dmem.put.offset; - } - - if (size_put) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() put part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, &out_frames[0]->info); - to->base_address = out_frames[0]->data; - to->width = out_frames[0]->info.res.width; - to->height = out_frames[0]->info.res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; - -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_bayer_io_config() put part leave:\n"); -#endif - } -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 100644 index ab9fa31..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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 __BAYER_IO_HOST_H -#define __BAYER_IO_HOST_H - -#include "ia_css_bayer_io_param.h" -#include "ia_css_bayer_io_types.h" -#include "ia_css_binary.h" -#include "sh_css_internal.h" - - -void -ia_css_bayer_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args); - -#endif /*__BAYER_IO_HOST_H */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 100644 index bf5a3ec..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_BAYER_IO_PARAM -#define __IA_CSS_BAYER_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif /* __IA_CSS_BAYER_IO_PARAM */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 100644 index 9e3c622..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_BAYER_IO_TYPES_H -#define __IA_CSS_BAYER_IO_TYPES_H - -#include "../common/ia_css_common_io_types.h" - -#endif /* __IA_CSS_BAYER_IO_TYPES_H */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h deleted file mode 100644 index e5fdcff..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_COMMON_IO_PARAM -#define __IA_CSS_COMMON_IO_PARAM - -#include "../common/ia_css_common_io_types.h" - -#endif /* __IA_CSS_COMMON_IO_PARAM */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h deleted file mode 100644 index 0a19e2d..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_COMMON_IO_TYPES -#define __IA_CSS_COMMON_IO_TYPES - -#define MAX_IO_DMA_CHANNELS 3 - -struct ia_css_common_io_config { - unsigned base_address; - unsigned width; - unsigned height; - unsigned stride; - unsigned ddr_elems_per_word; - unsigned dma_channel[MAX_IO_DMA_CHANNELS]; -}; - -#endif /* __IA_CSS_COMMON_IO_TYPES */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c deleted file mode 100644 index eb9e943..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c +++ /dev/null @@ -1,86 +0,0 @@ -#ifdef ISP2401 -/* -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_yuv444_io.host.h" -#include "dma.h" -#include "math_support.h" -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" -#endif -#include "ia_css_isp_params.h" -#include "ia_css_frame.h" - -void -ia_css_yuv444_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args) -{ - const struct ia_css_frame *in_frame = args->in_frame; - const struct ia_css_frame **out_frames = (const struct ia_css_frame **)& args->out_frame; - const struct ia_css_frame_info *in_frame_info = (in_frame) ? &in_frame->info : &binary->in_frame_info; - - const unsigned ddr_bits_per_element = sizeof(short) * 8; - const unsigned ddr_elems_per_word = ceil_div(HIVE_ISP_DDR_WORD_BITS, ddr_bits_per_element); - unsigned size_get = 0, size_put = 0; - unsigned offset = 0; - - if (binary->info->mem_offsets.offsets.param) { - size_get = binary->info->mem_offsets.offsets.param->dmem.get.size; - offset = binary->info->mem_offsets.offsets.param->dmem.get.offset; - } - - if (size_get) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_yuv444_io_config() get part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, in_frame_info); - // The base_address of the input frame will be set in the ISP - to->width = in_frame_info->res.width; - to->height = in_frame_info->res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_yuv444_io_config() get part leave:\n"); -#endif - } - - if (binary->info->mem_offsets.offsets.param) { - size_put = binary->info->mem_offsets.offsets.param->dmem.put.size; - offset = binary->info->mem_offsets.offsets.param->dmem.put.offset; - } - - if (size_put) { - struct ia_css_common_io_config *to = (struct ia_css_common_io_config *)&binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset]; - struct dma_port_config config; -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_yuv444_io_config() put part enter:\n"); -#endif - - ia_css_dma_configure_from_info(&config, &out_frames[0]->info); - to->base_address = out_frames[0]->data; - to->width = out_frames[0]->info.res.width; - to->height = out_frames[0]->info.res.height; - to->stride = config.stride; - to->ddr_elems_per_word = ddr_elems_per_word; - -#ifndef IA_CSS_NO_DEBUG - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_yuv444_io_config() put part leave:\n"); -#endif - } -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h deleted file mode 100644 index 480172d..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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 __YUV444_IO_HOST_H -#define __YUV444_IO_HOST_H - -#include "ia_css_yuv444_io_param.h" -#include "ia_css_yuv444_io_types.h" -#include "ia_css_binary.h" -#include "sh_css_internal.h" - - -void -ia_css_yuv444_io_config( - const struct ia_css_binary *binary, - const struct sh_css_binary_args *args); - -#endif /*__YUV44_IO_HOST_H */ -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 100644 index cc8eda1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_YUV444_IO_PARAM -#define __IA_CSS_YUV444_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 100644 index 343325a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_YUV444_IO_TYPES -#define __IA_CSS_YUV444_IO_TYPES - -#include "../common/ia_css_common_io_types.h" - -#endif -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c deleted file mode 100644 index 9e41cc0..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c +++ /dev/null @@ -1,80 +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_iterator.host.h" -#include "ia_css_frame_public.h" -#include "ia_css_binary.h" -#include "ia_css_err.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" - -static const struct ia_css_iterator_configuration default_config = { - .input_info = (struct ia_css_frame_info *)NULL, -}; - -void -ia_css_iterator_config( - struct sh_css_isp_iterator_isp_config *to, - const struct ia_css_iterator_configuration *from, - unsigned size) -{ - (void)size; - ia_css_frame_info_to_frame_sp_info(&to->input_info, from->input_info); - ia_css_frame_info_to_frame_sp_info(&to->internal_info, from->internal_info); - ia_css_frame_info_to_frame_sp_info(&to->output_info, from->output_info); - ia_css_frame_info_to_frame_sp_info(&to->vf_info, from->vf_info); - ia_css_resolution_to_sp_resolution(&to->dvs_envelope, from->dvs_envelope); -} - -enum ia_css_err -ia_css_iterator_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *in_info) -{ - struct ia_css_frame_info my_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO; - struct ia_css_iterator_configuration config = default_config; - - config.input_info = &binary->in_frame_info; - config.internal_info = &binary->internal_frame_info; - config.output_info = &binary->out_frame_info[0]; - config.vf_info = &binary->vf_frame_info; - config.dvs_envelope = &binary->dvs_envelope; - - /* Use in_info iso binary->in_frame_info. - * They can differ in padded width in case of scaling, e.g. for capture_pp. - * Find out why. - */ - if (in_info) - config.input_info = in_info; - if (binary->out_frame_info[0].res.width == 0) - config.output_info = &binary->out_frame_info[1]; - my_info = *config.output_info; - config.output_info = &my_info; - /* we do this only for preview pipe because in fill_binary_info function - * we assign vf_out res to out res, but for ISP internal processing, we need - * the original out res. for video pipe, it has two output pins --- out and - * vf_out, so it can keep these two resolutions already. */ - if (binary->info->sp.pipeline.mode == IA_CSS_BINARY_MODE_PREVIEW && - binary->vf_downscale_log2 > 0) { - /* TODO: Remove this after preview output decimation is fixed - * by configuring out&vf info files properly */ - my_info.padded_width <<= binary->vf_downscale_log2; - my_info.res.width <<= binary->vf_downscale_log2; - my_info.res.height <<= binary->vf_downscale_log2; - } - - ia_css_configure_iterator(binary, &config); - - return IA_CSS_SUCCESS; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h deleted file mode 100644 index d8f249c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h +++ /dev/null @@ -1,34 +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_ITERATOR_HOST_H -#define __IA_CSS_ITERATOR_HOST_H - -#include "ia_css_frame_public.h" -#include "ia_css_binary.h" -#include "ia_css_err.h" -#include "ia_css_iterator_param.h" - -void -ia_css_iterator_config( - struct sh_css_isp_iterator_isp_config *to, - const struct ia_css_iterator_configuration *from, - unsigned size); - -enum ia_css_err -ia_css_iterator_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *in_info); - -#endif /* __IA_CSS_ITERATOR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h deleted file mode 100644 index d308126..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h +++ /dev/null @@ -1,38 +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_ITERATOR_PARAM_H -#define __IA_CSS_ITERATOR_PARAM_H - -#include "ia_css_types.h" /* ia_css_resolution */ -#include "ia_css_frame_public.h" /* ia_css_frame_info */ -#include "ia_css_frame_comm.h" /* ia_css_frame_sp_info */ - -struct ia_css_iterator_configuration { - const struct ia_css_frame_info *input_info; - const struct ia_css_frame_info *internal_info; - const struct ia_css_frame_info *output_info; - const struct ia_css_frame_info *vf_info; - const struct ia_css_resolution *dvs_envelope; -}; - -struct sh_css_isp_iterator_isp_config { - struct ia_css_frame_sp_info input_info; - struct ia_css_frame_sp_info internal_info; - struct ia_css_frame_sp_info output_info; - struct ia_css_frame_sp_info vf_info; - struct ia_css_sp_resolution dvs_envelope; -}; - -#endif /* __IA_CSS_ITERATOR_PARAM_H */ 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 5ddf61f..0000000 --- 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 53ef18f..0000000 --- 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 41a2da4..0000000 --- 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 89714bf..0000000 --- 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 10a50aa..0000000 --- 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 9cd31c2..0000000 --- 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 */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c deleted file mode 100644 index 1f7e9e4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c +++ /dev/null @@ -1,49 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" - -#include "ia_css_macc.host.h" - -const struct ia_css_macc_config default_macc_config = { - 1, -}; - -void -ia_css_macc_encode( - struct sh_css_isp_macc_params *to, - const struct ia_css_macc_config *from, - unsigned size) -{ - (void)size; - to->exp = from->exp; -} - -void -ia_css_macc_dump( - const struct sh_css_isp_macc_params *macc, - unsigned level); - -void -ia_css_macc_debug_dtrace( - const struct ia_css_macc_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.exp=%d\n", - config->exp); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h deleted file mode 100644 index 044b01d..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h +++ /dev/null @@ -1,42 +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_MACC_HOST_H -#define __IA_CSS_MACC_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_macc_param.h" -#include "ia_css_macc_table.host.h" - -extern const struct ia_css_macc_config default_macc_config; - -void -ia_css_macc_encode( - struct sh_css_isp_macc_params *to, - const struct ia_css_macc_config *from, - unsigned size); - - -void -ia_css_macc_dump( - const struct sh_css_isp_macc_params *macc, - unsigned level); - -void -ia_css_macc_debug_dtrace( - const struct ia_css_macc_config *config, - unsigned level); - -#endif /* __IA_CSS_MACC_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h deleted file mode 100644 index 6a12b92..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h +++ /dev/null @@ -1,25 +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_MACC_PARAM_H -#define __IA_CSS_MACC_PARAM_H - -#include "type_support.h" - -/* MACC */ -struct sh_css_isp_macc_params { - int32_t exp; -}; - -#endif /* __IA_CSS_MACC_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c deleted file mode 100644 index 8a6c3ca..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c +++ /dev/null @@ -1,47 +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_macc_table.host.h" - -/* Multi-Axes Color Correction table for ISP1. - * 64values = 2x2matrix for 16area, [s2.13] - * ineffective: 16 of "identity 2x2 matix" {8192,0,0,8192} - */ -const struct ia_css_macc_table default_macc_table = { - { 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192, - 8192, 0, 0, 8192, 8192, 0, 0, 8192 } -}; - -/* 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_macc_table default_macc2_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/macc_1.0/ia_css_macc_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h deleted file mode 100644 index 96d62c9..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h +++ /dev/null @@ -1,23 +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_MACC_TABLE_HOST_H -#define __IA_CSS_MACC_TABLE_HOST_H - -#include "ia_css_macc_types.h" - -extern const struct ia_css_macc_table default_macc_table; -extern const struct ia_css_macc_table default_macc2_table; - -#endif /* __IA_CSS_MACC_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h deleted file mode 100644 index 2c9e5a8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h +++ /dev/null @@ -1,63 +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_MACC_TYPES_H -#define __IA_CSS_MACC_TYPES_H - -/* @file -* CSS-API header file for Multi-Axis Color Correction (MACC) parameters. -*/ - -/* 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 -/* The number of planes in the morphing table. */ - -/* Multi-Axis Color Correction (MACC) table. - * - * ISP block: MACC1 (MACC by only matrix) - * MACC2 (MACC by matrix and exponent(ia_css_macc_config)) - * ISP1: MACC1 is used. - * ISP2: MACC2 is used. - * - * [MACC1] - * 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 - * - * [MACC2] - * 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_macc_table { - int16_t data[IA_CSS_MACC_NUM_COEFS * IA_CSS_MACC_NUM_AXES]; - /** 16 of 2x2 matix - MACC1: s2.13, [-65536,65535] - default/ineffective: - 16 of "identity 2x2 matix" {8192,0,0,8192} - MACC2: s[macc_config.exp].[13-macc_config.exp], [-8192,8191] - default/ineffective: (s1.12) - 16 of "identity 2x2 matix" {4096,0,0,4096} */ -}; - -#endif /* __IA_CSS_MACC_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c deleted file mode 100644 index 2c2c5a5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c +++ /dev/null @@ -1,16 +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_norm.host.h" - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h deleted file mode 100644 index 42b5143..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h +++ /dev/null @@ -1,20 +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_NORM_HOST_H -#define __IA_CSS_NORM_HOST_H - -#include "ia_css_norm_param.h" - -#endif /* __IA_CSS_NORM_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h deleted file mode 100644 index 85dc6fc0..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h +++ /dev/null @@ -1,19 +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_NORM_PARAM_H -#define __IA_CSS_NORM_PARAM_H - - -#endif /* __IA_CSS_NORM_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c deleted file mode 100644 index f77aff1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c +++ /dev/null @@ -1,79 +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" -#include "sh_css_frac.h" -#ifndef IA_CSS_NO_DEBUG -#include "ia_css_debug.h" -#endif -#include "isp.h" -#include "ia_css_ob2.host.h" - -const struct ia_css_ob2_config default_ob2_config = { - 0, - 0, - 0, - 0 -}; - -void -ia_css_ob2_encode( - struct sh_css_isp_ob2_params *to, - const struct ia_css_ob2_config *from, - unsigned size) -{ - (void)size; - - /* Blacklevels types are u0_16 */ - to->blacklevel_gr = uDIGIT_FITTING(from->level_gr, 16, SH_CSS_BAYER_BITS); - to->blacklevel_r = uDIGIT_FITTING(from->level_r, 16, SH_CSS_BAYER_BITS); - to->blacklevel_b = uDIGIT_FITTING(from->level_b, 16, SH_CSS_BAYER_BITS); - to->blacklevel_gb = uDIGIT_FITTING(from->level_gb, 16, SH_CSS_BAYER_BITS); -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_ob2_dump( - const struct sh_css_isp_ob2_params *ob2, - unsigned level) -{ - if (!ob2) - return; - - ia_css_debug_dtrace(level, "Optical Black 2:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob2_blacklevel_gr", ob2->blacklevel_gr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob2_blacklevel_r", ob2->blacklevel_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob2_blacklevel_b", ob2->blacklevel_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob2_blacklevel_gb", ob2->blacklevel_gb); - -} - - -void -ia_css_ob2_debug_dtrace( - const struct ia_css_ob2_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.level_gr=%d, config.level_r=%d, " - "config.level_b=%d, config.level_gb=%d, ", - config->level_gr, config->level_r, - config->level_b, config->level_gb); -} -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h deleted file mode 100644 index 0684650..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h +++ /dev/null @@ -1,40 +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_OB2_HOST_H -#define __IA_CSS_OB2_HOST_H - -#include "ia_css_ob2_types.h" -#include "ia_css_ob2_param.h" - -extern const struct ia_css_ob2_config default_ob2_config; - -void -ia_css_ob2_encode( - struct sh_css_isp_ob2_params *to, - const struct ia_css_ob2_config *from, - unsigned size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_ob2_dump( - const struct sh_css_isp_ob2_params *ob2, - unsigned level); - -void -ia_css_ob2_debug_dtrace( - const struct ia_css_ob2_config *config, unsigned level); -#endif - -#endif /* __IA_CSS_OB2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h deleted file mode 100644 index 5c21d6a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h +++ /dev/null @@ -1,29 +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_OB2_PARAM_H -#define __IA_CSS_OB2_PARAM_H - -#include "type_support.h" - - -/* OB2 (Optical Black) */ -struct sh_css_isp_ob2_params { - int32_t blacklevel_gr; - int32_t blacklevel_r; - int32_t blacklevel_b; - int32_t blacklevel_gb; -}; - -#endif /* __IA_CSS_OB2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h deleted file mode 100644 index d981394..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h +++ /dev/null @@ -1,45 +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_OB2_TYPES_H -#define __IA_CSS_OB2_TYPES_H - -/* @file -* CSS-API header file for Optical Black algorithm parameters. -*/ - -/* Optical Black configuration - * - * ISP2.6.1: OB2 is used. - */ - -#include "ia_css_frac.h" - -struct ia_css_ob2_config { - ia_css_u0_16 level_gr; /** Black level for GR pixels. - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_r; /** Black level for R pixels. - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_b; /** Black level for B pixels. - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_gb; /** Black level for GB pixels. - u0.16, [0,65535], - default/ineffective 0 */ -}; - -#endif /* __IA_CSS_OB2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c deleted file mode 100644 index fd891ac..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c +++ /dev/null @@ -1,159 +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" -#include "ia_css_debug.h" -#include "isp.h" - -#include "ia_css_ob.host.h" - -const struct ia_css_ob_config default_ob_config = { - IA_CSS_OB_MODE_NONE, - 0, - 0, - 0, - 0, - 0, - 0 -}; - -/* TODO: include ob.isp.h to get isp knowledge and - add assert on platform restrictions */ - -void -ia_css_ob_configure( - struct sh_css_isp_ob_stream_config *config, - unsigned int isp_pipe_version, - unsigned int raw_bit_depth) -{ - config->isp_pipe_version = isp_pipe_version; - config->raw_bit_depth = raw_bit_depth; -} - -void -ia_css_ob_encode( - struct sh_css_isp_ob_params *to, - const struct ia_css_ob_config *from, - const struct sh_css_isp_ob_stream_config *config, - unsigned size) -{ - unsigned int ob_bit_depth - = config->isp_pipe_version == 2 ? SH_CSS_BAYER_BITS : config->raw_bit_depth; - unsigned int scale = 16 - ob_bit_depth; - - (void)size; - switch (from->mode) { - case IA_CSS_OB_MODE_FIXED: - to->blacklevel_gr = from->level_gr >> scale; - to->blacklevel_r = from->level_r >> scale; - to->blacklevel_b = from->level_b >> scale; - to->blacklevel_gb = from->level_gb >> scale; - to->area_start_bq = 0; - to->area_length_bq = 0; - to->area_length_bq_inverse = 0; - break; - case IA_CSS_OB_MODE_RASTER: - to->blacklevel_gr = 0; - to->blacklevel_r = 0; - to->blacklevel_b = 0; - to->blacklevel_gb = 0; - to->area_start_bq = from->start_position; - to->area_length_bq = - (from->end_position - from->start_position) + 1; - to->area_length_bq_inverse = AREA_LENGTH_UNIT / to->area_length_bq; - break; - default: - to->blacklevel_gr = 0; - to->blacklevel_r = 0; - to->blacklevel_b = 0; - to->blacklevel_gb = 0; - to->area_start_bq = 0; - to->area_length_bq = 0; - to->area_length_bq_inverse = 0; - break; - } -} - -void -ia_css_ob_vmem_encode( - struct sh_css_isp_ob_vmem_params *to, - const struct ia_css_ob_config *from, - const struct sh_css_isp_ob_stream_config *config, - unsigned size) -{ - struct sh_css_isp_ob_params tmp; - struct sh_css_isp_ob_params *ob = &tmp; - - (void)size; - ia_css_ob_encode(&tmp, from, config, sizeof(tmp)); - - { - unsigned i; - unsigned sp_obarea_start_bq = ob->area_start_bq; - unsigned sp_obarea_length_bq = ob->area_length_bq; - unsigned low = sp_obarea_start_bq; - unsigned high = low + sp_obarea_length_bq; - uint16_t all_ones = ~0; - - for (i = 0; i < OBAREA_MASK_SIZE; i++) { - if (i >= low && i < high) - to->vmask[i/ISP_VEC_NELEMS][i%ISP_VEC_NELEMS] = all_ones; - else - to->vmask[i/ISP_VEC_NELEMS][i%ISP_VEC_NELEMS] = 0; - } - } -} - -void -ia_css_ob_dump( - const struct sh_css_isp_ob_params *ob, - unsigned level) -{ - if (!ob) return; - ia_css_debug_dtrace(level, "Optical Black:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob_blacklevel_gr", ob->blacklevel_gr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob_blacklevel_r", ob->blacklevel_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob_blacklevel_b", ob->blacklevel_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ob_blacklevel_gb", ob->blacklevel_gb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "obarea_start_bq", ob->area_start_bq); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "obarea_length_bq", ob->area_length_bq); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "obarea_length_bq_inverse", - ob->area_length_bq_inverse); -} - - -void -ia_css_ob_debug_dtrace( - const struct ia_css_ob_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.mode=%d, " - "config.level_gr=%d, config.level_r=%d, " - "config.level_b=%d, config.level_gb=%d, " - "config.start_position=%d, config.end_position=%d\n", - config->mode, - config->level_gr, config->level_r, - config->level_b, config->level_gb, - config->start_position, config->end_position); -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h deleted file mode 100644 index 4af1814..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h +++ /dev/null @@ -1,53 +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_OB_HOST_H -#define __IA_CSS_OB_HOST_H - -#include "ia_css_ob_types.h" -#include "ia_css_ob_param.h" - -extern const struct ia_css_ob_config default_ob_config; - -void -ia_css_ob_configure( - struct sh_css_isp_ob_stream_config *config, - unsigned int isp_pipe_version, - unsigned int raw_bit_depth); - -void -ia_css_ob_encode( - struct sh_css_isp_ob_params *to, - const struct ia_css_ob_config *from, - const struct sh_css_isp_ob_stream_config *config, - unsigned size); - -void -ia_css_ob_vmem_encode( - struct sh_css_isp_ob_vmem_params *to, - const struct ia_css_ob_config *from, - const struct sh_css_isp_ob_stream_config *config, - unsigned size); - -void -ia_css_ob_dump( - const struct sh_css_isp_ob_params *ob, - unsigned level); - -void -ia_css_ob_debug_dtrace( - const struct ia_css_ob_config *config, unsigned level) -; - -#endif /* __IA_CSS_OB_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h deleted file mode 100644 index a60a644..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h +++ /dev/null @@ -1,48 +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_OB_PARAM_H -#define __IA_CSS_OB_PARAM_H - -#include "type_support.h" -#include "vmem.h" - -#define OBAREA_MASK_SIZE 64 -#define OBAREA_LENGTHBQ_INVERSE_SHIFT 12 - -/* AREA_LENGTH_UNIT is dependent on NWAY, requires rewrite */ -#define AREA_LENGTH_UNIT (1<<12) - - -/* OB (Optical Black) */ -struct sh_css_isp_ob_stream_config { - unsigned isp_pipe_version; - unsigned raw_bit_depth; -}; - -struct sh_css_isp_ob_params { - int32_t blacklevel_gr; - int32_t blacklevel_r; - int32_t blacklevel_b; - int32_t blacklevel_gb; - int32_t area_start_bq; - int32_t area_length_bq; - int32_t area_length_bq_inverse; -}; - -struct sh_css_isp_ob_vmem_params { - VMEM_ARRAY(vmask, OBAREA_MASK_SIZE); -}; - -#endif /* __IA_CSS_OB_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h deleted file mode 100644 index a9717b8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h +++ /dev/null @@ -1,69 +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_OB_TYPES_H -#define __IA_CSS_OB_TYPES_H - -/* @file -* CSS-API header file for Optical Black level parameters. -*/ - -#include "ia_css_frac.h" - -/* Optical black mode. - */ -enum ia_css_ob_mode { - IA_CSS_OB_MODE_NONE, /** OB has no effect. */ - IA_CSS_OB_MODE_FIXED, /** Fixed OB */ - IA_CSS_OB_MODE_RASTER /** Raster OB */ -}; - -/* Optical Black level configuration. - * - * ISP block: OB1 - * ISP1: OB1 is used. - * ISP2: OB1 is used. - */ -struct ia_css_ob_config { - enum ia_css_ob_mode mode; /** Mode (None / Fixed / Raster). - enum, [0,2], - default 1, ineffective 0 */ - ia_css_u0_16 level_gr; /** Black level for GR pixels - (used for Fixed Mode only). - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_r; /** Black level for R pixels - (used for Fixed Mode only). - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_b; /** Black level for B pixels - (used for Fixed Mode only). - u0.16, [0,65535], - default/ineffective 0 */ - ia_css_u0_16 level_gb; /** Black level for GB pixels - (used for Fixed Mode only). - u0.16, [0,65535], - default/ineffective 0 */ - uint16_t start_position; /** Start position of OB area - (used for Raster Mode only). - u16.0, [0,63], - default/ineffective 0 */ - uint16_t end_position; /** End position of OB area - (used for Raster Mode only). - u16.0, [0,63], - default/ineffective 0 */ -}; - -#endif /* __IA_CSS_OB_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c deleted file mode 100644 index 9efe5e5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c +++ /dev/null @@ -1,162 +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_frame.h" -#include "ia_css_debug.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "ia_css_output.host.h" -#include "isp.h" - -#include "assert_support.h" - -const struct ia_css_output_config default_output_config = { - 0, - 0 -}; - -static const struct ia_css_output_configuration default_output_configuration = { - .info = (struct ia_css_frame_info *)NULL, -}; - -static const struct ia_css_output0_configuration default_output0_configuration = { - .info = (struct ia_css_frame_info *)NULL, -}; - -static const struct ia_css_output1_configuration default_output1_configuration = { - .info = (struct ia_css_frame_info *)NULL, -}; - -void -ia_css_output_encode( - struct sh_css_isp_output_params *to, - const struct ia_css_output_config *from, - unsigned size) -{ - (void)size; - to->enable_hflip = from->enable_hflip; - to->enable_vflip = from->enable_vflip; -} - -void -ia_css_output_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, from->info); - to->width_a_over_b = elems_a / to->port_b.elems; - to->height = from->info ? from->info->res.height : 0; - to->enable = from->info != NULL; - ia_css_frame_info_to_frame_sp_info(&to->info, from->info); - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); -} - -void -ia_css_output0_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output0_configuration *from, - unsigned size) -{ - ia_css_output_config ( - to, (const struct ia_css_output_configuration *)from, size); -} - -void -ia_css_output1_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output1_configuration *from, - unsigned size) -{ - ia_css_output_config ( - to, (const struct ia_css_output_configuration *)from, size); -} - -void -ia_css_output_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - if (NULL != info) { - struct ia_css_output_configuration config = - default_output_configuration; - - config.info = info; - - ia_css_configure_output(binary, &config); - } -} - -void -ia_css_output0_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - if (NULL != info) { - struct ia_css_output0_configuration config = - default_output0_configuration; - - config.info = info; - - ia_css_configure_output0(binary, &config); - } -} - -void -ia_css_output1_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - - if (NULL != info) { - struct ia_css_output1_configuration config = - default_output1_configuration; - - config.info = info; - - ia_css_configure_output1(binary, &config); - } -} - -void -ia_css_output_dump( - const struct sh_css_isp_output_params *output, - unsigned level) -{ - if (!output) return; - ia_css_debug_dtrace(level, "Horizontal Output Flip:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "enable", output->enable_hflip); - ia_css_debug_dtrace(level, "Vertical Output Flip:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "enable", output->enable_vflip); -} - -void -ia_css_output_debug_dtrace( - const struct ia_css_output_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.enable_hflip=%d", - config->enable_hflip); - ia_css_debug_dtrace(level, - "config.enable_vflip=%d", - config->enable_vflip); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h deleted file mode 100644 index 530f934..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h +++ /dev/null @@ -1,75 +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_OUTPUT_HOST_H -#define __IA_CSS_OUTPUT_HOST_H - -#include "ia_css_frame_public.h" -#include "ia_css_binary.h" - -#include "ia_css_output_types.h" -#include "ia_css_output_param.h" - -extern const struct ia_css_output_config default_output_config; - -void -ia_css_output_encode( - struct sh_css_isp_output_params *to, - const struct ia_css_output_config *from, - unsigned size); - -void -ia_css_output_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output_configuration *from, - unsigned size); - -void -ia_css_output0_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output0_configuration *from, - unsigned size); - -void -ia_css_output1_config( - struct sh_css_isp_output_isp_config *to, - const struct ia_css_output1_configuration *from, - unsigned size); - -void -ia_css_output_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -void -ia_css_output0_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -void -ia_css_output1_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -void -ia_css_output_dump( - const struct sh_css_isp_output_params *output, - unsigned level); - -void -ia_css_output_debug_dtrace( - const struct ia_css_output_config *config, - unsigned level); - -#endif /* __IA_CSS_OUTPUT_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h deleted file mode 100644 index eb7defa..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h +++ /dev/null @@ -1,36 +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_OUTPUT_PARAM_H -#define __IA_CSS_OUTPUT_PARAM_H - -#include <type_support.h> -#include "dma.h" -#include "ia_css_frame_comm.h" /* ia_css_frame_sp_info */ - -/* output frame */ -struct sh_css_isp_output_isp_config { - uint32_t width_a_over_b; - uint32_t height; - uint32_t enable; - struct ia_css_frame_sp_info info; - struct dma_port_config port_b; -}; - -struct sh_css_isp_output_params { - uint8_t enable_hflip; - uint8_t enable_vflip; -}; - -#endif /* __IA_CSS_OUTPUT_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h deleted file mode 100644 index 9c7342f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h +++ /dev/null @@ -1,48 +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_OUTPUT_TYPES_H -#define __IA_CSS_OUTPUT_TYPES_H - -/* @file -* CSS-API header file for parameters of output frames. -*/ - -/* Output frame - * - * ISP block: output frame - */ - -//#include "ia_css_frame_public.h" -struct ia_css_frame_info; - -struct ia_css_output_configuration { - const struct ia_css_frame_info *info; -}; - -struct ia_css_output0_configuration { - const struct ia_css_frame_info *info; -}; - -struct ia_css_output1_configuration { - const struct ia_css_frame_info *info; -}; - -struct ia_css_output_config { - uint8_t enable_hflip; /** enable horizontal output mirroring */ - uint8_t enable_vflip; /** enable vertical output mirroring */ -}; - -#endif /* __IA_CSS_OUTPUT_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c deleted file mode 100644 index d1fb4b1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c +++ /dev/null @@ -1,61 +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_frame.h" -#include "ia_css_types.h" -#include "sh_css_defs.h" -#include "ia_css_debug.h" -#include "assert_support.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" - -#include "ia_css_qplane.host.h" - -static const struct ia_css_qplane_configuration default_config = { - .pipe = (struct sh_css_sp_pipeline *)NULL, -}; - -void -ia_css_qplane_config( - struct sh_css_isp_qplane_isp_config *to, - const struct ia_css_qplane_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, from->info); - to->width_a_over_b = elems_a / to->port_b.elems; - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); - - to->inout_port_config = from->pipe->inout_port_config; - to->format = from->info->format; -} - -void -ia_css_qplane_configure( - const struct sh_css_sp_pipeline *pipe, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *info) -{ - struct ia_css_qplane_configuration config = default_config; - - config.pipe = pipe; - config.info = info; - - ia_css_configure_qplane(binary, &config); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h deleted file mode 100644 index c41e9e5..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h +++ /dev/null @@ -1,43 +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_QPLANE_HOST_H -#define __IA_CSS_QPLANE_HOST_H - -#include <ia_css_frame_public.h> -#include <ia_css_binary.h> - -#if 0 -/* Cannot be included, since sh_css_internal.h is too generic - * e.g. for FW generation. -*/ -#include "sh_css_internal.h" /* sh_css_sp_pipeline */ -#endif - -#include "ia_css_qplane_types.h" -#include "ia_css_qplane_param.h" - -void -ia_css_qplane_config( - struct sh_css_isp_qplane_isp_config *to, - const struct ia_css_qplane_configuration *from, - unsigned size); - -void -ia_css_qplane_configure( - const struct sh_css_sp_pipeline *pipe, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *from); - -#endif /* __IA_CSS_QPLANE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h deleted file mode 100644 index 5885f62..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h +++ /dev/null @@ -1,30 +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_QPLANE_PARAM_H -#define __IA_CSS_QPLANE_PARAM_H - -#include <type_support.h> -#include "dma.h" - -/* qplane channel */ -struct sh_css_isp_qplane_isp_config { - uint32_t width_a_over_b; - struct dma_port_config port_b; - uint32_t inout_port_config; - uint32_t input_needs_raw_binning; - uint32_t format; /* enum ia_css_frame_format */ -}; - -#endif /* __IA_CSS_QPLANE_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h deleted file mode 100644 index 62d3718..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h +++ /dev/null @@ -1,33 +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_QPLANE_TYPES_H -#define __IA_CSS_QPLANE_TYPES_H - -#include <ia_css_frame_public.h> -#include "sh_css_internal.h" - -/* qplane frame - * - * ISP block: qplane frame - */ - - -struct ia_css_qplane_configuration { - const struct sh_css_sp_pipeline *pipe; - const struct ia_css_frame_info *info; -}; - -#endif /* __IA_CSS_QPLANE_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c deleted file mode 100644 index fa9ce0f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c +++ /dev/null @@ -1,136 +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_frame.h" -#include "ia_css_types.h" -#include "sh_css_defs.h" -#include "ia_css_debug.h" -#include "assert_support.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" -#include "isp/modes/interface/isp_types.h" - -#include "ia_css_raw.host.h" - - -static const struct ia_css_raw_configuration default_config = { - .pipe = (struct sh_css_sp_pipeline *)NULL, -}; - -static inline unsigned -sh_css_elems_bytes_from_info (unsigned raw_bit_depth) -{ - return CEIL_DIV(raw_bit_depth,8); -} - -/* MW: These areMIPI / ISYS properties, not camera function properties */ -static enum sh_stream_format -css2isp_stream_format(enum atomisp_input_format from) -{ - switch (from) { - case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY: - return sh_stream_format_yuv420_legacy; - case ATOMISP_INPUT_FORMAT_YUV420_8: - case ATOMISP_INPUT_FORMAT_YUV420_10: - case ATOMISP_INPUT_FORMAT_YUV420_16: - return sh_stream_format_yuv420; - case ATOMISP_INPUT_FORMAT_YUV422_8: - case ATOMISP_INPUT_FORMAT_YUV422_10: - case ATOMISP_INPUT_FORMAT_YUV422_16: - return sh_stream_format_yuv422; - case ATOMISP_INPUT_FORMAT_RGB_444: - case ATOMISP_INPUT_FORMAT_RGB_555: - case ATOMISP_INPUT_FORMAT_RGB_565: - case ATOMISP_INPUT_FORMAT_RGB_666: - case ATOMISP_INPUT_FORMAT_RGB_888: - return sh_stream_format_rgb; - case ATOMISP_INPUT_FORMAT_RAW_6: - case ATOMISP_INPUT_FORMAT_RAW_7: - case ATOMISP_INPUT_FORMAT_RAW_8: - case ATOMISP_INPUT_FORMAT_RAW_10: - case ATOMISP_INPUT_FORMAT_RAW_12: - case ATOMISP_INPUT_FORMAT_RAW_14: - case ATOMISP_INPUT_FORMAT_RAW_16: - return sh_stream_format_raw; - case ATOMISP_INPUT_FORMAT_BINARY_8: - default: - return sh_stream_format_raw; - } -} - -void -ia_css_raw_config( - struct sh_css_isp_raw_isp_config *to, - const struct ia_css_raw_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - const struct ia_css_frame_info *in_info = from->in_info; - const struct ia_css_frame_info *internal_info = from->internal_info; - - (void)size; -#if !defined(USE_INPUT_SYSTEM_VERSION_2401) - /* 2401 input system uses input width width */ - in_info = internal_info; -#else - /*in some cases, in_info is NULL*/ - if (in_info) - (void)internal_info; - else - in_info = internal_info; - -#endif - ia_css_dma_configure_from_info(&to->port_b, in_info); - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert((in_info->format == IA_CSS_FRAME_FORMAT_RAW_PACKED) || - (elems_a % to->port_b.elems == 0)); - - to->width_a_over_b = elems_a / to->port_b.elems; - to->inout_port_config = from->pipe->inout_port_config; - to->format = in_info->format; - to->required_bds_factor = from->pipe->required_bds_factor; - to->two_ppc = from->two_ppc; - to->stream_format = css2isp_stream_format(from->stream_format); - to->deinterleaved = from->deinterleaved; -#if (defined(USE_INPUT_SYSTEM_VERSION_2401) || defined(CONFIG_CSI2_PLUS)) - to->start_column = in_info->crop_info.start_column; - to->start_line = in_info->crop_info.start_line; - to->enable_left_padding = from->enable_left_padding; -#endif -} - -void -ia_css_raw_configure( - const struct sh_css_sp_pipeline *pipe, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *in_info, - const struct ia_css_frame_info *internal_info, - bool two_ppc, - bool deinterleaved) -{ - uint8_t enable_left_padding = (uint8_t)((binary->left_padding) ? 1 : 0); - struct ia_css_raw_configuration config = default_config; - - config.pipe = pipe; - config.in_info = in_info; - config.internal_info = internal_info; - config.two_ppc = two_ppc; - config.stream_format = binary->input_format; - config.deinterleaved = deinterleaved; - config.enable_left_padding = enable_left_padding; - - ia_css_configure_raw(binary, &config); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h deleted file mode 100644 index ac6b7f6..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h +++ /dev/null @@ -1,38 +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_RAW_HOST_H -#define __IA_CSS_RAW_HOST_H - -#include "ia_css_binary.h" - -#include "ia_css_raw_types.h" -#include "ia_css_raw_param.h" - -void -ia_css_raw_config( - struct sh_css_isp_raw_isp_config *to, - const struct ia_css_raw_configuration *from, - unsigned size); - -void -ia_css_raw_configure( - const struct sh_css_sp_pipeline *pipe, - const struct ia_css_binary *binary, - const struct ia_css_frame_info *in_info, - const struct ia_css_frame_info *internal_info, - bool two_ppc, - bool deinterleaved); - -#endif /* __IA_CSS_RAW_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h deleted file mode 100644 index 12168b2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h +++ /dev/null @@ -1,38 +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_RAW_PARAM_H -#define __IA_CSS_RAW_PARAM_H - -#include "type_support.h" - -#include "dma.h" - -/* Raw channel */ -struct sh_css_isp_raw_isp_config { - uint32_t width_a_over_b; - struct dma_port_config port_b; - uint32_t inout_port_config; - uint32_t input_needs_raw_binning; - uint32_t format; /* enum ia_css_frame_format */ - uint32_t required_bds_factor; - uint32_t two_ppc; - uint32_t stream_format; /* enum sh_stream_format */ - uint32_t deinterleaved; - uint32_t start_column; /*left crop offset*/ - uint32_t start_line; /*top crop offset*/ - uint8_t enable_left_padding; /*need this for multiple binary case*/ -}; - -#endif /* __IA_CSS_RAW_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h deleted file mode 100644 index ae868eb..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h +++ /dev/null @@ -1,37 +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_RAW_TYPES_H -#define __IA_CSS_RAW_TYPES_H - -#include <ia_css_frame_public.h> -#include "sh_css_internal.h" - -/* Raw frame - * - * ISP block: Raw frame - */ - -struct ia_css_raw_configuration { - const struct sh_css_sp_pipeline *pipe; - const struct ia_css_frame_info *in_info; - const struct ia_css_frame_info *internal_info; - bool two_ppc; - enum atomisp_input_format stream_format; - bool deinterleaved; - uint8_t enable_left_padding; -}; - -#endif /* __IA_CSS_RAW_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c deleted file mode 100644 index 9216821..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c +++ /dev/null @@ -1,35 +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. - */ - -#if !defined(HAS_NO_HMEM) - -#include "memory_access.h" -#include "ia_css_types.h" -#include "sh_css_internal.h" -#include "sh_css_frac.h" - -#include "ia_css_raa.host.h" - -void -ia_css_raa_encode( - struct sh_css_isp_aa_params *to, - const struct ia_css_aa_config *from, - unsigned size) -{ - (void)size; - (void)to; - (void)from; -} - -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h deleted file mode 100644 index b4f245c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h +++ /dev/null @@ -1,27 +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_RAA_HOST_H -#define __IA_CSS_RAA_HOST_H - -#include "aa/aa_2/ia_css_aa2_types.h" -#include "aa/aa_2/ia_css_aa2_param.h" - -void -ia_css_raa_encode( - struct sh_css_isp_aa_params *to, - const struct ia_css_aa_config *from, - unsigned size); - -#endif /* __IA_CSS_RAA_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c deleted file mode 100644 index 4c0ed5d..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.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 <assert_support.h> -#include <ia_css_frame_public.h> -#include <ia_css_frame.h> -#include <ia_css_binary.h> -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" -#include "ia_css_ref.host.h" - -void -ia_css_ref_config( - struct sh_css_isp_ref_isp_config *to, - const struct ia_css_ref_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS, i; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, &(from->ref_frames[0]->info)); - to->width_a_over_b = elems_a / to->port_b.elems; - to->dvs_frame_delay = from->dvs_frame_delay; - for (i = 0; i < MAX_NUM_VIDEO_DELAY_FRAMES; i++) { - if (from->ref_frames[i]) { - to->ref_frame_addr_y[i] = from->ref_frames[i]->data + from->ref_frames[i]->planes.yuv.y.offset; - to->ref_frame_addr_c[i] = from->ref_frames[i]->data + from->ref_frames[i]->planes.yuv.u.offset; - } else { - to->ref_frame_addr_y[i] = 0; - to->ref_frame_addr_c[i] = 0; - } - } - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); -} - -void -ia_css_ref_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame **ref_frames, - const uint32_t dvs_frame_delay) -{ - struct ia_css_ref_configuration config; - unsigned i; - - for (i = 0; i < MAX_NUM_VIDEO_DELAY_FRAMES; i++) - config.ref_frames[i] = ref_frames[i]; - config.dvs_frame_delay = dvs_frame_delay; - ia_css_configure_ref(binary, &config); -} - -void -ia_css_init_ref_state( - struct sh_css_isp_ref_dmem_state *state, - unsigned size) -{ - (void)size; - assert(MAX_NUM_VIDEO_DELAY_FRAMES >= 2); - state->ref_in_buf_idx = 0; - state->ref_out_buf_idx = 1; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h deleted file mode 100644 index 3c6d728..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.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_REF_HOST_H -#define __IA_CSS_REF_HOST_H - -#include <ia_css_frame_public.h> -#include <ia_css_binary.h> - -#include "ia_css_ref_types.h" -#include "ia_css_ref_param.h" -#include "ia_css_ref_state.h" - -void -ia_css_ref_config( - struct sh_css_isp_ref_isp_config *to, - const struct ia_css_ref_configuration *from, - unsigned size); - -void -ia_css_ref_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame **ref_frames, - const uint32_t dvs_frame_delay); - -void -ia_css_init_ref_state( - struct sh_css_isp_ref_dmem_state *state, - unsigned size); -#endif /* __IA_CSS_REF_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h deleted file mode 100644 index 026443b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h +++ /dev/null @@ -1,36 +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_REF_PARAM_H -#define __IA_CSS_REF_PARAM_H - -#include <type_support.h> -#include "sh_css_defs.h" -#include "dma.h" - -/* Reference frame */ -struct ia_css_ref_configuration { - const struct ia_css_frame *ref_frames[MAX_NUM_VIDEO_DELAY_FRAMES]; - uint32_t dvs_frame_delay; -}; - -struct sh_css_isp_ref_isp_config { - uint32_t width_a_over_b; - struct dma_port_config port_b; - hrt_vaddress ref_frame_addr_y[MAX_NUM_VIDEO_DELAY_FRAMES]; - hrt_vaddress ref_frame_addr_c[MAX_NUM_VIDEO_DELAY_FRAMES]; - uint32_t dvs_frame_delay; -}; - -#endif /* __IA_CSS_REF_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h deleted file mode 100644 index 7867be8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h +++ /dev/null @@ -1,26 +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_REF_STATE_H -#define __IA_CSS_REF_STATE_H - -#include "type_support.h" - -/* REF (temporal noise reduction) */ -struct sh_css_isp_ref_dmem_state { - int32_t ref_in_buf_idx; - int32_t ref_out_buf_idx; -}; - -#endif /* __IA_CSS_REF_STATE_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h deleted file mode 100644 index 4750fba..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h +++ /dev/null @@ -1,28 +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_REF_TYPES_H -#define __IA_CSS_REF_TYPES_H - -/* Reference frame - * - * ISP block: reference frame - */ - -#include <ia_css_frame_public.h> - - - -#endif /* __IA_CSS_REF_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c deleted file mode 100644 index aa73367..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c +++ /dev/null @@ -1,386 +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 -#include "ia_css_debug.h" -#endif -#include "sh_css_frac.h" -#include "assert_support.h" - -#include "bh/bh_2/ia_css_bh.host.h" -#include "ia_css_s3a.host.h" - -const struct ia_css_3a_config default_3a_config = { - 25559, - 32768, - 7209, - 65535, - 0, - 65535, - {-3344, -6104, -19143, 19143, 6104, 3344, 0}, - {1027, 0, -9219, 16384, -9219, 1027, 0} -}; - -static unsigned int s3a_raw_bit_depth; - -void -ia_css_s3a_configure(unsigned int raw_bit_depth) -{ - s3a_raw_bit_depth = raw_bit_depth; -} - -static void -ia_css_ae_encode( - struct sh_css_isp_ae_params *to, - const struct ia_css_3a_config *from, - unsigned size) -{ - (void)size; - /* coefficients to calculate Y */ - to->y_coef_r = - uDIGIT_FITTING(from->ae_y_coef_r, 16, SH_CSS_AE_YCOEF_SHIFT); - to->y_coef_g = - uDIGIT_FITTING(from->ae_y_coef_g, 16, SH_CSS_AE_YCOEF_SHIFT); - to->y_coef_b = - uDIGIT_FITTING(from->ae_y_coef_b, 16, SH_CSS_AE_YCOEF_SHIFT); -} - -static void -ia_css_awb_encode( - struct sh_css_isp_awb_params *to, - const struct ia_css_3a_config *from, - unsigned size) -{ - (void)size; - /* AWB level gate */ - to->lg_high_raw = - uDIGIT_FITTING(from->awb_lg_high_raw, 16, s3a_raw_bit_depth); - to->lg_low = - uDIGIT_FITTING(from->awb_lg_low, 16, SH_CSS_BAYER_BITS); - to->lg_high = - uDIGIT_FITTING(from->awb_lg_high, 16, SH_CSS_BAYER_BITS); -} - -static void -ia_css_af_encode( - struct sh_css_isp_af_params *to, - const struct ia_css_3a_config *from, - unsigned size) -{ - unsigned int i; - (void)size; - - /* af fir coefficients */ - for (i = 0; i < 7; ++i) { - to->fir1[i] = - sDIGIT_FITTING(from->af_fir1_coef[i], 15, - SH_CSS_AF_FIR_SHIFT); - to->fir2[i] = - sDIGIT_FITTING(from->af_fir2_coef[i], 15, - SH_CSS_AF_FIR_SHIFT); - } -} - -void -ia_css_s3a_encode( - struct sh_css_isp_s3a_params *to, - const struct ia_css_3a_config *from, - unsigned size) -{ - (void)size; - - ia_css_ae_encode(&to->ae, from, sizeof(to->ae)); - ia_css_awb_encode(&to->awb, from, sizeof(to->awb)); - ia_css_af_encode(&to->af, from, sizeof(to->af)); -} - -#if 0 -void -ia_css_process_s3a( - unsigned pipe_id, - const struct ia_css_pipeline_stage *stage, - struct ia_css_isp_parameters *params) -{ - short dmem_offset = stage->binary->info->mem_offsets->dmem.s3a; - - assert(params != NULL); - - if (dmem_offset >= 0) { - ia_css_s3a_encode((struct sh_css_isp_s3a_params *) - &stage->isp_mem_params[IA_CSS_ISP_DMEM0].address[dmem_offset], - ¶ms->s3a_config); - ia_css_bh_encode((struct sh_css_isp_bh_params *) - &stage->isp_mem_params[IA_CSS_ISP_DMEM0].address[dmem_offset], - ¶ms->s3a_config); - params->isp_params_changed = true; - params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM0] = true; - } - - params->isp_params_changed = true; -} -#endif - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_ae_dump( - const struct sh_css_isp_ae_params *ae, - unsigned level) -{ - if (!ae) return; - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ae_y_coef_r", ae->y_coef_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ae_y_coef_g", ae->y_coef_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ae_y_coef_b", ae->y_coef_b); -} - -void -ia_css_awb_dump( - const struct sh_css_isp_awb_params *awb, - unsigned level) -{ - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "awb_lg_high_raw", awb->lg_high_raw); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "awb_lg_low", awb->lg_low); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "awb_lg_high", awb->lg_high); -} - -void -ia_css_af_dump( - const struct sh_css_isp_af_params *af, - unsigned level) -{ - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[0]", af->fir1[0]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[1]", af->fir1[1]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[2]", af->fir1[2]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[3]", af->fir1[3]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[4]", af->fir1[4]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[5]", af->fir1[5]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir1[6]", af->fir1[6]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[0]", af->fir2[0]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[1]", af->fir2[1]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[2]", af->fir2[2]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[3]", af->fir2[3]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[4]", af->fir2[4]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[5]", af->fir2[5]); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "af_fir2[6]", af->fir2[6]); -} - -void -ia_css_s3a_dump( - const struct sh_css_isp_s3a_params *s3a, - unsigned level) -{ - ia_css_debug_dtrace(level, "S3A Support:\n"); - ia_css_ae_dump (&s3a->ae, level); - ia_css_awb_dump (&s3a->awb, level); - ia_css_af_dump (&s3a->af, level); -} - -void -ia_css_s3a_debug_dtrace( - const struct ia_css_3a_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.ae_y_coef_r=%d, config.ae_y_coef_g=%d, " - "config.ae_y_coef_b=%d, config.awb_lg_high_raw=%d, " - "config.awb_lg_low=%d, config.awb_lg_high=%d\n", - config->ae_y_coef_r, config->ae_y_coef_g, - config->ae_y_coef_b, config->awb_lg_high_raw, - config->awb_lg_low, config->awb_lg_high); -} -#endif - -void -ia_css_s3a_hmem_decode( - struct ia_css_3a_statistics *host_stats, - const struct ia_css_bh_table *hmem_buf) -{ -#if defined(HAS_NO_HMEM) - (void)host_stats; - (void)hmem_buf; -#else - struct ia_css_3a_rgby_output *out_ptr; - int i; - - /* pixel counts(BQ) for 3A area */ - int count_for_3a; - int sum_r, diff; - - assert(host_stats != NULL); - assert(host_stats->rgby_data != NULL); - assert(hmem_buf != NULL); - - count_for_3a = host_stats->grid.width * host_stats->grid.height - * host_stats->grid.bqs_per_grid_cell - * host_stats->grid.bqs_per_grid_cell; - - out_ptr = host_stats->rgby_data; - - ia_css_bh_hmem_decode(out_ptr, hmem_buf); - - /* Calculate sum of histogram of R, - which should not be less than count_for_3a */ - sum_r = 0; - for (i = 0; i < HMEM_UNIT_SIZE; i++) { - sum_r += out_ptr[i].r; - } - if (sum_r < count_for_3a) { - /* histogram is invalid */ - return; - } - - /* Verify for sum of histogram of R/G/B/Y */ -#if 0 - { - int sum_g = 0; - int sum_b = 0; - int sum_y = 0; - for (i = 0; i < HMEM_UNIT_SIZE; i++) { - sum_g += out_ptr[i].g; - sum_b += out_ptr[i].b; - sum_y += out_ptr[i].y; - } - if (sum_g != sum_r || sum_b != sum_r || sum_y != sum_r) { - /* histogram is invalid */ - return; - } - } -#endif - - /* - * Limit the histogram area only to 3A area. - * In DSP, the histogram of 0 is incremented for pixels - * which are outside of 3A area. That amount should be subtracted here. - * hist[0] = hist[0] - ((sum of all hist[]) - (pixel count for 3A area)) - */ - diff = sum_r - count_for_3a; - out_ptr[0].r -= diff; - out_ptr[0].g -= diff; - out_ptr[0].b -= diff; - out_ptr[0].y -= diff; -#endif -} - -void -ia_css_s3a_dmem_decode( - struct ia_css_3a_statistics *host_stats, - const struct ia_css_3a_output *isp_stats) -{ - int isp_width, host_width, height, i; - struct ia_css_3a_output *host_ptr; - - assert(host_stats != NULL); - assert(host_stats->data != NULL); - assert(isp_stats != NULL); - - isp_width = host_stats->grid.aligned_width; - host_width = host_stats->grid.width; - height = host_stats->grid.height; - host_ptr = host_stats->data; - - /* Getting 3A statistics from DMEM does not involve any - * transformation (like the VMEM version), we just copy the data - * using a different output width. */ - for (i = 0; i < height; i++) { - memcpy(host_ptr, isp_stats, host_width * sizeof(*host_ptr)); - isp_stats += isp_width; - host_ptr += host_width; - } -} - -/* MW: this is an ISP function */ -static inline int -merge_hi_lo_14(unsigned short hi, unsigned short lo) -{ - int val = (int) ((((unsigned int) hi << 14) & 0xfffc000) | - ((unsigned int) lo & 0x3fff)); - return val; -} - -void -ia_css_s3a_vmem_decode( - struct ia_css_3a_statistics *host_stats, - const uint16_t *isp_stats_hi, - const uint16_t *isp_stats_lo) -{ - int out_width, out_height, chunk, rest, kmax, y, x, k, elm_start, elm, ofs; - const uint16_t *hi, *lo; - struct ia_css_3a_output *output; - - assert(host_stats!= NULL); - assert(host_stats->data != NULL); - assert(isp_stats_hi != NULL); - assert(isp_stats_lo != NULL); - - output = host_stats->data; - out_width = host_stats->grid.width; - out_height = host_stats->grid.height; - hi = isp_stats_hi; - lo = isp_stats_lo; - - chunk = ISP_VEC_NELEMS >> host_stats->grid.deci_factor_log2; - chunk = max(chunk, 1); - - for (y = 0; y < out_height; y++) { - elm_start = y * ISP_S3ATBL_HI_LO_STRIDE; - rest = out_width; - x = 0; - while (x < out_width) { - kmax = (rest > chunk) ? chunk : rest; - ofs = y * out_width + x; - elm = elm_start + x * sizeof(*output) / sizeof(int32_t); - for (k = 0; k < kmax; k++, elm++) { - output[ofs + k].ae_y = merge_hi_lo_14( - hi[elm + chunk * 0], lo[elm + chunk * 0]); - output[ofs + k].awb_cnt = merge_hi_lo_14( - hi[elm + chunk * 1], lo[elm + chunk * 1]); - output[ofs + k].awb_gr = merge_hi_lo_14( - hi[elm + chunk * 2], lo[elm + chunk * 2]); - output[ofs + k].awb_r = merge_hi_lo_14( - hi[elm + chunk * 3], lo[elm + chunk * 3]); - output[ofs + k].awb_b = merge_hi_lo_14( - hi[elm + chunk * 4], lo[elm + chunk * 4]); - output[ofs + k].awb_gb = merge_hi_lo_14( - hi[elm + chunk * 5], lo[elm + chunk * 5]); - output[ofs + k].af_hpf1 = merge_hi_lo_14( - hi[elm + chunk * 6], lo[elm + chunk * 6]); - output[ofs + k].af_hpf2 = merge_hi_lo_14( - hi[elm + chunk * 7], lo[elm + chunk * 7]); - } - x += chunk; - rest -= chunk; - } - } -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h deleted file mode 100644 index 4bc6c0b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h +++ /dev/null @@ -1,77 +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_S3A_HOST_H -#define __IA_CSS_S3A_HOST_H - -#include "ia_css_s3a_types.h" -#include "ia_css_s3a_param.h" -#include "bh/bh_2/ia_css_bh.host.h" - -extern const struct ia_css_3a_config default_3a_config; - -void -ia_css_s3a_configure( - unsigned int raw_bit_depth); - -void -ia_css_s3a_encode( - struct sh_css_isp_s3a_params *to, - const struct ia_css_3a_config *from, - unsigned size); - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_ae_dump( - const struct sh_css_isp_ae_params *ae, - unsigned level); - -void -ia_css_awb_dump( - const struct sh_css_isp_awb_params *awb, - unsigned level); - -void -ia_css_af_dump( - const struct sh_css_isp_af_params *af, - unsigned level); - -void -ia_css_s3a_dump( - const struct sh_css_isp_s3a_params *s3a, - unsigned level); - -void -ia_css_s3a_debug_dtrace( - const struct ia_css_3a_config *config, - unsigned level); -#endif - -void -ia_css_s3a_hmem_decode( - struct ia_css_3a_statistics *host_stats, - const struct ia_css_bh_table *hmem_buf); - -void -ia_css_s3a_dmem_decode( - struct ia_css_3a_statistics *host_stats, - const struct ia_css_3a_output *isp_stats); - -void -ia_css_s3a_vmem_decode( - struct ia_css_3a_statistics *host_stats, - const uint16_t *isp_stats_hi, - const uint16_t *isp_stats_lo); - -#endif /* __IA_CSS_S3A_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h deleted file mode 100644 index 35fb0a2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h +++ /dev/null @@ -1,54 +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_S3A_PARAM_H -#define __IA_CSS_S3A_PARAM_H - -#include "type_support.h" - -/* AE (3A Support) */ -struct sh_css_isp_ae_params { - /* coefficients to calculate Y */ - int32_t y_coef_r; - int32_t y_coef_g; - int32_t y_coef_b; -}; - -/* AWB (3A Support) */ -struct sh_css_isp_awb_params { - int32_t lg_high_raw; - int32_t lg_low; - int32_t lg_high; -}; - -/* AF (3A Support) */ -struct sh_css_isp_af_params { - int32_t fir1[7]; - int32_t fir2[7]; -}; - -/* S3A (3A Support) */ -struct sh_css_isp_s3a_params { - /* coefficients to calculate Y */ - struct sh_css_isp_ae_params ae; - - /* AWB level gate */ - struct sh_css_isp_awb_params awb; - - /* af fir coefficients */ - struct sh_css_isp_af_params af; -}; - - -#endif /* __IA_CSS_S3A_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h deleted file mode 100644 index 63e7066..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h +++ /dev/null @@ -1,220 +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_S3A_TYPES_H -#define __IA_CSS_S3A_TYPES_H - -/* @file -* CSS-API header file for 3A statistics parameters. -*/ - -#include <ia_css_frac.h> - -#if (defined(SYSTEM_css_skycam_c0_system)) && (! defined(PIPE_GENERATION) ) -#include "../../../../components/stats_3a/src/stats_3a_public.h" -#endif - -/* 3A configuration. This configures the 3A statistics collection - * module. - */ - -/* 3A statistics grid - * - * ISP block: S3A1 (3A Support for 3A ver.1 (Histogram is not used for AE)) - * S3A2 (3A Support for 3A ver.2 (Histogram is used for AE)) - * ISP1: S3A1 is used. - * ISP2: S3A2 is used. - */ -struct ia_css_3a_grid_info { - -#if defined(SYSTEM_css_skycam_c0_system) - uint32_t ae_enable; /** ae enabled in binary, - 0:disabled, 1:enabled */ - struct ae_public_config_grid_config ae_grd_info; /** see description in ae_public.h*/ - - uint32_t awb_enable; /** awb enabled in binary, - 0:disabled, 1:enabled */ - struct awb_public_config_grid_config awb_grd_info; /** see description in awb_public.h*/ - - uint32_t af_enable; /** af enabled in binary, - 0:disabled, 1:enabled */ - struct af_public_grid_config af_grd_info; /** see description in af_public.h*/ - - uint32_t awb_fr_enable; /** awb_fr enabled in binary, - 0:disabled, 1:enabled */ - struct awb_fr_public_grid_config awb_fr_grd_info;/** see description in awb_fr_public.h*/ - - uint32_t elem_bit_depth; /** TODO:Taken from BYT - need input from AIQ - if needed for SKC - Bit depth of element used - to calculate 3A statistics. - This is 13, which is the normalized - bayer bit depth in DSP. */ - -#else - uint32_t enable; /** 3A statistics enabled. - 0:disabled, 1:enabled */ - uint32_t use_dmem; /** DMEM or VMEM determines layout. - 0:3A statistics are stored to VMEM, - 1:3A statistics are stored to DMEM */ - uint32_t has_histogram; /** Statistics include histogram. - 0:no histogram, 1:has histogram */ - uint32_t width; /** Width of 3A grid table. - (= Horizontal number of grid cells - in table, which cells have effective - statistics.) */ - uint32_t height; /** Height of 3A grid table. - (= Vertical number of grid cells - in table, which cells have effective - statistics.) */ - uint32_t aligned_width; /** Horizontal stride (for alloc). - (= Horizontal number of grid cells - in table, which means - the allocated width.) */ - uint32_t aligned_height; /** Vertical stride (for alloc). - (= Vertical number of grid cells - in table, which means - the allocated height.) */ - uint32_t bqs_per_grid_cell; /** Grid cell size in BQ(Bayer Quad) unit. - (1BQ means {Gr,R,B,Gb}(2x2 pixels).) - Valid values are 8,16,32,64. */ - uint32_t deci_factor_log2; /** log2 of bqs_per_grid_cell. */ - uint32_t elem_bit_depth; /** Bit depth of element used - to calculate 3A statistics. - This is 13, which is the normalized - bayer bit depth in DSP. */ -#endif -}; - - -/* This struct should be split into 3, for AE, AWB and AF. - * However, that will require driver/ 3A lib modifications. - */ - -/* 3A configuration. This configures the 3A statistics collection - * module. - * - * ae_y_*: Coefficients to calculate luminance from bayer. - * awb_lg_*: Thresholds to check the saturated bayer pixels for AWB. - * Condition of effective pixel for AWB level gate check: - * bayer(sensor) <= awb_lg_high_raw && - * bayer(when AWB statisitcs is calculated) >= awb_lg_low && - * bayer(when AWB statisitcs is calculated) <= awb_lg_high - * af_fir*: Coefficients of high pass filter to calculate AF statistics. - * - * ISP block: S3A1(ae_y_* for AE/AF, awb_lg_* for AWB) - * S3A2(ae_y_* for AF, awb_lg_* for AWB) - * SDVS1(ae_y_*) - * SDVS2(ae_y_*) - * ISP1: S3A1 and SDVS1 are used. - * ISP2: S3A2 and SDVS2 are used. - */ -struct ia_css_3a_config { - ia_css_u0_16 ae_y_coef_r; /** Weight of R for Y. - u0.16, [0,65535], - default/ineffective 25559 */ - ia_css_u0_16 ae_y_coef_g; /** Weight of G for Y. - u0.16, [0,65535], - default/ineffective 32768 */ - ia_css_u0_16 ae_y_coef_b; /** Weight of B for Y. - u0.16, [0,65535], - default/ineffective 7209 */ - ia_css_u0_16 awb_lg_high_raw; /** AWB level gate high for raw. - u0.16, [0,65535], - default 65472(=1023*64), - ineffective 65535 */ - ia_css_u0_16 awb_lg_low; /** AWB level gate low. - u0.16, [0,65535], - default 64(=1*64), - ineffective 0 */ - ia_css_u0_16 awb_lg_high; /** AWB level gate high. - u0.16, [0,65535], - default 65535, - ineffective 65535 */ - ia_css_s0_15 af_fir1_coef[7]; /** AF FIR coefficients of fir1. - s0.15, [-32768,32767], - default/ineffective - -6689,-12207,-32768,32767,12207,6689,0 */ - ia_css_s0_15 af_fir2_coef[7]; /** AF FIR coefficients of fir2. - s0.15, [-32768,32767], - default/ineffective - 2053,0,-18437,32767,-18437,2053,0 */ -}; - -/* 3A statistics. This structure describes the data stored - * in each 3A grid point. - * - * ISP block: S3A1 (3A Support for 3A ver.1) (Histogram is not used for AE) - * S3A2 (3A Support for 3A ver.2) (Histogram is used for AE) - * - ae_y is used only for S3A1. - * - awb_* and af_* are used both for S3A1 and S3A2. - * ISP1: S3A1 is used. - * ISP2: S3A2 is used. - */ -struct ia_css_3a_output { - int32_t ae_y; /** Sum of Y in a statistics window, for AE. - (u19.13) */ - int32_t awb_cnt; /** Number of effective pixels - in a statistics window. - Pixels passed by the AWB level gate check are - judged as "effective". (u32) */ - int32_t awb_gr; /** Sum of Gr in a statistics window, for AWB. - All Gr pixels (not only for effective pixels) - are summed. (u19.13) */ - int32_t awb_r; /** Sum of R in a statistics window, for AWB. - All R pixels (not only for effective pixels) - are summed. (u19.13) */ - int32_t awb_b; /** Sum of B in a statistics window, for AWB. - All B pixels (not only for effective pixels) - are summed. (u19.13) */ - int32_t awb_gb; /** Sum of Gb in a statistics window, for AWB. - All Gb pixels (not only for effective pixels) - are summed. (u19.13) */ - int32_t af_hpf1; /** Sum of |Y| following high pass filter af_fir1 - within a statistics window, for AF. (u19.13) */ - int32_t af_hpf2; /** Sum of |Y| following high pass filter af_fir2 - within a statistics window, for AF. (u19.13) */ -}; - - -/* 3A Statistics. This structure describes the statistics that are generated - * using the provided configuration (ia_css_3a_config). - */ -struct ia_css_3a_statistics { - struct ia_css_3a_grid_info grid; /** grid info contains the dimensions of the 3A grid */ - struct ia_css_3a_output *data; /** the pointer to 3a_output[grid.width * grid.height] - containing the 3A statistics */ - struct ia_css_3a_rgby_output *rgby_data;/** the pointer to 3a_rgby_output[256] - containing the histogram */ -}; - -/* Histogram (Statistics for AE). - * - * 4 histograms(r,g,b,y), - * 256 bins for each histogram, unsigned 24bit value for each bin. - * struct ia_css_3a_rgby_output data[256]; - - * ISP block: HIST2 - * (ISP1: HIST2 is not used.) - * ISP2: HIST2 is used. - */ -struct ia_css_3a_rgby_output { - uint32_t r; /** Number of R of one bin of the histogram R. (u24) */ - uint32_t g; /** Number of G of one bin of the histogram G. (u24) */ - uint32_t b; /** Number of B of one bin of the histogram B. (u24) */ - uint32_t y; /** Number of Y of one bin of the histogram Y. (u24) */ -}; - -#endif /* __IA_CSS_S3A_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c deleted file mode 100644 index 565ae45..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c +++ /dev/null @@ -1,130 +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" -#include "ia_css_debug.h" -#include "assert_support.h" -#ifdef ISP2401 -#include "math_support.h" /* min() */ - -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#endif - -#include "ia_css_sc.host.h" - -void -ia_css_sc_encode( - struct sh_css_isp_sc_params *to, - struct ia_css_shading_table **from, - unsigned size) -{ - (void)size; - to->gain_shift = (*from)->fraction_bits; -} - -void -ia_css_sc_dump( - const struct sh_css_isp_sc_params *sc, - unsigned level) -{ - if (!sc) return; - ia_css_debug_dtrace(level, "Shading Correction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "sc_gain_shift", sc->gain_shift); -} - -#ifdef ISP2401 -void -ia_css_sc_config( - struct sh_css_isp_sc_isp_config *to, - const struct ia_css_sc_configuration *from, - unsigned size) -{ - uint32_t internal_org_x_bqs = from->internal_frame_origin_x_bqs_on_sctbl; - uint32_t internal_org_y_bqs = from->internal_frame_origin_y_bqs_on_sctbl; - uint32_t slice, rest, i; - - (void)size; - - /* The internal_frame_origin_x_bqs_on_sctbl is separated to 8 times of slice_vec. */ - rest = internal_org_x_bqs; - for (i = 0; i < SH_CSS_SC_INTERPED_GAIN_HOR_SLICE_TIMES; i++) { - slice = min(rest, ((uint32_t)ISP_SLICE_NELEMS)); - rest = rest - slice; - to->interped_gain_hor_slice_bqs[i] = slice; - } - - to->internal_frame_origin_y_bqs_on_sctbl = internal_org_y_bqs; -} - -void -ia_css_sc_configure( - const struct ia_css_binary *binary, - uint32_t internal_frame_origin_x_bqs_on_sctbl, - uint32_t internal_frame_origin_y_bqs_on_sctbl) -{ - const struct ia_css_sc_configuration config = { - internal_frame_origin_x_bqs_on_sctbl, - internal_frame_origin_y_bqs_on_sctbl }; - - ia_css_configure_sc(binary, &config); -} - -#endif -/* ------ deprecated(bz675) : from ------ */ -/* It looks like @parameter{} (in *.pipe) is used to generate the process/get/set functions, - for parameters which should be used in the isp kernels. - However, the ia_css_shading_settings structure has a parameter which is used only in the css, - and does not have a parameter which is used in the isp kernels. - Then, I did not use @parameter{} to generate the get/set function - for the ia_css_shading_settings structure. (michie) */ -void -sh_css_get_shading_settings(const struct ia_css_isp_parameters *params, - struct ia_css_shading_settings *settings) -{ - if (settings == NULL) - return; - assert(params != NULL); - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_get_shading_settings() enter: settings=%p\n", settings); - - *settings = params->shading_settings; - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_get_shading_settings() leave: settings.enable_shading_table_conversion=%d\n", - settings->enable_shading_table_conversion); -} - -void -sh_css_set_shading_settings(struct ia_css_isp_parameters *params, - const struct ia_css_shading_settings *settings) -{ - if (settings == NULL) - return; - assert(params != NULL); - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_set_shading_settings() enter: settings.enable_shading_table_conversion=%d\n", - settings->enable_shading_table_conversion); - - params->shading_settings = *settings; - params->shading_settings_changed = true; - - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_set_shading_settings() leave: return_void\n"); -} -/* ------ deprecated(bz675) : to ------ */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h deleted file mode 100644 index b35ac3e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h +++ /dev/null @@ -1,77 +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_SC_HOST_H -#define __IA_CSS_SC_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_sc_types.h" -#include "ia_css_sc_param.h" - -void -ia_css_sc_encode( - struct sh_css_isp_sc_params *to, - struct ia_css_shading_table **from, - unsigned size); - -void -ia_css_sc_dump( - const struct sh_css_isp_sc_params *sc, - unsigned level); - -#ifdef ISP2401 -/* @brief Configure the shading correction. - * @param[out] to Parameters used in the shading correction kernel in the isp. - * @param[in] from Parameters passed from the host. - * @param[in] size Size of the sh_css_isp_sc_isp_config structure. - * - * This function passes the parameters for the shading correction from the host to the isp. - */ -void -ia_css_sc_config( - struct sh_css_isp_sc_isp_config *to, - const struct ia_css_sc_configuration *from, - unsigned size); - -/* @brief Configure the shading correction. - * @param[in] binary The binary, which has the shading correction. - * @param[in] internal_frame_origin_x_bqs_on_sctbl - * X coordinate (in bqs) of the origin of the internal frame on the shading table. - * @param[in] internal_frame_origin_y_bqs_on_sctbl - * Y coordinate (in bqs) of the origin of the internal frame on the shading table. - * - * This function calls the ia_css_configure_sc() function. - * (The ia_css_configure_sc() function is automatically generated in ia_css_isp.configs.c.) - * The ia_css_configure_sc() function calls the ia_css_sc_config() function - * to pass the parameters for the shading correction from the host to the isp. - */ -void -ia_css_sc_configure( - const struct ia_css_binary *binary, - uint32_t internal_frame_origin_x_bqs_on_sctbl, - uint32_t internal_frame_origin_y_bqs_on_sctbl); - -#endif -/* ------ deprecated(bz675) : from ------ */ -void -sh_css_get_shading_settings(const struct ia_css_isp_parameters *params, - struct ia_css_shading_settings *settings); - -void -sh_css_set_shading_settings(struct ia_css_isp_parameters *params, - const struct ia_css_shading_settings *settings); -/* ------ deprecated(bz675) : to ------ */ - -#endif /* __IA_CSS_SC_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h deleted file mode 100644 index d997d51..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h +++ /dev/null @@ -1,71 +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_SC_PARAM_H -#define __IA_CSS_SC_PARAM_H - -#include "type_support.h" - -#ifdef ISP2401 -/* To position the shading center grid point on the center of output image, - * one more grid cell is needed as margin. */ -#define SH_CSS_SCTBL_CENTERING_MARGIN 1 - -/* The shading table width and height are the number of grids, not cells. The last grid should be counted. */ -#define SH_CSS_SCTBL_LAST_GRID_COUNT 1 - -/* Number of horizontal grids per color in the shading table. */ -#define _ISP_SCTBL_WIDTH_PER_COLOR(input_width, deci_factor_log2) \ - (ISP_BQ_GRID_WIDTH(input_width, deci_factor_log2) + \ - SH_CSS_SCTBL_CENTERING_MARGIN + SH_CSS_SCTBL_LAST_GRID_COUNT) - -/* Number of vertical grids per color in the shading table. */ -#define _ISP_SCTBL_HEIGHT(input_height, deci_factor_log2) \ - (ISP_BQ_GRID_HEIGHT(input_height, deci_factor_log2) + \ - SH_CSS_SCTBL_CENTERING_MARGIN + SH_CSS_SCTBL_LAST_GRID_COUNT) - -/* Legacy API: Number of horizontal grids per color in the shading table. */ -#define _ISP_SCTBL_LEGACY_WIDTH_PER_COLOR(input_width, deci_factor_log2) \ - (ISP_BQ_GRID_WIDTH(input_width, deci_factor_log2) + SH_CSS_SCTBL_LAST_GRID_COUNT) - -/* Legacy API: Number of vertical grids per color in the shading table. */ -#define _ISP_SCTBL_LEGACY_HEIGHT(input_height, deci_factor_log2) \ - (ISP_BQ_GRID_HEIGHT(input_height, deci_factor_log2) + SH_CSS_SCTBL_LAST_GRID_COUNT) - -#endif -/* SC (Shading Corrction) */ -struct sh_css_isp_sc_params { - int32_t gain_shift; -}; - -#ifdef ISP2401 -/* Number of horizontal slice times for interpolated gain: - * - * The start position of the internal frame does not match the start position of the shading table. - * To get a vector of shading gains (interpolated horizontally and vertically) - * which matches a vector on the internal frame, - * vec_slice is used for 2 adjacent vectors of shading gains. - * The number of shift times by vec_slice is 8. - * Max grid cell bqs to support the shading table centerting: N = 32 - * CEIL_DIV(N-1, ISP_SLICE_NELEMS) = CEIL_DIV(31, 4) = 8 - */ -#define SH_CSS_SC_INTERPED_GAIN_HOR_SLICE_TIMES 8 - -struct sh_css_isp_sc_isp_config { - uint32_t interped_gain_hor_slice_bqs[SH_CSS_SC_INTERPED_GAIN_HOR_SLICE_TIMES]; - uint32_t internal_frame_origin_y_bqs_on_sctbl; -}; - -#endif -#endif /* __IA_CSS_SC_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h deleted file mode 100644 index 30ce499..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h +++ /dev/null @@ -1,136 +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_SC_TYPES_H -#define __IA_CSS_SC_TYPES_H - -/* @file -* CSS-API header file for Lens Shading Correction (SC) parameters. -*/ - - -/* Number of color planes in the shading table. */ -#define IA_CSS_SC_NUM_COLORS 4 - -/* The 4 colors that a shading table consists of. - * For each color we store a grid of values. - */ -enum ia_css_sc_color { - IA_CSS_SC_COLOR_GR, /** Green on a green-red line */ - IA_CSS_SC_COLOR_R, /** Red */ - IA_CSS_SC_COLOR_B, /** Blue */ - IA_CSS_SC_COLOR_GB /** Green on a green-blue line */ -}; - -/* Lens Shading Correction table. - * - * This describes the color shading artefacts - * introduced by lens imperfections. To correct artefacts, - * bayer values should be multiplied by gains in this table. - * - *------------ deprecated(bz675) : from --------------------------- - * When shading_settings.enable_shading_table_conversion is set as 0, - * this shading table is directly sent to the isp. This table should contain - * the data based on the ia_css_shading_info information filled in the css. - * So, the driver needs to get the ia_css_shading_info information - * from the css, prior to generating the shading table. - * - * When shading_settings.enable_shading_table_conversion is set as 1, - * this shading table is converted in the legacy way in the css - * before it is sent to the isp. - * The driver does not need to get the ia_css_shading_info information. - * - * NOTE: - * The shading table conversion will be removed from the css in the near future, - * because it does not support the bayer scaling by sensor. - * Also, we had better generate the shading table only in one place(AIC). - * At the moment, to support the old driver which assumes the conversion is done in the css, - * shading_settings.enable_shading_table_conversion is set as 1 by default. - *------------ deprecated(bz675) : to --------------------------- - * - * ISP block: SC1 - * ISP1: SC1 is used. - * ISP2: SC1 is used. - */ -struct ia_css_shading_table { - uint32_t enable; /** Set to false for no shading correction. - The data field can be NULL when enable == true */ -/* ------ deprecated(bz675) : from ------ */ - uint32_t sensor_width; /** Native sensor width in pixels. */ - uint32_t sensor_height; /** Native sensor height in lines. - When shading_settings.enable_shading_table_conversion is set - as 0, sensor_width and sensor_height are NOT used. - These are used only in the legacy shading table conversion - in the css, when shading_settings. - enable_shading_table_conversion is set as 1. */ -/* ------ deprecated(bz675) : to ------ */ - uint32_t width; /** Number of data points per line per color. - u8.0, [0,81] */ - uint32_t height; /** Number of lines of data points per color. - u8.0, [0,61] */ - uint32_t fraction_bits; /** Bits of fractional part in the data - points. - u8.0, [0,13] */ - uint16_t *data[IA_CSS_SC_NUM_COLORS]; - /** Table data, one array for each color. - Use ia_css_sc_color to index this array. - u[13-fraction_bits].[fraction_bits], [0,8191] */ -}; - -/* ------ deprecated(bz675) : from ------ */ -/* Shading Correction settings. - * - * NOTE: - * This structure should be removed when the shading table conversion is - * removed from the css. - */ -struct ia_css_shading_settings { - uint32_t enable_shading_table_conversion; /** Set to 0, - if the conversion of the shading table should be disabled - in the css. (default 1) - 0: The shading table is directly sent to the isp. - The shading table should contain the data based on the - ia_css_shading_info information filled in the css. - 1: The shading table is converted in the css, to be fitted - to the shading table definition required in the isp. - NOTE: - Previously, the shading table was always converted in the css - before it was sent to the isp, and this config was not defined. - Currently, the driver is supposed to pass the shading table - which should be directly sent to the isp. - However, some drivers may still pass the shading table which - needs the conversion without setting this config as 1. - To support such an unexpected case for the time being, - enable_shading_table_conversion is set as 1 by default - in the css. */ -}; -/* ------ deprecated(bz675) : to ------ */ - -#ifdef ISP2401 - -/* Shading Correction configuration. - * - * NOTE: The shading table size is larger than or equal to the internal frame size. - */ -struct ia_css_sc_configuration { - uint32_t internal_frame_origin_x_bqs_on_sctbl; /** Origin X (in bqs) of internal frame on shading table. */ - uint32_t internal_frame_origin_y_bqs_on_sctbl; /** Origin Y (in bqs) of internal frame on shading table. */ - /** NOTE: bqs = size in BQ(Bayer Quad) unit. - 1BQ means {Gr,R,B,Gb}(2x2 pixels). - Horizontal 1 bqs corresponds to horizontal 2 pixels. - Vertical 1 bqs corresponds to vertical 2 pixels. */ -}; -#endif - -#endif /* __IA_CSS_SC_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h deleted file mode 100644 index 4eb4910..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h +++ /dev/null @@ -1,99 +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_SDIS_COMMON_HOST_H -#define _IA_CSS_SDIS_COMMON_HOST_H - -#define ISP_MAX_SDIS_HOR_PROJ_NUM_ISP \ - __ISP_SDIS_HOR_PROJ_NUM_ISP(ISP_MAX_INTERNAL_WIDTH, ISP_MAX_INTERNAL_HEIGHT, \ - SH_CSS_DIS_DECI_FACTOR_LOG2, ISP_PIPE_VERSION) -#define ISP_MAX_SDIS_VER_PROJ_NUM_ISP \ - __ISP_SDIS_VER_PROJ_NUM_ISP(ISP_MAX_INTERNAL_WIDTH, \ - SH_CSS_DIS_DECI_FACTOR_LOG2) - -#define _ISP_SDIS_HOR_COEF_NUM_VECS \ - __ISP_SDIS_HOR_COEF_NUM_VECS(ISP_INTERNAL_WIDTH) -#define ISP_MAX_SDIS_HOR_COEF_NUM_VECS \ - __ISP_SDIS_HOR_COEF_NUM_VECS(ISP_MAX_INTERNAL_WIDTH) -#define ISP_MAX_SDIS_VER_COEF_NUM_VECS \ - __ISP_SDIS_VER_COEF_NUM_VECS(ISP_MAX_INTERNAL_HEIGHT) - -/* SDIS Coefficients: */ -/* The ISP uses vectors to store the coefficients, so we round - the number of coefficients up to vectors. */ -#define __ISP_SDIS_HOR_COEF_NUM_VECS(in_width) _ISP_VECS(_ISP_BQS(in_width)) -#define __ISP_SDIS_VER_COEF_NUM_VECS(in_height) _ISP_VECS(_ISP_BQS(in_height)) - -/* SDIS Projections: - * SDIS1: Horizontal projections are calculated for each line. - * Vertical projections are calculated for each column. - * SDIS2: Projections are calculated for each grid cell. - * Grid cells that do not fall completely within the image are not - * valid. The host needs to use the bigger one for the stride but - * should only return the valid ones to the 3A. */ -#define __ISP_SDIS_HOR_PROJ_NUM_ISP(in_width, in_height, deci_factor_log2, \ - isp_pipe_version) \ - ((isp_pipe_version == 1) ? \ - CEIL_SHIFT(_ISP_BQS(in_height), deci_factor_log2) : \ - CEIL_SHIFT(_ISP_BQS(in_width), deci_factor_log2)) - -#define __ISP_SDIS_VER_PROJ_NUM_ISP(in_width, deci_factor_log2) \ - CEIL_SHIFT(_ISP_BQS(in_width), deci_factor_log2) - -#define SH_CSS_DIS_VER_NUM_COEF_TYPES(b) \ - (((b)->info->sp.pipeline.isp_pipe_version == 2) ? \ - IA_CSS_DVS2_NUM_COEF_TYPES : \ - IA_CSS_DVS_NUM_COEF_TYPES) - -#ifndef PIPE_GENERATION -#if defined(__ISP) || defined (MK_FIRMWARE) - -/* Array cannot be 2-dimensional, since driver ddr allocation does not know stride */ -struct sh_css_isp_sdis_hori_proj_tbl { - int32_t tbl[ISP_DVS_NUM_COEF_TYPES * ISP_MAX_SDIS_HOR_PROJ_NUM_ISP]; -#if DVS2_PROJ_MARGIN > 0 - int32_t margin[DVS2_PROJ_MARGIN]; -#endif -}; - -struct sh_css_isp_sdis_vert_proj_tbl { - int32_t tbl[ISP_DVS_NUM_COEF_TYPES * ISP_MAX_SDIS_VER_PROJ_NUM_ISP]; -#if DVS2_PROJ_MARGIN > 0 - int32_t margin[DVS2_PROJ_MARGIN]; -#endif -}; - -struct sh_css_isp_sdis_hori_coef_tbl { - VMEM_ARRAY(tbl[ISP_DVS_NUM_COEF_TYPES], ISP_MAX_SDIS_HOR_COEF_NUM_VECS*ISP_NWAY); -}; - -struct sh_css_isp_sdis_vert_coef_tbl { - VMEM_ARRAY(tbl[ISP_DVS_NUM_COEF_TYPES], ISP_MAX_SDIS_VER_COEF_NUM_VECS*ISP_NWAY); -}; - -#endif /* defined(__ISP) || defined (MK_FIRMWARE) */ -#endif /* PIPE_GENERATION */ - -#ifndef PIPE_GENERATION -struct s_sdis_config { - unsigned horicoef_vectors; - unsigned vertcoef_vectors; - unsigned horiproj_num; - unsigned vertproj_num; -}; - -extern struct s_sdis_config sdis_config; -#endif - -#endif /* _IA_CSS_SDIS_COMMON_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h deleted file mode 100644 index 381e573..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h +++ /dev/null @@ -1,219 +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_SDIS_COMMON_TYPES_H -#define __IA_CSS_SDIS_COMMON_TYPES_H - -/* @file -* CSS-API header file for DVS statistics parameters. -*/ - -#include <type_support.h> - -/* DVS statistics grid dimensions in number of cells. - */ - -struct ia_css_dvs_grid_dim { - uint32_t width; /** Width of DVS grid table in cells */ - uint32_t height; /** Height of DVS grid table in cells */ -}; - -/* DVS statistics dimensions in number of cells for - * grid, coeffieicient and projection. - */ - -struct ia_css_sdis_info { - struct { - struct ia_css_dvs_grid_dim dim; /* Dimensions */ - struct ia_css_dvs_grid_dim pad; /* Padded dimensions */ - } grid, coef, proj; - uint32_t deci_factor_log2; -}; - -/* DVS statistics grid - * - * ISP block: SDVS1 (DIS/DVS Support for DIS/DVS ver.1 (2-axes)) - * SDVS2 (DVS Support for DVS ver.2 (6-axes)) - * ISP1: SDVS1 is used. - * ISP2: SDVS2 is used. - */ -struct ia_css_dvs_grid_res { - uint32_t width; /** Width of DVS grid table. - (= Horizontal number of grid cells - in table, which cells have effective - statistics.) - For DVS1, this is equal to - the number of vertical statistics. */ - uint32_t aligned_width; /** Stride of each grid line. - (= Horizontal number of grid cells - in table, which means - the allocated width.) */ - uint32_t height; /** Height of DVS grid table. - (= Vertical number of grid cells - in table, which cells have effective - statistics.) - For DVS1, This is equal to - the number of horizontal statistics. */ - uint32_t aligned_height;/** Stride of each grid column. - (= Vertical number of grid cells - in table, which means - the allocated height.) */ -}; - -/* TODO: use ia_css_dvs_grid_res in here. - * However, that implies driver I/F changes - */ -struct ia_css_dvs_grid_info { - uint32_t enable; /** DVS statistics enabled. - 0:disabled, 1:enabled */ - uint32_t width; /** Width of DVS grid table. - (= Horizontal number of grid cells - in table, which cells have effective - statistics.) - For DVS1, this is equal to - the number of vertical statistics. */ - uint32_t aligned_width; /** Stride of each grid line. - (= Horizontal number of grid cells - in table, which means - the allocated width.) */ - uint32_t height; /** Height of DVS grid table. - (= Vertical number of grid cells - in table, which cells have effective - statistics.) - For DVS1, This is equal to - the number of horizontal statistics. */ - uint32_t aligned_height;/** Stride of each grid column. - (= Vertical number of grid cells - in table, which means - the allocated height.) */ - uint32_t bqs_per_grid_cell; /** Grid cell size in BQ(Bayer Quad) unit. - (1BQ means {Gr,R,B,Gb}(2x2 pixels).) - For DVS1, valid value is 64. - For DVS2, valid value is only 64, - currently. */ - uint32_t num_hor_coefs; /** Number of horizontal coefficients. */ - uint32_t num_ver_coefs; /** Number of vertical coefficients. */ -}; - -/* Number of DVS statistics levels - */ -#define IA_CSS_DVS_STAT_NUM_OF_LEVELS 3 - -/* DVS statistics generated by accelerator global configuration - */ -struct dvs_stat_public_dvs_global_cfg { - unsigned char kappa; - /** DVS statistics global configuration - kappa */ - unsigned char match_shift; - /** DVS statistics global configuration - match_shift */ - unsigned char ybin_mode; - /** DVS statistics global configuration - y binning mode */ -}; - -/* DVS statistics generated by accelerator level grid - * configuration - */ -struct dvs_stat_public_dvs_level_grid_cfg { - unsigned char grid_width; - /** DVS statistics grid width */ - unsigned char grid_height; - /** DVS statistics grid height */ - unsigned char block_width; - /** DVS statistics block width */ - unsigned char block_height; - /** DVS statistics block height */ -}; - -/* DVS statistics generated by accelerator level grid start - * configuration - */ -struct dvs_stat_public_dvs_level_grid_start { - unsigned short x_start; - /** DVS statistics level x start */ - unsigned short y_start; - /** DVS statistics level y start */ - unsigned char enable; - /** DVS statistics level enable */ -}; - -/* DVS statistics generated by accelerator level grid end - * configuration - */ -struct dvs_stat_public_dvs_level_grid_end { - unsigned short x_end; - /** DVS statistics level x end */ - unsigned short y_end; - /** DVS statistics level y end */ -}; - -/* DVS statistics generated by accelerator Feature Extraction - * Region Of Interest (FE-ROI) configuration - */ -struct dvs_stat_public_dvs_level_fe_roi_cfg { - unsigned char x_start; - /** DVS statistics fe-roi level x start */ - unsigned char y_start; - /** DVS statistics fe-roi level y start */ - unsigned char x_end; - /** DVS statistics fe-roi level x end */ - unsigned char y_end; - /** DVS statistics fe-roi level y end */ -}; - -/* DVS statistics generated by accelerator public configuration - */ -struct dvs_stat_public_dvs_grd_cfg { - struct dvs_stat_public_dvs_level_grid_cfg grd_cfg; - /** DVS statistics level grid configuration */ - struct dvs_stat_public_dvs_level_grid_start grd_start; - /** DVS statistics level grid start configuration */ - struct dvs_stat_public_dvs_level_grid_end grd_end; - /** DVS statistics level grid end configuration */ -}; - -/* DVS statistics grid generated by accelerator - */ -struct ia_css_dvs_stat_grid_info { - struct dvs_stat_public_dvs_global_cfg dvs_gbl_cfg; - /** DVS statistics global configuration (kappa, match, binning) */ - struct dvs_stat_public_dvs_grd_cfg grd_cfg[IA_CSS_DVS_STAT_NUM_OF_LEVELS]; - /** DVS statistics grid configuration (blocks and grids) */ - struct dvs_stat_public_dvs_level_fe_roi_cfg fe_roi_cfg[IA_CSS_DVS_STAT_NUM_OF_LEVELS]; - /** DVS statistics FE ROI (region of interest) configuration */ -}; - -/* DVS statistics generated by accelerator default grid info - */ -#define DEFAULT_DVS_GRID_INFO \ -(union ia_css_dvs_grid_u) { \ - .dvs_stat_grid_info = (struct ia_css_dvs_stat_grid_info) { \ - .fe_roi_cfg = { \ - [1] = (struct dvs_stat_public_dvs_level_fe_roi_cfg) { \ - .x_start = 4 \ - } \ - } \ - } \ -} - -/* Union that holds all types of DVS statistics grid info in - * CSS format - * */ -union ia_css_dvs_grid_u { - struct ia_css_dvs_stat_grid_info dvs_stat_grid_info; - /** DVS statistics produced by accelerator grid info */ - struct ia_css_dvs_grid_info dvs_grid_info; - /** DVS (DVS1/DVS2) grid info */ -}; - -#endif /* __IA_CSS_SDIS_COMMON_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c deleted file mode 100644 index 0fdd696..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +++ /dev/null @@ -1,423 +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 "memory_access.h" -#include "assert_support.h" -#include "ia_css_debug.h" -#include "ia_css_sdis_types.h" -#include "sdis/common/ia_css_sdis_common.host.h" -#include "ia_css_sdis.host.h" - -const struct ia_css_dvs_coefficients default_sdis_config = { - .grid = { 0, 0, 0, 0, 0, 0, 0, 0 }, - .hor_coefs = NULL, - .ver_coefs = NULL -}; - -static void -fill_row(short *private, const short *public, unsigned width, unsigned padding) -{ - assert((int)width >= 0); - assert((int)padding >= 0); - memcpy (private, public, width*sizeof(short)); - memset (&private[width], 0, padding*sizeof(short)); -} - -void ia_css_sdis_horicoef_vmem_encode ( - struct sh_css_isp_sdis_hori_coef_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size) -{ - unsigned aligned_width = from->grid.aligned_width * from->grid.bqs_per_grid_cell; - unsigned width = from->grid.num_hor_coefs; - int padding = aligned_width-width; - unsigned stride = size/IA_CSS_DVS_NUM_COEF_TYPES/sizeof(short); - unsigned total_bytes = aligned_width*IA_CSS_DVS_NUM_COEF_TYPES*sizeof(short); - short *public = from->hor_coefs; - short *private = (short*)to; - unsigned type; - - /* Copy the table, add padding */ - assert(padding >= 0); - assert(total_bytes <= size); - assert(size % (IA_CSS_DVS_NUM_COEF_TYPES*ISP_VEC_NELEMS*sizeof(short)) == 0); - - for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++) { - fill_row(&private[type*stride], &public[type*width], width, padding); - } -} - -void ia_css_sdis_vertcoef_vmem_encode ( - struct sh_css_isp_sdis_vert_coef_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size) -{ - unsigned aligned_height = from->grid.aligned_height * from->grid.bqs_per_grid_cell; - unsigned height = from->grid.num_ver_coefs; - int padding = aligned_height-height; - unsigned stride = size/IA_CSS_DVS_NUM_COEF_TYPES/sizeof(short); - unsigned total_bytes = aligned_height*IA_CSS_DVS_NUM_COEF_TYPES*sizeof(short); - short *public = from->ver_coefs; - short *private = (short*)to; - unsigned type; - - /* Copy the table, add padding */ - assert(padding >= 0); - assert(total_bytes <= size); - assert(size % (IA_CSS_DVS_NUM_COEF_TYPES*ISP_VEC_NELEMS*sizeof(short)) == 0); - - for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++) { - fill_row(&private[type*stride], &public[type*height], height, padding); - } -} - -void ia_css_sdis_horiproj_encode ( - struct sh_css_isp_sdis_hori_proj_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size) -{ - (void)to; - (void)from; - (void)size; -} - -void ia_css_sdis_vertproj_encode ( - struct sh_css_isp_sdis_vert_proj_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size) -{ - (void)to; - (void)from; - (void)size; -} - -void ia_css_get_isp_dis_coefficients( - struct ia_css_stream *stream, - short *horizontal_coefficients, - short *vertical_coefficients) -{ - struct ia_css_isp_parameters *params; - unsigned int hor_num_isp, ver_num_isp; - unsigned int hor_num_3a, ver_num_3a; - int i; - struct ia_css_binary *dvs_binary; - - IA_CSS_ENTER("void"); - - assert(horizontal_coefficients != NULL); - assert(vertical_coefficients != NULL); - - params = stream->isp_params_configs; - - /* Only video pipe supports DVS */ - dvs_binary = ia_css_stream_get_dvs_binary(stream); - if (!dvs_binary) - return; - - hor_num_isp = dvs_binary->dis.coef.pad.width; - ver_num_isp = dvs_binary->dis.coef.pad.height; - hor_num_3a = dvs_binary->dis.coef.dim.width; - ver_num_3a = dvs_binary->dis.coef.dim.height; - - for (i = 0; i < IA_CSS_DVS_NUM_COEF_TYPES; i++) { - fill_row(&horizontal_coefficients[i*hor_num_isp], - ¶ms->dvs_coefs.hor_coefs[i*hor_num_3a], hor_num_3a, hor_num_isp-hor_num_3a); - } - for (i = 0; i < SH_CSS_DIS_VER_NUM_COEF_TYPES(dvs_binary); i++) { - fill_row(&vertical_coefficients[i*ver_num_isp], - ¶ms->dvs_coefs.ver_coefs[i*ver_num_3a], ver_num_3a, ver_num_isp-ver_num_3a); - } - - IA_CSS_LEAVE("void"); -} - -size_t -ia_css_sdis_hor_coef_tbl_bytes( - const struct ia_css_binary *binary) -{ - if (binary->info->sp.pipeline.isp_pipe_version == 1) - return sizeof(short) * IA_CSS_DVS_NUM_COEF_TYPES * binary->dis.coef.pad.width; - else - return sizeof(short) * IA_CSS_DVS2_NUM_COEF_TYPES * binary->dis.coef.pad.width; -} - -size_t -ia_css_sdis_ver_coef_tbl_bytes( - const struct ia_css_binary *binary) -{ - return sizeof(short) * SH_CSS_DIS_VER_NUM_COEF_TYPES(binary) * binary->dis.coef.pad.height; -} - -void -ia_css_sdis_init_info( - struct ia_css_sdis_info *dis, - unsigned sc_3a_dis_width, - unsigned sc_3a_dis_padded_width, - unsigned sc_3a_dis_height, - unsigned isp_pipe_version, - unsigned enabled) -{ - if (!enabled) { - *dis = (struct ia_css_sdis_info) { }; - return; - } - - dis->deci_factor_log2 = SH_CSS_DIS_DECI_FACTOR_LOG2; - - dis->grid.dim.width = - _ISP_BQS(sc_3a_dis_width) >> SH_CSS_DIS_DECI_FACTOR_LOG2; - dis->grid.dim.height = - _ISP_BQS(sc_3a_dis_height) >> SH_CSS_DIS_DECI_FACTOR_LOG2; - dis->grid.pad.width = - CEIL_SHIFT(_ISP_BQS(sc_3a_dis_padded_width), SH_CSS_DIS_DECI_FACTOR_LOG2); - dis->grid.pad.height = - CEIL_SHIFT(_ISP_BQS(sc_3a_dis_height), SH_CSS_DIS_DECI_FACTOR_LOG2); - - dis->coef.dim.width = - (_ISP_BQS(sc_3a_dis_width) >> SH_CSS_DIS_DECI_FACTOR_LOG2) << SH_CSS_DIS_DECI_FACTOR_LOG2; - dis->coef.dim.height = - (_ISP_BQS(sc_3a_dis_height) >> SH_CSS_DIS_DECI_FACTOR_LOG2) << SH_CSS_DIS_DECI_FACTOR_LOG2; - dis->coef.pad.width = - __ISP_SDIS_HOR_COEF_NUM_VECS(sc_3a_dis_padded_width) * ISP_VEC_NELEMS; - dis->coef.pad.height = - __ISP_SDIS_VER_COEF_NUM_VECS(sc_3a_dis_height) * ISP_VEC_NELEMS; - if (isp_pipe_version == 1) { - dis->proj.dim.width = - _ISP_BQS(sc_3a_dis_height) >> SH_CSS_DIS_DECI_FACTOR_LOG2; - dis->proj.dim.height = - _ISP_BQS(sc_3a_dis_width) >> SH_CSS_DIS_DECI_FACTOR_LOG2; - } else { - dis->proj.dim.width = - (_ISP_BQS(sc_3a_dis_width) >> SH_CSS_DIS_DECI_FACTOR_LOG2) * - (_ISP_BQS(sc_3a_dis_height) >> SH_CSS_DIS_DECI_FACTOR_LOG2); - dis->proj.dim.height = - (_ISP_BQS(sc_3a_dis_width) >> SH_CSS_DIS_DECI_FACTOR_LOG2) * - (_ISP_BQS(sc_3a_dis_height) >> SH_CSS_DIS_DECI_FACTOR_LOG2); - } - dis->proj.pad.width = - __ISP_SDIS_HOR_PROJ_NUM_ISP(sc_3a_dis_padded_width, - sc_3a_dis_height, - SH_CSS_DIS_DECI_FACTOR_LOG2, - isp_pipe_version); - dis->proj.pad.height = - __ISP_SDIS_VER_PROJ_NUM_ISP(sc_3a_dis_padded_width, - SH_CSS_DIS_DECI_FACTOR_LOG2); -} - -void ia_css_sdis_clear_coefficients( - struct ia_css_dvs_coefficients *dvs_coefs) -{ - dvs_coefs->hor_coefs = NULL; - dvs_coefs->ver_coefs = NULL; -} - -enum ia_css_err -ia_css_get_dvs_statistics( - struct ia_css_dvs_statistics *host_stats, - const struct ia_css_isp_dvs_statistics *isp_stats) -{ - struct ia_css_isp_dvs_statistics_map *map; - enum ia_css_err ret = IA_CSS_SUCCESS; - - IA_CSS_ENTER("host_stats=%p, isp_stats=%p", host_stats, isp_stats); - - assert(host_stats != NULL); - assert(isp_stats != NULL); - - map = ia_css_isp_dvs_statistics_map_allocate(isp_stats, NULL); - if (map) { - mmgr_load(isp_stats->data_ptr, map->data_ptr, isp_stats->size); - ia_css_translate_dvs_statistics(host_stats, map); - ia_css_isp_dvs_statistics_map_free(map); - } else { - IA_CSS_ERROR("out of memory"); - ret = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; - } - - IA_CSS_LEAVE_ERR(ret); - return ret; -} - -void -ia_css_translate_dvs_statistics( - struct ia_css_dvs_statistics *host_stats, - const struct ia_css_isp_dvs_statistics_map *isp_stats) -{ - unsigned int hor_num_isp, ver_num_isp, hor_num_dvs, ver_num_dvs, i; - int32_t *hor_ptr_dvs, *ver_ptr_dvs, *hor_ptr_isp, *ver_ptr_isp; - - assert(host_stats != NULL); - assert(host_stats->hor_proj != NULL); - assert(host_stats->ver_proj != NULL); - assert(isp_stats != NULL); - assert(isp_stats->hor_proj != NULL); - assert(isp_stats->ver_proj != NULL); - - IA_CSS_ENTER("hproj=%p, vproj=%p, haddr=%p, vaddr=%p", - host_stats->hor_proj, host_stats->ver_proj, - isp_stats->hor_proj, isp_stats->ver_proj); - - hor_num_isp = host_stats->grid.aligned_height; - ver_num_isp = host_stats->grid.aligned_width; - hor_ptr_isp = isp_stats->hor_proj; - ver_ptr_isp = isp_stats->ver_proj; - hor_num_dvs = host_stats->grid.height; - ver_num_dvs = host_stats->grid.width; - hor_ptr_dvs = host_stats->hor_proj; - ver_ptr_dvs = host_stats->ver_proj; - - for (i = 0; i < IA_CSS_DVS_NUM_COEF_TYPES; i++) { - memcpy(hor_ptr_dvs, hor_ptr_isp, hor_num_dvs * sizeof(int32_t)); - hor_ptr_isp += hor_num_isp; - hor_ptr_dvs += hor_num_dvs; - - memcpy(ver_ptr_dvs, ver_ptr_isp, ver_num_dvs * sizeof(int32_t)); - ver_ptr_isp += ver_num_isp; - ver_ptr_dvs += ver_num_dvs; - } - - IA_CSS_LEAVE("void"); -} - -struct ia_css_isp_dvs_statistics * -ia_css_isp_dvs_statistics_allocate( - const struct ia_css_dvs_grid_info *grid) -{ - struct ia_css_isp_dvs_statistics *me; - int hor_size, ver_size; - - assert(grid != NULL); - - IA_CSS_ENTER("grid=%p", grid); - - if (!grid->enable) - return NULL; - - me = sh_css_calloc(1,sizeof(*me)); - if (!me) - goto err; - - hor_size = CEIL_MUL(sizeof(int) * IA_CSS_DVS_NUM_COEF_TYPES * grid->aligned_height, - HIVE_ISP_DDR_WORD_BYTES); - ver_size = CEIL_MUL(sizeof(int) * IA_CSS_DVS_NUM_COEF_TYPES * grid->aligned_width, - HIVE_ISP_DDR_WORD_BYTES); - - - me->size = hor_size + ver_size; - me->data_ptr = mmgr_malloc(me->size); - if (me->data_ptr == mmgr_NULL) - goto err; - me->hor_size = hor_size; - me->hor_proj = me->data_ptr; - me->ver_size = ver_size; - me->ver_proj = me->data_ptr + hor_size; - - IA_CSS_LEAVE("return=%p", me); - - return me; -err: - ia_css_isp_dvs_statistics_free(me); - - IA_CSS_LEAVE("return=%p", NULL); - - return NULL; -} - -struct ia_css_isp_dvs_statistics_map * -ia_css_isp_dvs_statistics_map_allocate( - const struct ia_css_isp_dvs_statistics *isp_stats, - void *data_ptr) -{ - struct ia_css_isp_dvs_statistics_map *me; - /* Windows compiler does not like adding sizes to a void * - * so we use a local char * instead. */ - char *base_ptr; - - me = sh_css_malloc(sizeof(*me)); - if (!me) { - IA_CSS_LOG("cannot allocate memory"); - goto err; - } - - me->data_ptr = data_ptr; - me->data_allocated = data_ptr == NULL; - - if (!me->data_ptr) { - me->data_ptr = sh_css_malloc(isp_stats->size); - if (!me->data_ptr) { - IA_CSS_LOG("cannot allocate memory"); - goto err; - } - } - base_ptr = me->data_ptr; - - me->size = isp_stats->size; - /* GCC complains when we assign a char * to a void *, so these - * casts are necessary unfortunately. */ - me->hor_proj = (void*)base_ptr; - me->ver_proj = (void*)(base_ptr + isp_stats->hor_size); - - return me; -err: - if (me) - sh_css_free(me); - return NULL; -} - -void -ia_css_isp_dvs_statistics_map_free(struct ia_css_isp_dvs_statistics_map *me) -{ - if (me) { - if (me->data_allocated) - sh_css_free(me->data_ptr); - sh_css_free(me); - } -} - -void -ia_css_isp_dvs_statistics_free(struct ia_css_isp_dvs_statistics *me) -{ - if (me != NULL) { - hmm_free(me->data_ptr); - sh_css_free(me); - } -} - -void ia_css_sdis_horicoef_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis_vertcoef_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis_horiproj_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis_vertproj_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h deleted file mode 100644 index 95e2c61..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h +++ /dev/null @@ -1,101 +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_SDIS_HOST_H -#define __IA_CSS_SDIS_HOST_H - -#include "ia_css_sdis_types.h" -#include "ia_css_binary.h" -#include "ia_css_stream.h" -#include "sh_css_params.h" - -extern const struct ia_css_dvs_coefficients default_sdis_config; - -/* Opaque here, since size is binary dependent. */ -struct sh_css_isp_sdis_hori_coef_tbl; -struct sh_css_isp_sdis_vert_coef_tbl; -struct sh_css_isp_sdis_hori_proj_tbl; -struct sh_css_isp_sdis_vert_proj_tbl; - -void ia_css_sdis_horicoef_vmem_encode ( - struct sh_css_isp_sdis_hori_coef_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size); - -void ia_css_sdis_vertcoef_vmem_encode ( - struct sh_css_isp_sdis_vert_coef_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size); - -void ia_css_sdis_horiproj_encode ( - struct sh_css_isp_sdis_hori_proj_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size); - -void ia_css_sdis_vertproj_encode ( - struct sh_css_isp_sdis_vert_proj_tbl *to, - const struct ia_css_dvs_coefficients *from, - unsigned size); - -void ia_css_get_isp_dis_coefficients( - struct ia_css_stream *stream, - short *horizontal_coefficients, - short *vertical_coefficients); - -enum ia_css_err -ia_css_get_dvs_statistics( - struct ia_css_dvs_statistics *host_stats, - const struct ia_css_isp_dvs_statistics *isp_stats); - -void -ia_css_translate_dvs_statistics( - struct ia_css_dvs_statistics *host_stats, - const struct ia_css_isp_dvs_statistics_map *isp_stats); - -struct ia_css_isp_dvs_statistics * -ia_css_isp_dvs_statistics_allocate( - const struct ia_css_dvs_grid_info *grid); - -void -ia_css_isp_dvs_statistics_free( - struct ia_css_isp_dvs_statistics *me); - -size_t ia_css_sdis_hor_coef_tbl_bytes(const struct ia_css_binary *binary); -size_t ia_css_sdis_ver_coef_tbl_bytes(const struct ia_css_binary *binary); - -void -ia_css_sdis_init_info( - struct ia_css_sdis_info *dis, - unsigned sc_3a_dis_width, - unsigned sc_3a_dis_padded_width, - unsigned sc_3a_dis_height, - unsigned isp_pipe_version, - unsigned enabled); - -void ia_css_sdis_clear_coefficients( - struct ia_css_dvs_coefficients *dvs_coefs); - -void ia_css_sdis_horicoef_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level); - -void ia_css_sdis_vertcoef_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level); - -void ia_css_sdis_horiproj_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level); - -void ia_css_sdis_vertproj_debug_dtrace( - const struct ia_css_dvs_coefficients *config, unsigned level); - -#endif /* __IA_CSS_SDIS_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h deleted file mode 100644 index d2ee570..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h +++ /dev/null @@ -1,53 +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_SDIS_TYPES_H -#define __IA_CSS_SDIS_TYPES_H - -/* @file -* CSS-API header file for DVS statistics parameters. -*/ - -/* Number of DVS coefficient types */ -#define IA_CSS_DVS_NUM_COEF_TYPES 6 - -#ifndef PIPE_GENERATION -#include "isp/kernels/sdis/common/ia_css_sdis_common_types.h" -#endif - -/* DVS 1.0 Coefficients. - * This structure describes the coefficients that are needed for the dvs statistics. - */ - -struct ia_css_dvs_coefficients { - struct ia_css_dvs_grid_info grid;/** grid info contains the dimensions of the dvs grid */ - int16_t *hor_coefs; /** the pointer to int16_t[grid.num_hor_coefs * IA_CSS_DVS_NUM_COEF_TYPES] - containing the horizontal coefficients */ - int16_t *ver_coefs; /** the pointer to int16_t[grid.num_ver_coefs * IA_CSS_DVS_NUM_COEF_TYPES] - containing the vertical coefficients */ -}; - -/* DVS 1.0 Statistics. - * This structure describes the statistics that are generated using the provided coefficients. - */ - -struct ia_css_dvs_statistics { - struct ia_css_dvs_grid_info grid;/** grid info contains the dimensions of the dvs grid */ - int32_t *hor_proj; /** the pointer to int16_t[grid.height * IA_CSS_DVS_NUM_COEF_TYPES] - containing the horizontal projections */ - int32_t *ver_proj; /** the pointer to int16_t[grid.width * IA_CSS_DVS_NUM_COEF_TYPES] - containing the vertical projections */ -}; - -#endif /* __IA_CSS_SDIS_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c deleted file mode 100644 index 9bccb64..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +++ /dev/null @@ -1,338 +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 <assert_support.h> -#include "memory_access.h" -#include "ia_css_debug.h" -#include "ia_css_sdis2.host.h" - -const struct ia_css_dvs2_coefficients default_sdis2_config = { - .grid = { 0, 0, 0, 0, 0, 0, 0, 0 }, - .hor_coefs = { NULL, NULL, NULL, NULL }, - .ver_coefs = { NULL, NULL, NULL, NULL }, -}; - -static void -fill_row(short *private, const short *public, unsigned width, unsigned padding) -{ - memcpy (private, public, width*sizeof(short)); - memset (&private[width], 0, padding*sizeof(short)); -} - -void ia_css_sdis2_horicoef_vmem_encode ( - struct sh_css_isp_sdis_hori_coef_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size) -{ - unsigned aligned_width = from->grid.aligned_width * from->grid.bqs_per_grid_cell; - unsigned width = from->grid.num_hor_coefs; - int padding = aligned_width-width; - unsigned stride = size/IA_CSS_DVS2_NUM_COEF_TYPES/sizeof(short); - unsigned total_bytes = aligned_width*IA_CSS_DVS2_NUM_COEF_TYPES*sizeof(short); - short *private = (short*)to; - - - /* Copy the table, add padding */ - assert(padding >= 0); - assert(total_bytes <= size); - assert(size % (IA_CSS_DVS2_NUM_COEF_TYPES*ISP_VEC_NELEMS*sizeof(short)) == 0); - fill_row(&private[0*stride], from->hor_coefs.odd_real, width, padding); - fill_row(&private[1*stride], from->hor_coefs.odd_imag, width, padding); - fill_row(&private[2*stride], from->hor_coefs.even_real, width, padding); - fill_row(&private[3*stride], from->hor_coefs.even_imag, width, padding); -} - -void ia_css_sdis2_vertcoef_vmem_encode ( - struct sh_css_isp_sdis_vert_coef_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size) -{ - unsigned aligned_height = from->grid.aligned_height * from->grid.bqs_per_grid_cell; - unsigned height = from->grid.num_ver_coefs; - int padding = aligned_height-height; - unsigned stride = size/IA_CSS_DVS2_NUM_COEF_TYPES/sizeof(short); - unsigned total_bytes = aligned_height*IA_CSS_DVS2_NUM_COEF_TYPES*sizeof(short); - short *private = (short*)to; - - /* Copy the table, add padding */ - assert(padding >= 0); - assert(total_bytes <= size); - assert(size % (IA_CSS_DVS2_NUM_COEF_TYPES*ISP_VEC_NELEMS*sizeof(short)) == 0); - fill_row(&private[0*stride], from->ver_coefs.odd_real, height, padding); - fill_row(&private[1*stride], from->ver_coefs.odd_imag, height, padding); - fill_row(&private[2*stride], from->ver_coefs.even_real, height, padding); - fill_row(&private[3*stride], from->ver_coefs.even_imag, height, padding); -} - -void ia_css_sdis2_horiproj_encode ( - struct sh_css_isp_sdis_hori_proj_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size) -{ - (void)to; - (void)from; - (void)size; -} - -void ia_css_sdis2_vertproj_encode ( - struct sh_css_isp_sdis_vert_proj_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size) -{ - (void)to; - (void)from; - (void)size; -} - -void ia_css_get_isp_dvs2_coefficients( - struct ia_css_stream *stream, - short *hor_coefs_odd_real, - short *hor_coefs_odd_imag, - short *hor_coefs_even_real, - short *hor_coefs_even_imag, - short *ver_coefs_odd_real, - short *ver_coefs_odd_imag, - short *ver_coefs_even_real, - short *ver_coefs_even_imag) -{ - struct ia_css_isp_parameters *params; - unsigned int hor_num_3a, ver_num_3a; - unsigned int hor_num_isp, ver_num_isp; - struct ia_css_binary *dvs_binary; - - IA_CSS_ENTER("void"); - - assert(stream != NULL); - assert(hor_coefs_odd_real != NULL); - assert(hor_coefs_odd_imag != NULL); - assert(hor_coefs_even_real != NULL); - assert(hor_coefs_even_imag != NULL); - assert(ver_coefs_odd_real != NULL); - assert(ver_coefs_odd_imag != NULL); - assert(ver_coefs_even_real != NULL); - assert(ver_coefs_even_imag != NULL); - - params = stream->isp_params_configs; - - /* Only video pipe supports DVS */ - dvs_binary = ia_css_stream_get_dvs_binary(stream); - if (!dvs_binary) - return; - - hor_num_3a = dvs_binary->dis.coef.dim.width; - ver_num_3a = dvs_binary->dis.coef.dim.height; - hor_num_isp = dvs_binary->dis.coef.pad.width; - ver_num_isp = dvs_binary->dis.coef.pad.height; - - memcpy (hor_coefs_odd_real, params->dvs2_coefs.hor_coefs.odd_real, hor_num_3a * sizeof(short)); - memcpy (hor_coefs_odd_imag, params->dvs2_coefs.hor_coefs.odd_imag, hor_num_3a * sizeof(short)); - memcpy (hor_coefs_even_real, params->dvs2_coefs.hor_coefs.even_real, hor_num_3a * sizeof(short)); - memcpy (hor_coefs_even_imag, params->dvs2_coefs.hor_coefs.even_imag, hor_num_3a * sizeof(short)); - memcpy (ver_coefs_odd_real, params->dvs2_coefs.ver_coefs.odd_real, ver_num_3a * sizeof(short)); - memcpy (ver_coefs_odd_imag, params->dvs2_coefs.ver_coefs.odd_imag, ver_num_3a * sizeof(short)); - memcpy (ver_coefs_even_real, params->dvs2_coefs.ver_coefs.even_real, ver_num_3a * sizeof(short)); - memcpy (ver_coefs_even_imag, params->dvs2_coefs.ver_coefs.even_imag, ver_num_3a * sizeof(short)); - - IA_CSS_LEAVE("void"); -} - -void ia_css_sdis2_clear_coefficients( - struct ia_css_dvs2_coefficients *dvs2_coefs) -{ - dvs2_coefs->hor_coefs.odd_real = NULL; - dvs2_coefs->hor_coefs.odd_imag = NULL; - dvs2_coefs->hor_coefs.even_real = NULL; - dvs2_coefs->hor_coefs.even_imag = NULL; - dvs2_coefs->ver_coefs.odd_real = NULL; - dvs2_coefs->ver_coefs.odd_imag = NULL; - dvs2_coefs->ver_coefs.even_real = NULL; - dvs2_coefs->ver_coefs.even_imag = NULL; -} - -enum ia_css_err -ia_css_get_dvs2_statistics( - struct ia_css_dvs2_statistics *host_stats, - const struct ia_css_isp_dvs_statistics *isp_stats) -{ - struct ia_css_isp_dvs_statistics_map *map; - enum ia_css_err ret = IA_CSS_SUCCESS; - - IA_CSS_ENTER("host_stats=%p, isp_stats=%p", host_stats, isp_stats); - - assert(host_stats != NULL); - assert(isp_stats != NULL); - - map = ia_css_isp_dvs_statistics_map_allocate(isp_stats, NULL); - if (map) { - mmgr_load(isp_stats->data_ptr, map->data_ptr, isp_stats->size); - ia_css_translate_dvs2_statistics(host_stats, map); - ia_css_isp_dvs_statistics_map_free(map); - } else { - IA_CSS_ERROR("out of memory"); - ret = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; - } - - IA_CSS_LEAVE_ERR(ret); - return ret; -} - -void -ia_css_translate_dvs2_statistics( - struct ia_css_dvs2_statistics *host_stats, - const struct ia_css_isp_dvs_statistics_map *isp_stats) -{ - unsigned int size_bytes, table_width, table_size, height; - unsigned int src_offset = 0, dst_offset = 0; - int32_t *htemp_ptr, *vtemp_ptr; - - assert(host_stats != NULL); - assert(host_stats->hor_prod.odd_real != NULL); - assert(host_stats->hor_prod.odd_imag != NULL); - assert(host_stats->hor_prod.even_real != NULL); - assert(host_stats->hor_prod.even_imag != NULL); - assert(host_stats->ver_prod.odd_real != NULL); - assert(host_stats->ver_prod.odd_imag != NULL); - assert(host_stats->ver_prod.even_real != NULL); - assert(host_stats->ver_prod.even_imag != NULL); - assert(isp_stats != NULL); - assert(isp_stats->hor_proj != NULL); - assert(isp_stats->ver_proj != NULL); - - IA_CSS_ENTER("hor_coefs.odd_real=%p, hor_coefs.odd_imag=%p, " - "hor_coefs.even_real=%p, hor_coefs.even_imag=%p, " - "ver_coefs.odd_real=%p, ver_coefs.odd_imag=%p, " - "ver_coefs.even_real=%p, ver_coefs.even_imag=%p, " - "haddr=%p, vaddr=%p", - host_stats->hor_prod.odd_real, host_stats->hor_prod.odd_imag, - host_stats->hor_prod.even_real, host_stats->hor_prod.even_imag, - host_stats->ver_prod.odd_real, host_stats->ver_prod.odd_imag, - host_stats->ver_prod.even_real, host_stats->ver_prod.even_imag, - isp_stats->hor_proj, isp_stats->ver_proj); - - /* Host side: reflecting the true width in bytes */ - size_bytes = host_stats->grid.aligned_width * sizeof(*htemp_ptr); - - /* DDR side: need to be aligned to the system bus width */ - /* statistics table width in terms of 32-bit words*/ - table_width = CEIL_MUL(size_bytes, HIVE_ISP_DDR_WORD_BYTES) / sizeof(*htemp_ptr); - table_size = table_width * host_stats->grid.aligned_height; - - htemp_ptr = isp_stats->hor_proj; /* horizontal stats */ - vtemp_ptr = isp_stats->ver_proj; /* vertical stats */ - for (height = 0; height < host_stats->grid.aligned_height; height++) { - /* hor stats */ - memcpy(host_stats->hor_prod.odd_real + dst_offset, - &htemp_ptr[0*table_size+src_offset], size_bytes); - memcpy(host_stats->hor_prod.odd_imag + dst_offset, - &htemp_ptr[1*table_size+src_offset], size_bytes); - memcpy(host_stats->hor_prod.even_real + dst_offset, - &htemp_ptr[2*table_size+src_offset], size_bytes); - memcpy(host_stats->hor_prod.even_imag + dst_offset, - &htemp_ptr[3*table_size+src_offset], size_bytes); - - /* ver stats */ - memcpy(host_stats->ver_prod.odd_real + dst_offset, - &vtemp_ptr[0*table_size+src_offset], size_bytes); - memcpy(host_stats->ver_prod.odd_imag + dst_offset, - &vtemp_ptr[1*table_size+src_offset], size_bytes); - memcpy(host_stats->ver_prod.even_real + dst_offset, - &vtemp_ptr[2*table_size+src_offset], size_bytes); - memcpy(host_stats->ver_prod.even_imag + dst_offset, - &vtemp_ptr[3*table_size+src_offset], size_bytes); - - src_offset += table_width; /* aligned table width */ - dst_offset += host_stats->grid.aligned_width; - } - - IA_CSS_LEAVE("void"); -} - -struct ia_css_isp_dvs_statistics * -ia_css_isp_dvs2_statistics_allocate( - const struct ia_css_dvs_grid_info *grid) -{ - struct ia_css_isp_dvs_statistics *me; - int size; - - assert(grid != NULL); - - IA_CSS_ENTER("grid=%p", grid); - - if (!grid->enable) - return NULL; - - me = sh_css_calloc(1,sizeof(*me)); - if (!me) - goto err; - - /* on ISP 2 SDIS DMA model, every row of projection table width must be - aligned to HIVE_ISP_DDR_WORD_BYTES - */ - size = CEIL_MUL(sizeof(int) * grid->aligned_width, HIVE_ISP_DDR_WORD_BYTES) - * grid->aligned_height * IA_CSS_DVS2_NUM_COEF_TYPES; - - me->size = 2*size; - me->data_ptr = mmgr_malloc(me->size); - if (me->data_ptr == mmgr_NULL) - goto err; - me->hor_proj = me->data_ptr; - me->hor_size = size; - me->ver_proj = me->data_ptr + size; - me->ver_size = size; - - IA_CSS_LEAVE("return=%p", me); - return me; -err: - ia_css_isp_dvs2_statistics_free(me); - IA_CSS_LEAVE("return=%p", NULL); - - return NULL; -} - -void -ia_css_isp_dvs2_statistics_free(struct ia_css_isp_dvs_statistics *me) -{ - if (me != NULL) { - hmm_free(me->data_ptr); - sh_css_free(me); - } -} - -void ia_css_sdis2_horicoef_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis2_vertcoef_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis2_horiproj_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} - -void ia_css_sdis2_vertproj_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level) -{ - (void)config; - (void)level; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h deleted file mode 100644 index 60198d4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h +++ /dev/null @@ -1,95 +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_SDIS2_HOST_H -#define __IA_CSS_SDIS2_HOST_H - -#include "ia_css_sdis2_types.h" -#include "ia_css_binary.h" -#include "ia_css_stream.h" -#include "sh_css_params.h" - -extern const struct ia_css_dvs2_coefficients default_sdis2_config; - -/* Opaque here, since size is binary dependent. */ -struct sh_css_isp_sdis_hori_coef_tbl; -struct sh_css_isp_sdis_vert_coef_tbl; -struct sh_css_isp_sdis_hori_proj_tbl; -struct sh_css_isp_sdis_vert_proj_tbl; - -void ia_css_sdis2_horicoef_vmem_encode ( - struct sh_css_isp_sdis_hori_coef_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size); - -void ia_css_sdis2_vertcoef_vmem_encode ( - struct sh_css_isp_sdis_vert_coef_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size); - -void ia_css_sdis2_horiproj_encode ( - struct sh_css_isp_sdis_hori_proj_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size); - -void ia_css_sdis2_vertproj_encode ( - struct sh_css_isp_sdis_vert_proj_tbl *to, - const struct ia_css_dvs2_coefficients *from, - unsigned size); - -void ia_css_get_isp_dvs2_coefficients( - struct ia_css_stream *stream, - short *hor_coefs_odd_real, - short *hor_coefs_odd_imag, - short *hor_coefs_even_real, - short *hor_coefs_even_imag, - short *ver_coefs_odd_real, - short *ver_coefs_odd_imag, - short *ver_coefs_even_real, - short *ver_coefs_even_imag); - -void ia_css_sdis2_clear_coefficients( - struct ia_css_dvs2_coefficients *dvs2_coefs); - -enum ia_css_err -ia_css_get_dvs2_statistics( - struct ia_css_dvs2_statistics *host_stats, - const struct ia_css_isp_dvs_statistics *isp_stats); - -void -ia_css_translate_dvs2_statistics( - struct ia_css_dvs2_statistics *host_stats, - const struct ia_css_isp_dvs_statistics_map *isp_stats); - -struct ia_css_isp_dvs_statistics * -ia_css_isp_dvs2_statistics_allocate( - const struct ia_css_dvs_grid_info *grid); - -void -ia_css_isp_dvs2_statistics_free( - struct ia_css_isp_dvs_statistics *me); - -void ia_css_sdis2_horicoef_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level); - -void ia_css_sdis2_vertcoef_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level); - -void ia_css_sdis2_horiproj_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level); - -void ia_css_sdis2_vertproj_debug_dtrace( - const struct ia_css_dvs2_coefficients *config, unsigned level); - -#endif /* __IA_CSS_SDIS2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h deleted file mode 100644 index 2a0bc40..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h +++ /dev/null @@ -1,69 +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_SDIS2_TYPES_H -#define __IA_CSS_SDIS2_TYPES_H - -/* @file -* CSS-API header file for DVS statistics parameters. -*/ - -/* Number of DVS coefficient types */ -#define IA_CSS_DVS2_NUM_COEF_TYPES 4 - -#ifndef PIPE_GENERATION -#include "isp/kernels/sdis/common/ia_css_sdis_common_types.h" -#endif - -/* DVS 2.0 Coefficient types. This structure contains 4 pointers to - * arrays that contain the coeffients for each type. - */ -struct ia_css_dvs2_coef_types { - int16_t *odd_real; /** real part of the odd coefficients*/ - int16_t *odd_imag; /** imaginary part of the odd coefficients*/ - int16_t *even_real;/** real part of the even coefficients*/ - int16_t *even_imag;/** imaginary part of the even coefficients*/ -}; - -/* DVS 2.0 Coefficients. This structure describes the coefficients that are needed for the dvs statistics. - * e.g. hor_coefs.odd_real is the pointer to int16_t[grid.num_hor_coefs] containing the horizontal odd real - * coefficients. - */ -struct ia_css_dvs2_coefficients { - struct ia_css_dvs_grid_info grid; /** grid info contains the dimensions of the dvs grid */ - struct ia_css_dvs2_coef_types hor_coefs; /** struct with pointers that contain the horizontal coefficients */ - struct ia_css_dvs2_coef_types ver_coefs; /** struct with pointers that contain the vertical coefficients */ -}; - -/* DVS 2.0 Statistic types. This structure contains 4 pointers to - * arrays that contain the statistics for each type. - */ -struct ia_css_dvs2_stat_types { - int32_t *odd_real; /** real part of the odd statistics*/ - int32_t *odd_imag; /** imaginary part of the odd statistics*/ - int32_t *even_real;/** real part of the even statistics*/ - int32_t *even_imag;/** imaginary part of the even statistics*/ -}; - -/* DVS 2.0 Statistics. This structure describes the statistics that are generated using the provided coefficients. - * e.g. hor_prod.odd_real is the pointer to int16_t[grid.aligned_height][grid.aligned_width] containing - * the horizontal odd real statistics. Valid statistics data area is int16_t[0..grid.height-1][0..grid.width-1] - */ -struct ia_css_dvs2_statistics { - struct ia_css_dvs_grid_info grid; /** grid info contains the dimensions of the dvs grid */ - struct ia_css_dvs2_stat_types hor_prod; /** struct with pointers that contain the horizontal statistics */ - struct ia_css_dvs2_stat_types ver_prod; /** struct with pointers that contain the vertical statistics */ -}; - -#endif /* __IA_CSS_SDIS2_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c deleted file mode 100644 index 78a113b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c +++ /dev/null @@ -1,76 +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_debug.h" -#include "ia_css_tdf.host.h" - -static const int16_t g_pyramid[8][8] = { -{128, 384, 640, 896, 896, 640, 384, 128}, -{384, 1152, 1920, 2688, 2688, 1920, 1152, 384}, -{640, 1920, 3200, 4480, 4480, 3200, 1920, 640}, -{896, 2688, 4480, 6272, 6272, 4480, 2688, 896}, -{896, 2688, 4480, 6272, 6272, 4480, 2688, 896}, -{640, 1920, 3200, 4480, 4480, 3200, 1920, 640}, -{384, 1152, 1920, 2688, 2688, 1920, 1152, 384}, -{128, 384, 640, 896, 896, 640, 384, 128} -}; - -void -ia_css_tdf_vmem_encode( - struct ia_css_isp_tdf_vmem_params *to, - const struct ia_css_tdf_config *from, - size_t size) -{ - unsigned i; - (void)size; - - for (i = 0; i < ISP_VEC_NELEMS; i++) { - to->pyramid[0][i] = g_pyramid[i/8][i%8]; - to->threshold_flat[0][i] = from->thres_flat_table[i]; - to->threshold_detail[0][i] = from->thres_detail_table[i]; - } - -} - -void -ia_css_tdf_encode( - struct ia_css_isp_tdf_dmem_params *to, - const struct ia_css_tdf_config *from, - size_t size) -{ - (void)size; - to->Epsilon_0 = from->epsilon_0; - to->Epsilon_1 = from->epsilon_1; - to->EpsScaleText = from->eps_scale_text; - to->EpsScaleEdge = from->eps_scale_edge; - to->Sepa_flat = from->sepa_flat; - to->Sepa_Edge = from->sepa_edge; - to->Blend_Flat = from->blend_flat; - to->Blend_Text = from->blend_text; - to->Blend_Edge = from->blend_edge; - to->Shading_Gain = from->shading_gain; - to->Shading_baseGain = from->shading_base_gain; - to->LocalY_Gain = from->local_y_gain; - to->LocalY_baseGain = from->local_y_base_gain; -} - -void -ia_css_tdf_debug_dtrace( - const struct ia_css_tdf_config *config, - unsigned level) -{ - (void)config; - (void)level; -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h deleted file mode 100644 index bd628a1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h +++ /dev/null @@ -1,38 +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_TDF_HOST_H -#define __IA_CSS_TDF_HOST_H - -#include "ia_css_tdf_types.h" -#include "ia_css_tdf_param.h" - -void -ia_css_tdf_vmem_encode( - struct ia_css_isp_tdf_vmem_params *to, - const struct ia_css_tdf_config *from, - size_t size); - -void -ia_css_tdf_encode( - struct ia_css_isp_tdf_dmem_params *to, - const struct ia_css_tdf_config *from, - size_t size); - -void -ia_css_tdf_debug_dtrace( - const struct ia_css_tdf_config *config, unsigned level) -; - -#endif /* __IA_CSS_TDF_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h deleted file mode 100644 index 9334f2e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h +++ /dev/null @@ -1,43 +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_TDF_PARAM_H -#define __IA_CSS_TDF_PARAM_H - -#include "type_support.h" -#include "vmem.h" /* needed for VMEM_ARRAY */ - -struct ia_css_isp_tdf_vmem_params { - VMEM_ARRAY(pyramid, ISP_VEC_NELEMS); - VMEM_ARRAY(threshold_flat, ISP_VEC_NELEMS); - VMEM_ARRAY(threshold_detail, ISP_VEC_NELEMS); -}; - -struct ia_css_isp_tdf_dmem_params { - int32_t Epsilon_0; - int32_t Epsilon_1; - int32_t EpsScaleText; - int32_t EpsScaleEdge; - int32_t Sepa_flat; - int32_t Sepa_Edge; - int32_t Blend_Flat; - int32_t Blend_Text; - int32_t Blend_Edge; - int32_t Shading_Gain; - int32_t Shading_baseGain; - int32_t LocalY_Gain; - int32_t LocalY_baseGain; -}; - -#endif /* __IA_CSS_TDF_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h deleted file mode 100644 index 91ea8dd..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h +++ /dev/null @@ -1,53 +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_TDF_TYPES_H -#define __IA_CSS_TDF_TYPES_H - -/* @file -* CSS-API header file for Transform Domain Filter parameters. -*/ - -#include "type_support.h" - -/* Transform Domain Filter configuration - * - * \brief TDF public parameters. - * \details Struct with all parameters for the TDF kernel that can be set - * from the CSS API. - * - * ISP2.6.1: TDF is used. - */ -struct ia_css_tdf_config { - int32_t thres_flat_table[64]; /** Final optimized strength table of NR for flat region. */ - int32_t thres_detail_table[64]; /** Final optimized strength table of NR for detail region. */ - int32_t epsilon_0; /** Coefficient to control variance for dark area (for flat region). */ - int32_t epsilon_1; /** Coefficient to control variance for bright area (for flat region). */ - int32_t eps_scale_text; /** Epsilon scaling coefficient for texture region. */ - int32_t eps_scale_edge; /** Epsilon scaling coefficient for edge region. */ - int32_t sepa_flat; /** Threshold to judge flat (edge < m_Flat_thre). */ - int32_t sepa_edge; /** Threshold to judge edge (edge > m_Edge_thre). */ - int32_t blend_flat; /** Blending ratio at flat region. */ - int32_t blend_text; /** Blending ratio at texture region. */ - int32_t blend_edge; /** Blending ratio at edge region. */ - int32_t shading_gain; /** Gain of Shading control. */ - int32_t shading_base_gain; /** Base Gain of Shading control. */ - int32_t local_y_gain; /** Gain of local luminance control. */ - int32_t local_y_base_gain; /** Base gain of local luminance control. */ - int32_t rad_x_origin; /** Initial x coord. for radius computation. */ - int32_t rad_y_origin; /** Initial y coord. for radius computation. */ -}; - -#endif /* __IA_CSS_TDF_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h deleted file mode 100644 index 223423f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifdef ISP2401 -/** -Support for Intel Camera Imaging ISP subsystem. -Copyright (c) 2010 - 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_TNR3_TYPES_H -#define _IA_CSS_TNR3_TYPES_H - -/* @file -* CSS-API header file for Temporal Noise Reduction v3 (TNR3) kernel -*/ - -/** - * \brief Number of piecewise linear segments. - * \details The parameters to TNR3 are specified as a piecewise linear segment. - * The number of such segments is fixed at 3. - */ -#define TNR3_NUM_SEGMENTS 3 - -/* Temporal Noise Reduction v3 (TNR3) configuration. - * The parameter to this kernel is fourfold - * 1. Three piecewise linear graphs (one for each plane) with three segments - * each. Each line graph has Luma values on the x axis and sigma values for - * each plane on the y axis. The three linear segments may have a different - * slope and the point of Luma value which where the slope may change is called - * a "Knee" point. As there are three such segments, four points need to be - * specified each on the Luma axis and the per plane Sigma axis. On the Luma - * axis two points are fixed (namely 0 and maximum luma value - depending on - * ISP bit depth). The other two points are the points where the slope may - * change its value. These two points are called knee points. The four points on - * the per plane sigma axis are also specified at the interface. - * 2. One rounding adjustment parameter for each plane - * 3. One maximum feedback threshold value for each plane - * 4. Selection of the reference frame buffer to be used for noise reduction. - */ -struct ia_css_tnr3_kernel_config { - unsigned int maxfb_y; /** Maximum Feedback Gain for Y */ - unsigned int maxfb_u; /** Maximum Feedback Gain for U */ - unsigned int maxfb_v; /** Maximum Feedback Gain for V */ - unsigned int round_adj_y; /** Rounding Adjust for Y */ - unsigned int round_adj_u; /** Rounding Adjust for U */ - unsigned int round_adj_v; /** Rounding Adjust for V */ - unsigned int knee_y[TNR3_NUM_SEGMENTS - 1]; /** Knee points */ - unsigned int sigma_y[TNR3_NUM_SEGMENTS + 1]; /** Standard deviation for Y at points Y0, Y1, Y2, Y3 */ - unsigned int sigma_u[TNR3_NUM_SEGMENTS + 1]; /** Standard deviation for U at points U0, U1, U2, U3 */ - unsigned int sigma_v[TNR3_NUM_SEGMENTS + 1]; /** Standard deviation for V at points V0, V1, V2, V3 */ - unsigned int ref_buf_select; /** Selection of the reference buffer */ -}; - -#endif -#endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c deleted file mode 100644 index 222a7bd..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c +++ /dev/null @@ -1,130 +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 "ia_css_frame.h" -#include "sh_css_defs.h" -#include "ia_css_debug.h" -#include "sh_css_frac.h" -#include "assert_support.h" -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" -#include "isp.h" - -#include "ia_css_tnr.host.h" -const struct ia_css_tnr_config default_tnr_config = { - 32768, - 32, - 32, -}; - -void -ia_css_tnr_encode( - struct sh_css_isp_tnr_params *to, - const struct ia_css_tnr_config *from, - unsigned size) -{ - (void)size; - to->coef = - uDIGIT_FITTING(from->gain, 16, SH_CSS_TNR_COEF_SHIFT); - to->threshold_Y = - uDIGIT_FITTING(from->threshold_y, 16, SH_CSS_ISP_YUV_BITS); - to->threshold_C = - uDIGIT_FITTING(from->threshold_uv, 16, SH_CSS_ISP_YUV_BITS); -} - -void -ia_css_tnr_dump( - const struct sh_css_isp_tnr_params *tnr, - unsigned level) -{ - if (!tnr) return; - ia_css_debug_dtrace(level, "Temporal Noise Reduction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "tnr_coef", tnr->coef); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "tnr_threshold_Y", tnr->threshold_Y); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "tnr_threshold_C", tnr->threshold_C); -} - -void -ia_css_tnr_debug_dtrace( - const struct ia_css_tnr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.gain=%d, " - "config.threshold_y=%d, config.threshold_uv=%d\n", - config->gain, - config->threshold_y, config->threshold_uv); -} - -void -ia_css_tnr_config( - struct sh_css_isp_tnr_isp_config *to, - const struct ia_css_tnr_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - unsigned i; - - (void)size; - ia_css_dma_configure_from_info(&to->port_b, &from->tnr_frames[0]->info); - to->width_a_over_b = elems_a / to->port_b.elems; - to->frame_height = from->tnr_frames[0]->info.res.height; -#ifndef ISP2401 - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) { -#else - for (i = 0; i < NUM_TNR_FRAMES; i++) { -#endif - to->tnr_frame_addr[i] = from->tnr_frames[i]->data + from->tnr_frames[i]->planes.yuyv.offset; - } - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->port_b.elems == 0); -} - -void -ia_css_tnr_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame **frames) -{ - struct ia_css_tnr_configuration config; - unsigned i; - -#ifndef ISP2401 - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) -#else - for (i = 0; i < NUM_TNR_FRAMES; i++) -#endif - config.tnr_frames[i] = frames[i]; - - ia_css_configure_tnr(binary, &config); -} - -void -ia_css_init_tnr_state( - struct sh_css_isp_tnr_dmem_state *state, - size_t size) -{ - (void)size; - -#ifndef ISP2401 - assert(NUM_VIDEO_TNR_FRAMES >= 2); -#endif - assert(sizeof(*state) == size); - state->tnr_in_buf_idx = 0; - state->tnr_out_buf_idx = 1; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h deleted file mode 100644 index 9290dfa..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h +++ /dev/null @@ -1,56 +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_TNR_HOST_H -#define __IA_CSS_TNR_HOST_H - -#include "ia_css_binary.h" -#include "ia_css_tnr_state.h" -#include "ia_css_tnr_types.h" -#include "ia_css_tnr_param.h" - -extern const struct ia_css_tnr_config default_tnr_config; - -void -ia_css_tnr_encode( - struct sh_css_isp_tnr_params *to, - const struct ia_css_tnr_config *from, - unsigned size); - -void -ia_css_tnr_dump( - const struct sh_css_isp_tnr_params *tnr, - unsigned level); - -void -ia_css_tnr_debug_dtrace( - const struct ia_css_tnr_config *config, - unsigned level); - -void -ia_css_tnr_config( - struct sh_css_isp_tnr_isp_config *to, - const struct ia_css_tnr_configuration *from, - unsigned size); - -void -ia_css_tnr_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame **frames); - -void -ia_css_init_tnr_state( - struct sh_css_isp_tnr_dmem_state *state, - size_t size); -#endif /* __IA_CSS_TNR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h deleted file mode 100644 index db4a7cc..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h +++ /dev/null @@ -1,48 +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_TNR_PARAM_H -#define __IA_CSS_TNR_PARAM_H - -#include "type_support.h" -#include "sh_css_defs.h" -#include "dma.h" - -/* TNR (Temporal Noise Reduction) */ -struct sh_css_isp_tnr_params { - int32_t coef; - int32_t threshold_Y; - int32_t threshold_C; -}; - -struct ia_css_tnr_configuration { -#ifndef ISP2401 - const struct ia_css_frame *tnr_frames[NUM_VIDEO_TNR_FRAMES]; -#else - const struct ia_css_frame *tnr_frames[NUM_TNR_FRAMES]; -#endif -}; - -struct sh_css_isp_tnr_isp_config { - uint32_t width_a_over_b; - uint32_t frame_height; - struct dma_port_config port_b; -#ifndef ISP2401 - hrt_vaddress tnr_frame_addr[NUM_VIDEO_TNR_FRAMES]; -#else - hrt_vaddress tnr_frame_addr[NUM_TNR_FRAMES]; -#endif -}; - -#endif /* __IA_CSS_TNR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h deleted file mode 100644 index 8b1218f..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h +++ /dev/null @@ -1,26 +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_TNR_STATE_H -#define __IA_CSS_TNR_STATE_H - -#include "type_support.h" - -/* TNR (temporal noise reduction) */ -struct sh_css_isp_tnr_dmem_state { - uint32_t tnr_in_buf_idx; - uint32_t tnr_out_buf_idx; -}; - -#endif /* __IA_CSS_TNR_STATE_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h deleted file mode 100644 index 9bbc9ab..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h +++ /dev/null @@ -1,60 +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_TNR_TYPES_H -#define __IA_CSS_TNR_TYPES_H - -/* @file -* CSS-API header file for Temporal Noise Reduction (TNR) parameters. -*/ - -/* Temporal Noise Reduction (TNR) configuration. - * - * When difference between current frame and previous frame is less than or - * equal to threshold, TNR works and current frame is mixed - * with previous frame. - * When difference between current frame and previous frame is greater - * than threshold, we judge motion is detected. Then, TNR does not work and - * current frame is outputted as it is. - * Therefore, when threshold_y and threshold_uv are set as 0, TNR can be disabled. - * - * ISP block: TNR1 - * ISP1: TNR1 is used. - * ISP2: TNR1 is used. - */ - - -struct ia_css_tnr_config { - ia_css_u0_16 gain; /** Interpolation ratio of current frame - and previous frame. - gain=0.0 -> previous frame is outputted. - gain=1.0 -> current frame is outputted. - u0.16, [0,65535], - default 32768(0.5), ineffective 65535(almost 1.0) */ - ia_css_u0_16 threshold_y; /** Threshold to enable interpolation of Y. - If difference between current frame and - previous frame is greater than threshold_y, - TNR for Y is disabled. - u0.16, [0,65535], default/ineffective 0 */ - ia_css_u0_16 threshold_uv; /** Threshold to enable interpolation of - U/V. - If difference between current frame and - previous frame is greater than threshold_uv, - TNR for UV is disabled. - u0.16, [0,65535], default/ineffective 0 */ -}; - - -#endif /* __IA_CSS_TNR_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h deleted file mode 100644 index 26b7b5b..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_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_UDS_PARAM_H -#define __IA_CSS_UDS_PARAM_H - -#include "sh_css_uds.h" - -/* uds (Up and Down scaling) */ -struct ia_css_uds_config { - struct sh_css_crop_pos crop_pos; - struct sh_css_uds_info uds; -}; - -struct sh_css_sp_uds_params { - struct sh_css_crop_pos crop_pos; - struct sh_css_uds_info uds; -}; - -#endif /* __IA_CSS_UDS_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c deleted file mode 100644 index c2076e4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +++ /dev/null @@ -1,140 +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_vf.host.h" -#include <assert_support.h> -#include <ia_css_err.h> -#include <ia_css_frame.h> -#include <ia_css_frame_public.h> -#include <ia_css_pipeline.h> -#define IA_CSS_INCLUDE_CONFIGURATIONS -#include "ia_css_isp_configs.h" - -#include "isp.h" - -void -ia_css_vf_config( - struct sh_css_isp_vf_isp_config *to, - const struct ia_css_vf_configuration *from, - unsigned size) -{ - unsigned elems_a = ISP_VEC_NELEMS; - - (void)size; - to->vf_downscale_bits = from->vf_downscale_bits; - to->enable = from->info != NULL; - - if (from->info) { - ia_css_frame_info_to_frame_sp_info(&to->info, from->info); - ia_css_dma_configure_from_info(&to->dma.port_b, from->info); - to->dma.width_a_over_b = elems_a / to->dma.port_b.elems; - - /* Assume divisiblity here, may need to generalize to fixed point. */ - assert (elems_a % to->dma.port_b.elems == 0); - } -} - -/* compute the log2 of the downscale factor needed to get closest - * to the requested viewfinder resolution on the upper side. The output cannot - * be smaller than the requested viewfinder resolution. - */ -enum ia_css_err -sh_css_vf_downscale_log2( - const struct ia_css_frame_info *out_info, - const struct ia_css_frame_info *vf_info, - unsigned int *downscale_log2) -{ - unsigned int ds_log2 = 0; - unsigned int out_width; - - if ((out_info == NULL) | (vf_info == NULL)) - return IA_CSS_ERR_INVALID_ARGUMENTS; - - out_width = out_info->res.width; - - if (out_width == 0) - return IA_CSS_ERR_INVALID_ARGUMENTS; - - /* downscale until width smaller than the viewfinder width. We don't - * test for the height since the vmem buffers only put restrictions on - * the width of a line, not on the number of lines in a frame. - */ - while (out_width >= vf_info->res.width) { - ds_log2++; - out_width /= 2; - } - /* now width is smaller, so we go up one step */ - if ((ds_log2 > 0) && (out_width < ia_css_binary_max_vf_width())) - ds_log2--; - /* TODO: use actual max input resolution of vf_pp binary */ - if ((out_info->res.width >> ds_log2) >= 2 * ia_css_binary_max_vf_width()) - return IA_CSS_ERR_INVALID_ARGUMENTS; - *downscale_log2 = ds_log2; - return IA_CSS_SUCCESS; -} - -static enum ia_css_err -configure_kernel( - const struct ia_css_binary_info *info, - const struct ia_css_frame_info *out_info, - const struct ia_css_frame_info *vf_info, - unsigned int *downscale_log2, - struct ia_css_vf_configuration *config) -{ - enum ia_css_err err; - unsigned vf_log_ds = 0; - - /* First compute value */ - if (vf_info) { - err = sh_css_vf_downscale_log2(out_info, vf_info, &vf_log_ds); - if (err != IA_CSS_SUCCESS) - return err; - } - vf_log_ds = min(vf_log_ds, info->vf_dec.max_log_downscale); - *downscale_log2 = vf_log_ds; - - /* Then store it in isp config section */ - config->vf_downscale_bits = vf_log_ds; - return IA_CSS_SUCCESS; -} - -static void -configure_dma( - struct ia_css_vf_configuration *config, - const struct ia_css_frame_info *vf_info) -{ - config->info = vf_info; -} - -enum ia_css_err -ia_css_vf_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *out_info, - struct ia_css_frame_info *vf_info, - unsigned int *downscale_log2) -{ - enum ia_css_err err; - struct ia_css_vf_configuration config; - const struct ia_css_binary_info *info = &binary->info->sp; - - err = configure_kernel(info, out_info, vf_info, downscale_log2, &config); - configure_dma(&config, vf_info); - - if (vf_info) - vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel; - ia_css_configure_vf (binary, &config); - - return IA_CSS_SUCCESS; -} - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h deleted file mode 100644 index c7c3625..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h +++ /dev/null @@ -1,47 +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_VF_HOST_H -#define __IA_CSS_VF_HOST_H - -#include "ia_css_frame_public.h" -#include "ia_css_binary.h" - -#include "ia_css_vf_types.h" -#include "ia_css_vf_param.h" - -/* compute the log2 of the downscale factor needed to get closest - * to the requested viewfinder resolution on the upper side. The output cannot - * be smaller than the requested viewfinder resolution. - */ -enum ia_css_err -sh_css_vf_downscale_log2( - const struct ia_css_frame_info *out_info, - const struct ia_css_frame_info *vf_info, - unsigned int *downscale_log2); - -void -ia_css_vf_config( - struct sh_css_isp_vf_isp_config *to, - const struct ia_css_vf_configuration *from, - unsigned size); - -enum ia_css_err -ia_css_vf_configure( - const struct ia_css_binary *binary, - const struct ia_css_frame_info *out_info, - struct ia_css_frame_info *vf_info, - unsigned int *downscale_log2); - -#endif /* __IA_CSS_VF_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h deleted file mode 100644 index 9df4e12..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h +++ /dev/null @@ -1,37 +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_VF_PARAM_H -#define __IA_CSS_VF_PARAM_H - -#include "type_support.h" -#include "dma.h" -#include "gc/gc_1.0/ia_css_gc_param.h" /* GAMMA_OUTPUT_BITS */ -#include "ia_css_frame_comm.h" /* ia_css_frame_sp_info */ -#include "ia_css_vf_types.h" - -#define VFDEC_BITS_PER_PIXEL GAMMA_OUTPUT_BITS - -/* Viewfinder decimation */ -struct sh_css_isp_vf_isp_config { - uint32_t vf_downscale_bits; /** Log VF downscale value */ - uint32_t enable; - struct ia_css_frame_sp_info info; - struct { - uint32_t width_a_over_b; - struct dma_port_config port_b; - } dma; -}; - -#endif /* __IA_CSS_VF_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h deleted file mode 100644 index e3efafa..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h +++ /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. - */ - -#ifndef __IA_CSS_VF_TYPES_H -#define __IA_CSS_VF_TYPES_H - -/* Viewfinder decimation - * - * ISP block: vfeven_horizontal_downscale - */ - -#include <ia_css_frame_public.h> -#include <type_support.h> - -struct ia_css_vf_configuration { - uint32_t vf_downscale_bits; /** Log VF downscale value */ - const struct ia_css_frame_info *info; -}; - -#endif /* __IA_CSS_VF_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c deleted file mode 100644 index b43cb88..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c +++ /dev/null @@ -1,89 +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 -#include "ia_css_debug.h" -#endif -#include "sh_css_frac.h" - -#include "ia_css_wb.host.h" - -const struct ia_css_wb_config default_wb_config = { - 1, - 32768, - 32768, - 32768, - 32768 -}; - -void -ia_css_wb_encode( - struct sh_css_isp_wb_params *to, - const struct ia_css_wb_config *from, - unsigned size) -{ - (void)size; - to->gain_shift = - uISP_REG_BIT - from->integer_bits; - to->gain_gr = - uDIGIT_FITTING(from->gr, 16 - from->integer_bits, - to->gain_shift); - to->gain_r = - uDIGIT_FITTING(from->r, 16 - from->integer_bits, - to->gain_shift); - to->gain_b = - uDIGIT_FITTING(from->b, 16 - from->integer_bits, - to->gain_shift); - to->gain_gb = - uDIGIT_FITTING(from->gb, 16 - from->integer_bits, - to->gain_shift); -} - -#ifndef IA_CSS_NO_DEBUG -void -ia_css_wb_dump( - const struct sh_css_isp_wb_params *wb, - unsigned level) -{ - if (!wb) return; - ia_css_debug_dtrace(level, "White Balance:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "wb_gain_shift", wb->gain_shift); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "wb_gain_gr", wb->gain_gr); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "wb_gain_r", wb->gain_r); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "wb_gain_b", wb->gain_b); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "wb_gain_gb", wb->gain_gb); -} - -void -ia_css_wb_debug_dtrace( - const struct ia_css_wb_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.integer_bits=%d, " - "config.gr=%d, config.r=%d, " - "config.b=%d, config.gb=%d\n", - config->integer_bits, - config->gr, config->r, - config->b, config->gb); -} -#endif - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h deleted file mode 100644 index 18666ba..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h +++ /dev/null @@ -1,39 +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_WB_HOST_H -#define __IA_CSS_WB_HOST_H - -#include "ia_css_wb_types.h" -#include "ia_css_wb_param.h" - -extern const struct ia_css_wb_config default_wb_config; - -void -ia_css_wb_encode( - struct sh_css_isp_wb_params *to, - const struct ia_css_wb_config *from, - unsigned size); - -void -ia_css_wb_dump( - const struct sh_css_isp_wb_params *wb, - unsigned level); - -void -ia_css_wb_debug_dtrace( - const struct ia_css_wb_config *wb, - unsigned level); - -#endif /* __IA_CSS_WB_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h deleted file mode 100644 index c95c53a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h +++ /dev/null @@ -1,29 +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_WB_PARAM_H -#define __IA_CSS_WB_PARAM_H - -#include "type_support.h" - -/* WB (White Balance) */ -struct sh_css_isp_wb_params { - int32_t gain_shift; - int32_t gain_gr; - int32_t gain_r; - int32_t gain_b; - int32_t gain_gb; -}; - -#endif /* __IA_CSS_WB_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h deleted file mode 100644 index bf98734..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h +++ /dev/null @@ -1,47 +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_WB_TYPES_H -#define __IA_CSS_WB_TYPES_H - -/* @file -* CSS-API header file for White Balance parameters. -*/ - - -/* White Balance configuration (Gain Adjust). - * - * ISP block: WB1 - * ISP1: WB1 is used. - * ISP2: WB1 is used. - */ -struct ia_css_wb_config { - uint32_t integer_bits; /** Common exponent of gains. - u8.0, [0,3], - default 1, ineffective 1 */ - uint32_t gr; /** Significand of Gr gain. - u[integer_bits].[16-integer_bits], [0,65535], - default/ineffective 32768(u1.15, 1.0) */ - uint32_t r; /** Significand of R gain. - u[integer_bits].[16-integer_bits], [0,65535], - default/ineffective 32768(u1.15, 1.0) */ - uint32_t b; /** Significand of B gain. - u[integer_bits].[16-integer_bits], [0,65535], - default/ineffective 32768(u1.15, 1.0) */ - uint32_t gb; /** Significand of Gb gain. - u[integer_bits].[16-integer_bits], [0,65535], - default/ineffective 32768(u1.15, 1.0) */ -}; - -#endif /* __IA_CSS_WB_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c deleted file mode 100644 index abcb531..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c +++ /dev/null @@ -1,66 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" - -#include "ia_css_xnr.host.h" - -const struct ia_css_xnr_config default_xnr_config = { - /* default threshold 6400 translates to 25 on ISP. */ - 6400 -}; - -void -ia_css_xnr_table_vamem_encode( - struct sh_css_isp_xnr_vamem_params *to, - const struct ia_css_xnr_table *from, - unsigned size) -{ - (void)size; - memcpy (&to->xnr, &from->data, sizeof(to->xnr)); -} - -void -ia_css_xnr_encode( - struct sh_css_isp_xnr_params *to, - const struct ia_css_xnr_config *from, - unsigned size) -{ - (void)size; - - to->threshold = - (uint16_t)uDIGIT_FITTING(from->threshold, 16, SH_CSS_ISP_YUV_BITS); -} - -void -ia_css_xnr_table_debug_dtrace( - const struct ia_css_xnr_table *config, - unsigned level) -{ - (void)config; - (void)level; -} - -void -ia_css_xnr_debug_dtrace( - const struct ia_css_xnr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.threshold=%d\n", config->threshold); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h deleted file mode 100644 index eb3425e..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h +++ /dev/null @@ -1,47 +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_XNR_HOST_H -#define __IA_CSS_XNR_HOST_H - -#include "sh_css_params.h" - -#include "ia_css_xnr_param.h" -#include "ia_css_xnr_table.host.h" - -extern const struct ia_css_xnr_config default_xnr_config; - -void -ia_css_xnr_table_vamem_encode( - struct sh_css_isp_xnr_vamem_params *to, - const struct ia_css_xnr_table *from, - unsigned size); - -void -ia_css_xnr_encode( - struct sh_css_isp_xnr_params *to, - const struct ia_css_xnr_config *from, - unsigned size); - -void -ia_css_xnr_table_debug_dtrace( - const struct ia_css_xnr_table *s3a, - unsigned level); - -void -ia_css_xnr_debug_dtrace( - const struct ia_css_xnr_config *config, - unsigned level); - -#endif /* __IA_CSS_XNR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h deleted file mode 100644 index a5caebb..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h +++ /dev/null @@ -1,51 +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_XNR_PARAM_H -#define __IA_CSS_XNR_PARAM_H - -#include "type_support.h" -#include <system_global.h> - -#ifndef PIPE_GENERATION -#if defined(HAS_VAMEM_VERSION_2) -#define SH_CSS_ISP_XNR_TABLE_SIZE_LOG2 IA_CSS_VAMEM_2_XNR_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_XNR_TABLE_SIZE IA_CSS_VAMEM_2_XNR_TABLE_SIZE -#elif defined(HAS_VAMEM_VERSION_1) -#define SH_CSS_ISP_XNR_TABLE_SIZE_LOG2 IA_CSS_VAMEM_1_XNR_TABLE_SIZE_LOG2 -#define SH_CSS_ISP_XNR_TABLE_SIZE IA_CSS_VAMEM_1_XNR_TABLE_SIZE -#else -#error "Unknown vamem type" -#endif - - -#else -/* For pipe generation, the size is not relevant */ -#define SH_CSS_ISP_XNR_TABLE_SIZE 0 -#endif - -/* This should be vamem_data_t, but that breaks the pipe generator */ -struct sh_css_isp_xnr_vamem_params { - uint16_t xnr[SH_CSS_ISP_XNR_TABLE_SIZE]; -}; - -struct sh_css_isp_xnr_params { - /* XNR threshold. - * type:u0.16 but actual valid range is:[0,255] - * valid range is dependent on SH_CSS_ISP_YUV_BITS (currently 8bits) - * default: 25 */ - uint16_t threshold; -}; - -#endif /* __IA_CSS_XNR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c deleted file mode 100644 index cd5fb72..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c +++ /dev/null @@ -1,81 +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 <type_support.h> -#include <string_support.h> /* memcpy */ -#include "system_global.h" -#include "vamem.h" -#include "ia_css_types.h" -#include "ia_css_xnr_table.host.h" - -struct ia_css_xnr_table default_xnr_table; - -#if defined(HAS_VAMEM_VERSION_2) - -static const uint16_t -default_xnr_table_data[IA_CSS_VAMEM_2_XNR_TABLE_SIZE] = { - /* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ - 8191>>1, 4096>>1, 2730>>1, 2048>>1, 1638>>1, 1365>>1, 1170>>1, 1024>>1, 910>>1, 819>>1, 744>>1, 682>>1, 630>>1, 585>>1, - 546>>1, 512>>1, - - /* 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 */ - 481>>1, 455>>1, 431>>1, 409>>1, 390>>1, 372>>1, 356>>1, 341>>1, 327>>1, 315>>1, 303>>1, 292>>1, 282>>1, 273>>1, 264>>1, - 256>>1, - - /* 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 */ - 248>>1, 240>>1, 234>>1, 227>>1, 221>>1, 215>>1, 210>>1, 204>>1, 199>>1, 195>>1, 190>>1, 186>>1, 182>>1, 178>>1, 174>>1, - 170>>1, - - /* 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 */ - 167>>1, 163>>1, 160>>1, 157>>1, 154>>1, 151>>1, 148>>1, 146>>1, 143>>1, 141>>1, 138>>1, 136>>1, 134>>1, 132>>1, 130>>1, 128>>1 -}; - -#elif defined(HAS_VAMEM_VERSION_1) - -static const uint16_t -default_xnr_table_data[IA_CSS_VAMEM_1_XNR_TABLE_SIZE] = { - /* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */ - 8191>>1, 4096>>1, 2730>>1, 2048>>1, 1638>>1, 1365>>1, 1170>>1, 1024>>1, 910>>1, 819>>1, 744>>1, 682>>1, 630>>1, 585>>1, - 546>>1, 512>>1, - - /* 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 */ - 481>>1, 455>>1, 431>>1, 409>>1, 390>>1, 372>>1, 356>>1, 341>>1, 327>>1, 315>>1, 303>>1, 292>>1, 282>>1, 273>>1, 264>>1, - 256>>1, - - /* 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 */ - 248>>1, 240>>1, 234>>1, 227>>1, 221>>1, 215>>1, 210>>1, 204>>1, 199>>1, 195>>1, 190>>1, 186>>1, 182>>1, 178>>1, 174>>1, - 170>>1, - - /* 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 */ - 167>>1, 163>>1, 160>>1, 157>>1, 154>>1, 151>>1, 148>>1, 146>>1, 143>>1, 141>>1, 138>>1, 136>>1, 134>>1, 132>>1, 130>>1, 128>>1 -}; - -#else -#error "sh_css_params.c: VAMEM version must \ - be one of {VAMEM_VERSION_1, VAMEM_VERSION_2}" -#endif - -void -ia_css_config_xnr_table(void) -{ -#if defined(HAS_VAMEM_VERSION_2) - memcpy(default_xnr_table.data.vamem_2, default_xnr_table_data, - sizeof(default_xnr_table_data)); - default_xnr_table.vamem_type = IA_CSS_VAMEM_TYPE_2; -#else - memcpy(default_xnr_table.data.vamem_1, default_xnr_table_data, - sizeof(default_xnr_table_data)); - default_xnr_table.vamem_type = IA_CSS_VAMEM_TYPE_1; -#endif -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h deleted file mode 100644 index 1300867..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_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_XNR_TABLE_HOST_H -#define __IA_CSS_XNR_TABLE_HOST_H - -extern struct ia_css_xnr_table default_xnr_table; - -void ia_css_config_xnr_table(void); - -#endif /* __IA_CSS_XNR_TABLE_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h deleted file mode 100644 index d2b6342..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h +++ /dev/null @@ -1,71 +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_XNR_TYPES_H -#define __IA_CSS_XNR_TYPES_H - -/* @file -* CSS-API header file for Extra Noise Reduction (XNR) parameters. -*/ - -/* XNR table. - * - * NOTE: The driver does not need to set this table, - * because the default values are set inside the css. - * - * This table contains coefficients used for division in XNR. - * - * u0.12, [0,4095], - * {4095, 2048, 1365, .........., 65, 64} - * ({1/1, 1/2, 1/3, ............., 1/63, 1/64}) - * - * ISP block: XNR1 - * ISP1: XNR1 is used. - * ISP2: XNR1 is used. - * - */ - -/* Number of elements in the xnr table. */ -#define IA_CSS_VAMEM_1_XNR_TABLE_SIZE_LOG2 6 -/* Number of elements in the xnr table. */ -#define IA_CSS_VAMEM_1_XNR_TABLE_SIZE (1U<<IA_CSS_VAMEM_1_XNR_TABLE_SIZE_LOG2) - -/* Number of elements in the xnr table. */ -#define IA_CSS_VAMEM_2_XNR_TABLE_SIZE_LOG2 6 -/* Number of elements in the xnr table. */ -#define IA_CSS_VAMEM_2_XNR_TABLE_SIZE (1U<<IA_CSS_VAMEM_2_XNR_TABLE_SIZE_LOG2) - -/** IA_CSS_VAMEM_TYPE_1(ISP2300) or - IA_CSS_VAMEM_TYPE_2(ISP2400) */ -union ia_css_xnr_data { - uint16_t vamem_1[IA_CSS_VAMEM_1_XNR_TABLE_SIZE]; - /** Coefficients table on vamem type1. u0.12, [0,4095] */ - uint16_t vamem_2[IA_CSS_VAMEM_2_XNR_TABLE_SIZE]; - /** Coefficients table on vamem type2. u0.12, [0,4095] */ -}; - -struct ia_css_xnr_table { - enum ia_css_vamem_type vamem_type; - union ia_css_xnr_data data; -}; - -struct ia_css_xnr_config { - /* XNR threshold. - * type:u0.16 valid range:[0,65535] - * default: 6400 */ - uint16_t threshold; -}; - -#endif /* __IA_CSS_XNR_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c deleted file mode 100644 index 955b6c8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c +++ /dev/null @@ -1,265 +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 "type_support.h" -#include "math_support.h" -#include "sh_css_defs.h" -#include "ia_css_types.h" -#ifdef ISP2401 -#include "assert_support.h" -#endif -#include "ia_css_xnr3.host.h" - -/* Maximum value for alpha on ISP interface */ -#define XNR_MAX_ALPHA ((1 << (ISP_VEC_ELEMBITS - 1)) - 1) - -/* Minimum value for sigma on host interface. Lower values translate to - * max_alpha. - */ -#define XNR_MIN_SIGMA (IA_CSS_XNR3_SIGMA_SCALE / 100) - -/* -#ifdef ISP2401 - * division look-up table - * Refers to XNR3.0.5 - */ -#define XNR3_LOOK_UP_TABLE_POINTS 16 - -static const int16_t x[XNR3_LOOK_UP_TABLE_POINTS] = { -1024, 1164, 1320, 1492, 1680, 1884, 2108, 2352, -2616, 2900, 3208, 3540, 3896, 4276, 4684, 5120}; - -static const int16_t a[XNR3_LOOK_UP_TABLE_POINTS] = { --7213, -5580, -4371, -3421, -2722, -2159, -6950, -5585, --4529, -3697, -3010, -2485, -2070, -1727, -1428, 0}; - -static const int16_t b[XNR3_LOOK_UP_TABLE_POINTS] = { -4096, 3603, 3178, 2811, 2497, 2226, 1990, 1783, -1603, 1446, 1307, 1185, 1077, 981, 895, 819}; - -static const int16_t c[XNR3_LOOK_UP_TABLE_POINTS] = { -1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - -/* -#endif - * Default kernel parameters. In general, default is bypass mode or as close - * to the ineffective values as possible. Due to the chroma down+upsampling, - * perfect bypass mode is not possible for xnr3 filter itself. Instead, the - * 'blending' parameter is used to create a bypass. - */ -const struct ia_css_xnr3_config default_xnr3_config = { - /* sigma */ - { 0, 0, 0, 0, 0, 0 }, - /* coring */ - { 0, 0, 0, 0 }, - /* blending */ - { 0 } -}; - -/* - * Compute an alpha value for the ISP kernel from sigma value on the host - * parameter interface as: alpha_scale * 1/(sigma/sigma_scale) - */ -static int32_t -compute_alpha(int sigma) -{ - int32_t alpha; -#if defined(XNR_ATE_ROUNDING_BUG) - int32_t alpha_unscaled; -#else - int offset = sigma / 2; -#endif - if (sigma < XNR_MIN_SIGMA) { - alpha = XNR_MAX_ALPHA; - } else { -#if defined(XNR_ATE_ROUNDING_BUG) - /* The scale factor for alpha must be the same as on the ISP, - * For sigma, it must match the public interface. The code - * below mimics the rounding and unintended loss of precision - * of the ATE reference code. It computes an unscaled alpha, - * rounds down, and then scales it to get the required fixed - * point representation. It would have been more precise to - * round after scaling. */ - alpha_unscaled = IA_CSS_XNR3_SIGMA_SCALE / sigma; - alpha = alpha_unscaled * XNR_ALPHA_SCALE_FACTOR; -#else - alpha = ((IA_CSS_XNR3_SIGMA_SCALE * XNR_ALPHA_SCALE_FACTOR) + offset)/ sigma; -#endif - - if (alpha > XNR_MAX_ALPHA) - alpha = XNR_MAX_ALPHA; - } - - return alpha; -} - -/* - * Compute the scaled coring value for the ISP kernel from the value on the - * host parameter interface. - */ -static int32_t -compute_coring(int coring) -{ - int32_t isp_coring; - int32_t isp_scale = XNR_CORING_SCALE_FACTOR; - int32_t host_scale = IA_CSS_XNR3_CORING_SCALE; - int32_t offset = host_scale / 2; /* fixed-point 0.5 */ - - /* Convert from public host-side scale factor to isp-side scale - * factor. Clip to [0, isp_scale-1). - */ - isp_coring = ((coring * isp_scale) + offset) / host_scale; - return min(max(isp_coring, 0), isp_scale - 1); -} - -/* - * Compute the scaled blending strength for the ISP kernel from the value on - * the host parameter interface. - */ -static int32_t -compute_blending(int strength) -{ - int32_t isp_strength; - int32_t isp_scale = XNR_BLENDING_SCALE_FACTOR; - int32_t host_scale = IA_CSS_XNR3_BLENDING_SCALE; - int32_t offset = host_scale / 2; /* fixed-point 0.5 */ - - /* Convert from public host-side scale factor to isp-side scale - * factor. The blending factor is positive on the host side, but - * negative on the ISP side because +1.0 cannot be represented - * exactly as s0.11 fixed point, but -1.0 can. - */ - isp_strength = -(((strength * isp_scale) + offset) / host_scale); - return max(min(isp_strength, 0), -XNR_BLENDING_SCALE_FACTOR); -} - -void -ia_css_xnr3_encode( - struct sh_css_isp_xnr3_params *to, - const struct ia_css_xnr3_config *from, - unsigned size) -{ - int kernel_size = XNR_FILTER_SIZE; - /* The adjust factor is the next power of 2 - w.r.t. the kernel size*/ - int adjust_factor = ceil_pow2(kernel_size); - int32_t max_diff = (1 << (ISP_VEC_ELEMBITS - 1)) - 1; - int32_t min_diff = -(1 << (ISP_VEC_ELEMBITS - 1)); - - int32_t alpha_y0 = compute_alpha(from->sigma.y0); - int32_t alpha_y1 = compute_alpha(from->sigma.y1); - int32_t alpha_u0 = compute_alpha(from->sigma.u0); - int32_t alpha_u1 = compute_alpha(from->sigma.u1); - int32_t alpha_v0 = compute_alpha(from->sigma.v0); - int32_t alpha_v1 = compute_alpha(from->sigma.v1); - int32_t alpha_ydiff = (alpha_y1 - alpha_y0) * adjust_factor / kernel_size; - int32_t alpha_udiff = (alpha_u1 - alpha_u0) * adjust_factor / kernel_size; - int32_t alpha_vdiff = (alpha_v1 - alpha_v0) * adjust_factor / kernel_size; - - int32_t coring_u0 = compute_coring(from->coring.u0); - int32_t coring_u1 = compute_coring(from->coring.u1); - int32_t coring_v0 = compute_coring(from->coring.v0); - int32_t coring_v1 = compute_coring(from->coring.v1); - int32_t coring_udiff = (coring_u1 - coring_u0) * adjust_factor / kernel_size; - int32_t coring_vdiff = (coring_v1 - coring_v0) * adjust_factor / kernel_size; - - int32_t blending = compute_blending(from->blending.strength); - - (void)size; - - /* alpha's are represented in qN.5 format */ - to->alpha.y0 = alpha_y0; - to->alpha.u0 = alpha_u0; - to->alpha.v0 = alpha_v0; - to->alpha.ydiff = min(max(alpha_ydiff, min_diff), max_diff); - to->alpha.udiff = min(max(alpha_udiff, min_diff), max_diff); - to->alpha.vdiff = min(max(alpha_vdiff, min_diff), max_diff); - - /* coring parameters are expressed in q1.NN format */ - to->coring.u0 = coring_u0; - to->coring.v0 = coring_v0; - to->coring.udiff = min(max(coring_udiff, min_diff), max_diff); - to->coring.vdiff = min(max(coring_vdiff, min_diff), max_diff); - - /* blending strength is expressed in q1.NN format */ - to->blending.strength = blending; -} - -#ifdef ISP2401 -/* (void) = ia_css_xnr3_vmem_encode(*to, *from) - * ----------------------------------------------- - * VMEM Encode Function to translate UV parameters from userspace into ISP space -*/ -void -ia_css_xnr3_vmem_encode( - struct sh_css_isp_xnr3_vmem_params *to, - const struct ia_css_xnr3_config *from, - unsigned size) -{ - unsigned i, j, base; - const unsigned total_blocks = 4; - const unsigned shuffle_block = 16; - - (void)from; - (void)size; - - /* Init */ - for (i = 0; i < ISP_VEC_NELEMS; i++) { - to->x[0][i] = 0; - to->a[0][i] = 0; - to->b[0][i] = 0; - to->c[0][i] = 0; - } - - /* Constraints on "x": - * - values should be greater or equal to 0. - * - values should be ascending. - */ - assert(x[0] >= 0); - - for (j = 1; j < XNR3_LOOK_UP_TABLE_POINTS; j++) { - assert(x[j] >= 0); - assert(x[j] > x[j - 1]); - - } - - /* The implementation of the calulating 1/x is based on the availability - * of the OP_vec_shuffle16 operation. - * A 64 element vector is split up in 4 blocks of 16 element. Each array is copied to - * a vector 4 times, (starting at 0, 16, 32 and 48). All array elements are copied or - * initialised as described in the KFS. The remaining elements of a vector are set to 0. - */ - /* TODO: guard this code with above assumptions */ - for (i = 0; i < total_blocks; i++) { - base = shuffle_block * i; - - for (j = 0; j < XNR3_LOOK_UP_TABLE_POINTS; j++) { - to->x[0][base + j] = x[j]; - to->a[0][base + j] = a[j]; - to->b[0][base + j] = b[j]; - to->c[0][base + j] = c[j]; - } - } -} - -#endif -/* Dummy Function added as the tool expects it*/ -void -ia_css_xnr3_debug_dtrace( - const struct ia_css_xnr3_config *config, - unsigned level) -{ - (void)config; - (void)level; -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h deleted file mode 100644 index 6a86924..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h +++ /dev/null @@ -1,42 +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_XNR3_HOST_H -#define __IA_CSS_XNR3_HOST_H - -#include "ia_css_xnr3_param.h" -#include "ia_css_xnr3_types.h" - -extern const struct ia_css_xnr3_config default_xnr3_config; - -void -ia_css_xnr3_encode( - struct sh_css_isp_xnr3_params *to, - const struct ia_css_xnr3_config *from, - unsigned size); - -#ifdef ISP2401 -void -ia_css_xnr3_vmem_encode( - struct sh_css_isp_xnr3_vmem_params *to, - const struct ia_css_xnr3_config *from, - unsigned size); - -#endif -void -ia_css_xnr3_debug_dtrace( - const struct ia_css_xnr3_config *config, - unsigned level); - -#endif /* __IA_CSS_XNR3_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h deleted file mode 100644 index 06c24e8..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h +++ /dev/null @@ -1,96 +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_XNR3_PARAM_H -#define __IA_CSS_XNR3_PARAM_H - -#include "type_support.h" -#ifdef ISP2401 -#include "vmem.h" /* needed for VMEM_ARRAY */ - -#endif - -/* Scaling factor of the alpha values: which fixed-point value represents 1.0? - * It must be chosen such that 1/min_sigma still fits in an ISP vector - * element. */ -#define XNR_ALPHA_SCALE_LOG2 5 -#define XNR_ALPHA_SCALE_FACTOR (1 << XNR_ALPHA_SCALE_LOG2) - -/* Scaling factor of the coring values on the ISP. */ -#define XNR_CORING_SCALE_LOG2 (ISP_VEC_ELEMBITS-1) -#define XNR_CORING_SCALE_FACTOR (1 << XNR_CORING_SCALE_LOG2) - -/* Scaling factor of the blending strength on the ISP. */ -#define XNR_BLENDING_SCALE_LOG2 (ISP_VEC_ELEMBITS-1) -#define XNR_BLENDING_SCALE_FACTOR (1 << XNR_BLENDING_SCALE_LOG2) - -/* XNR3 filter size. Must be 11x11, 9x9 or 5x5. */ -#ifdef FLT_KERNEL_9x9 -#define XNR_FILTER_SIZE 9 -#else -#ifdef FLT_KERNEL_11x11 -#define XNR_FILTER_SIZE 11 -#else -#define XNR_FILTER_SIZE 5 -#endif -#endif - -/* XNR3 alpha (1/sigma) parameters on the ISP, expressed as a base (0) value - * for dark areas, and a scaled diff towards the value for bright areas. */ -struct sh_css_xnr3_alpha_params { - int32_t y0; - int32_t u0; - int32_t v0; - int32_t ydiff; - int32_t udiff; - int32_t vdiff; -}; - -/* XNR3 coring parameters on the ISP, expressed as a base (0) value - * for dark areas, and a scaled diff towards the value for bright areas. */ -struct sh_css_xnr3_coring_params { - int32_t u0; - int32_t v0; - int32_t udiff; - int32_t vdiff; -}; - -/* XNR3 blending strength on the ISP. */ -struct sh_css_xnr3_blending_params { - int32_t strength; -}; - -/* XNR3 ISP parameters */ -struct sh_css_isp_xnr3_params { - struct sh_css_xnr3_alpha_params alpha; - struct sh_css_xnr3_coring_params coring; - struct sh_css_xnr3_blending_params blending; -}; - -#ifdef ISP2401 -/* - * STRUCT sh_css_isp_xnr3_vmem_params - * ----------------------------------------------- - * ISP VMEM parameters - */ -struct sh_css_isp_xnr3_vmem_params { - VMEM_ARRAY(x, ISP_VEC_NELEMS); - VMEM_ARRAY(a, ISP_VEC_NELEMS); - VMEM_ARRAY(b, ISP_VEC_NELEMS); - VMEM_ARRAY(c, ISP_VEC_NELEMS); -}; - - -#endif -#endif /*__IA_CSS_XNR3_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h deleted file mode 100644 index 669200c..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h +++ /dev/null @@ -1,98 +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_XNR3_TYPES_H -#define __IA_CSS_XNR3_TYPES_H - -/* @file -* CSS-API header file for Extra Noise Reduction (XNR) parameters. -*/ - -/** - * \brief Scale of the XNR sigma parameters. - * \details The define specifies which fixed-point value represents 1.0. - */ -#define IA_CSS_XNR3_SIGMA_SCALE (1 << 10) - -/** - * \brief Scale of the XNR coring parameters. - * \details The define specifies which fixed-point value represents 1.0. - */ -#define IA_CSS_XNR3_CORING_SCALE (1 << 15) - -/** - * \brief Scale of the XNR blending parameter. - * \details The define specifies which fixed-point value represents 1.0. - */ -#define IA_CSS_XNR3_BLENDING_SCALE (1 << 11) - - -/** - * \brief XNR3 Sigma Parameters. - * \details Sigma parameters define the strength of the XNR filter. - * A higher number means stronger filtering. There are two values for each of - * the three YUV planes: one for dark areas and one for bright areas. All - * sigma parameters are fixed-point values between 0.0 and 1.0, scaled with - * IA_CSS_XNR3_SIGMA_SCALE. - */ -struct ia_css_xnr3_sigma_params { - int y0; /** Sigma for Y range similarity in dark area */ - int y1; /** Sigma for Y range similarity in bright area */ - int u0; /** Sigma for U range similarity in dark area */ - int u1; /** Sigma for U range similarity in bright area */ - int v0; /** Sigma for V range similarity in dark area */ - int v1; /** Sigma for V range similarity in bright area */ -}; - -/** - * \brief XNR3 Coring Parameters - * \details Coring parameters define the "coring" strength, which is a soft - * thresholding technique to avoid false coloring. There are two values for - * each of the two chroma planes: one for dark areas and one for bright areas. - * All coring parameters are fixed-point values between 0.0 and 1.0, scaled - * with IA_CSS_XNR3_CORING_SCALE. The ineffective value is 0. - */ -struct ia_css_xnr3_coring_params { - int u0; /** Coring threshold of U channel in dark area */ - int u1; /** Coring threshold of U channel in bright area */ - int v0; /** Coring threshold of V channel in dark area */ - int v1; /** Coring threshold of V channel in bright area */ -}; - -/** - * \brief XNR3 Blending Parameters - * \details Blending parameters define the blending strength of filtered - * output pixels with the original chroma pixels from before xnr3. The - * blending strength is a fixed-point value between 0.0 and 1.0 (inclusive), - * scaled with IA_CSS_XNR3_BLENDING_SCALE. - * A higher number applies xnr filtering more strongly. A value of 1.0 - * disables the blending and returns the xnr3 filtered output, while a - * value of 0.0 bypasses the entire xnr3 filter. - */ -struct ia_css_xnr3_blending_params { - int strength; /** Blending strength */ -}; - -/** - * \brief XNR3 public parameters. - * \details Struct with all parameters for the XNR3 kernel that can be set - * from the CSS API. - */ -struct ia_css_xnr3_config { - struct ia_css_xnr3_sigma_params sigma; /** XNR3 sigma parameters */ - struct ia_css_xnr3_coring_params coring; /** XNR3 coring parameters */ - struct ia_css_xnr3_blending_params blending; /** XNR3 blending parameters */ -}; - -#endif /* __IA_CSS_XNR3_TYPES_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c deleted file mode 100644 index d8dccce..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c +++ /dev/null @@ -1,219 +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" -#include "ia_css_debug.h" -#include "sh_css_frac.h" - -#include "bnr/bnr_1.0/ia_css_bnr.host.h" -#include "ia_css_ynr.host.h" - -const struct ia_css_nr_config default_nr_config = { - 16384, - 8192, - 1280, - 0, - 0 -}; - -const struct ia_css_ee_config default_ee_config = { - 8192, - 128, - 2048 -}; - -void -ia_css_nr_encode( - struct sh_css_isp_ynr_params *to, - const struct ia_css_nr_config *from, - unsigned size) -{ - (void)size; - /* YNR (Y Noise Reduction) */ - to->threshold = - uDIGIT_FITTING((unsigned)8192, 16, SH_CSS_BAYER_BITS); - to->gain_all = - uDIGIT_FITTING(from->ynr_gain, 16, SH_CSS_YNR_GAIN_SHIFT); - to->gain_dir = - uDIGIT_FITTING(from->ynr_gain, 16, SH_CSS_YNR_GAIN_SHIFT); - to->threshold_cb = - uDIGIT_FITTING(from->threshold_cb, 16, SH_CSS_BAYER_BITS); - to->threshold_cr = - uDIGIT_FITTING(from->threshold_cr, 16, SH_CSS_BAYER_BITS); -} - -void -ia_css_yee_encode( - struct sh_css_isp_yee_params *to, - const struct ia_css_yee_config *from, - unsigned size) -{ - int asiWk1 = (int) from->ee.gain; - int asiWk2 = asiWk1 / 8; - int asiWk3 = asiWk1 / 4; - - (void)size; - /* YEE (Y Edge Enhancement) */ - to->dirthreshold_s = - min((uDIGIT_FITTING(from->nr.direction, 16, SH_CSS_BAYER_BITS) - << 1), - SH_CSS_BAYER_MAXVAL); - to->dirthreshold_g = - min((uDIGIT_FITTING(from->nr.direction, 16, SH_CSS_BAYER_BITS) - << 4), - SH_CSS_BAYER_MAXVAL); - to->dirthreshold_width_log2 = - uFRACTION_BITS_FITTING(8); - to->dirthreshold_width = - 1 << to->dirthreshold_width_log2; - to->detailgain = - uDIGIT_FITTING(from->ee.detail_gain, 11, - SH_CSS_YEE_DETAIL_GAIN_SHIFT); - to->coring_s = - (uDIGIT_FITTING((unsigned)56, 16, SH_CSS_BAYER_BITS) * - from->ee.threshold) >> 8; - to->coring_g = - (uDIGIT_FITTING((unsigned)224, 16, SH_CSS_BAYER_BITS) * - from->ee.threshold) >> 8; - /* 8; // *1.125 ->[s4.8] */ - to->scale_plus_s = - (asiWk1 + asiWk2) >> (11 - SH_CSS_YEE_SCALE_SHIFT); - /* 8; // ( * -.25)->[s4.8] */ - to->scale_plus_g = - (0 - asiWk3) >> (11 - SH_CSS_YEE_SCALE_SHIFT); - /* 8; // *0.875 ->[s4.8] */ - to->scale_minus_s = - (asiWk1 - asiWk2) >> (11 - SH_CSS_YEE_SCALE_SHIFT); - /* 8; // ( *.25 ) ->[s4.8] */ - to->scale_minus_g = - (asiWk3) >> (11 - SH_CSS_YEE_SCALE_SHIFT); - to->clip_plus_s = - uDIGIT_FITTING((unsigned)32760, 16, SH_CSS_BAYER_BITS); - to->clip_plus_g = 0; - to->clip_minus_s = - uDIGIT_FITTING((unsigned)504, 16, SH_CSS_BAYER_BITS); - to->clip_minus_g = - uDIGIT_FITTING((unsigned)32256, 16, SH_CSS_BAYER_BITS); - to->Yclip = SH_CSS_BAYER_MAXVAL; -} - -void -ia_css_nr_dump( - const struct sh_css_isp_ynr_params *ynr, - unsigned level) -{ - if (!ynr) return; - ia_css_debug_dtrace(level, - "Y Noise Reduction:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynr_threshold", ynr->threshold); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynr_gain_all", ynr->gain_all); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynr_gain_dir", ynr->gain_dir); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynr_threshold_cb", ynr->threshold_cb); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynr_threshold_cr", ynr->threshold_cr); -} - -void -ia_css_yee_dump( - const struct sh_css_isp_yee_params *yee, - unsigned level) -{ - ia_css_debug_dtrace(level, - "Y Edge Enhancement:\n"); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynryee_dirthreshold_s", - yee->dirthreshold_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynryee_dirthreshold_g", - yee->dirthreshold_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynryee_dirthreshold_width_log2", - yee->dirthreshold_width_log2); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynryee_dirthreshold_width", - yee->dirthreshold_width); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_detailgain", - yee->detailgain); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_coring_s", - yee->coring_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_coring_g", - yee->coring_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_scale_plus_s", - yee->scale_plus_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_scale_plus_g", - yee->scale_plus_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_scale_minus_s", - yee->scale_minus_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_scale_minus_g", - yee->scale_minus_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_clip_plus_s", - yee->clip_plus_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_clip_plus_g", - yee->clip_plus_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_clip_minus_s", - yee->clip_minus_s); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "yee_clip_minus_g", - yee->clip_minus_g); - ia_css_debug_dtrace(level, "\t%-32s = %d\n", - "ynryee_Yclip", - yee->Yclip); -} - -void -ia_css_nr_debug_dtrace( - const struct ia_css_nr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.direction=%d, " - "config.bnr_gain=%d, config.ynr_gain=%d, " - "config.threshold_cb=%d, config.threshold_cr=%d\n", - config->direction, - config->bnr_gain, config->ynr_gain, - config->threshold_cb, config->threshold_cr); -} - -void -ia_css_ee_debug_dtrace( - const struct ia_css_ee_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.threshold=%d, config.gain=%d, config.detail_gain=%d\n", - config->threshold, config->gain, config->detail_gain); -} - -void -ia_css_init_ynr_state( - void/*struct sh_css_isp_ynr_vmem_state*/ *state, - size_t size) -{ - memset(state, 0, size); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h deleted file mode 100644 index b5730df3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h +++ /dev/null @@ -1,60 +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_YNR_HOST_H -#define __IA_CSS_YNR_HOST_H - -#include "ia_css_ynr_types.h" -#include "ia_css_ynr_param.h" - -extern const struct ia_css_nr_config default_nr_config; -extern const struct ia_css_ee_config default_ee_config; - -void -ia_css_nr_encode( - struct sh_css_isp_ynr_params *to, - const struct ia_css_nr_config *from, - unsigned size); - -void -ia_css_yee_encode( - struct sh_css_isp_yee_params *to, - const struct ia_css_yee_config *from, - unsigned size); - -void -ia_css_nr_dump( - const struct sh_css_isp_ynr_params *ynr, - unsigned level); - -void -ia_css_yee_dump( - const struct sh_css_isp_yee_params *yee, - unsigned level); - -void -ia_css_nr_debug_dtrace( - const struct ia_css_nr_config *config, - unsigned level); - -void -ia_css_ee_debug_dtrace( - const struct ia_css_ee_config *config, - unsigned level); - -void -ia_css_init_ynr_state( - void/*struct sh_css_isp_ynr_vmem_state*/ *state, - size_t size); -#endif /* __IA_CSS_YNR_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h deleted file mode 100644 index ad61ec12..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h +++ /dev/null @@ -1,49 +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_YNR_PARAM_H -#define __IA_CSS_YNR_PARAM_H - -#include "type_support.h" - -/* YNR (Y Noise Reduction) */ -struct sh_css_isp_ynr_params { - int32_t threshold; - int32_t gain_all; - int32_t gain_dir; - int32_t threshold_cb; - int32_t threshold_cr; -}; - -/* YEE (Y Edge Enhancement) */ -struct sh_css_isp_yee_params { - int32_t dirthreshold_s; - int32_t dirthreshold_g; - int32_t dirthreshold_width_log2; - int32_t dirthreshold_width; - int32_t detailgain; - int32_t coring_s; - int32_t coring_g; - int32_t scale_plus_s; - int32_t scale_plus_g; - int32_t scale_minus_s; - int32_t scale_minus_g; - int32_t clip_plus_s; - int32_t clip_plus_g; - int32_t clip_minus_s; - int32_t clip_minus_g; - int32_t Yclip; -}; - -#endif /* __IA_CSS_YNR_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h deleted file mode 100644 index b2348b1..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h +++ /dev/null @@ -1,26 +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_YNR_STATE_H -#define __IA_CSS_YNR_STATE_H - -#include "type_support.h" -#include "vmem.h" - -/* YNR (luminance noise reduction) */ -struct sh_css_isp_ynr_vmem_state { - VMEM_ARRAY(ynr_buf[4], MAX_VECTORS_PER_BUF_LINE*ISP_NWAY); -}; - -#endif /* __IA_CSS_YNR_STATE_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h deleted file mode 100644 index 3f8589a..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h +++ /dev/null @@ -1,81 +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_YNR_TYPES_H -#define __IA_CSS_YNR_TYPES_H - -/* @file -* CSS-API header file for Noise Reduction (BNR) and YCC Noise Reduction (YNR,CNR). -*/ - -/* Configuration used by Bayer Noise Reduction (BNR) and - * YCC Noise Reduction (YNR,CNR). - * - * ISP block: BNR1, YNR1, CNR1 - * ISP1: BNR1,YNR1,CNR1 are used. - * ISP2: BNR1,YNR1,CNR1 are used for Preview/Video. - * BNR1,YNR2,CNR2 are used for Still. - */ -struct ia_css_nr_config { - ia_css_u0_16 bnr_gain; /** Strength of noise reduction (BNR). - u0.16, [0,65535], - default 14336(0.21875), ineffective 0 */ - ia_css_u0_16 ynr_gain; /** Strength of noise reduction (YNR). - u0.16, [0,65535], - default 14336(0.21875), ineffective 0 */ - ia_css_u0_16 direction; /** Sensitivity of edge (BNR). - u0.16, [0,65535], - default 512(0.0078125), ineffective 0 */ - ia_css_u0_16 threshold_cb; /** Coring threshold for Cb (CNR). - This is the same as - de_config.c1_coring_threshold. - u0.16, [0,65535], - default 0(0), ineffective 0 */ - ia_css_u0_16 threshold_cr; /** Coring threshold for Cr (CNR). - This is the same as - de_config.c2_coring_threshold. - u0.16, [0,65535], - default 0(0), ineffective 0 */ -}; - -/* Edge Enhancement (sharpen) configuration. - * - * ISP block: YEE1 - * ISP1: YEE1 is used. - * ISP2: YEE1 is used for Preview/Video. - * (YEE2 is used for Still.) - */ -struct ia_css_ee_config { - ia_css_u5_11 gain; /** The strength of sharpness. - u5.11, [0,65535], - default 8192(4.0), ineffective 0 */ - ia_css_u8_8 threshold; /** The threshold that divides noises from - edge. - u8.8, [0,65535], - default 256(1.0), ineffective 65535 */ - ia_css_u5_11 detail_gain; /** The strength of sharpness in pell-mell - area. - u5.11, [0,65535], - default 2048(1.0), ineffective 0 */ -}; - -/* YNR and YEE (sharpen) configuration. - */ -struct ia_css_yee_config { - struct ia_css_nr_config nr; /** The NR configuration. */ - struct ia_css_ee_config ee; /** The EE configuration. */ -}; - -#endif /* __IA_CSS_YNR_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c deleted file mode 100644 index 44b0050..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c +++ /dev/null @@ -1,125 +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" -#include "ia_css_debug.h" -#include "assert_support.h" - -#include "ia_css_ynr2.host.h" - -const struct ia_css_ynr_config default_ynr_config = { - 0, - 0, - 0, - 0, -}; - -const struct ia_css_fc_config default_fc_config = { - 1, - 0, /* 0 -> ineffective */ - 0, /* 0 -> ineffective */ - 0, /* 0 -> ineffective */ - 0, /* 0 -> ineffective */ - (1 << (ISP_VEC_ELEMBITS - 2)), /* 0.5 */ - (1 << (ISP_VEC_ELEMBITS - 2)), /* 0.5 */ - (1 << (ISP_VEC_ELEMBITS - 2)), /* 0.5 */ - (1 << (ISP_VEC_ELEMBITS - 2)), /* 0.5 */ - (1 << (ISP_VEC_ELEMBITS - 1)) - 1, /* 1 */ - (1 << (ISP_VEC_ELEMBITS - 1)) - 1, /* 1 */ - (int16_t)- (1 << (ISP_VEC_ELEMBITS - 1)), /* -1 */ - (int16_t)- (1 << (ISP_VEC_ELEMBITS - 1)), /* -1 */ -}; - -void -ia_css_ynr_encode( - struct sh_css_isp_yee2_params *to, - const struct ia_css_ynr_config *from, - unsigned size) -{ - (void)size; - to->edge_sense_gain_0 = from->edge_sense_gain_0; - to->edge_sense_gain_1 = from->edge_sense_gain_1; - to->corner_sense_gain_0 = from->corner_sense_gain_0; - to->corner_sense_gain_1 = from->corner_sense_gain_1; -} - -void -ia_css_fc_encode( - struct sh_css_isp_fc_params *to, - const struct ia_css_fc_config *from, - unsigned size) -{ - (void)size; - to->gain_exp = from->gain_exp; - - to->coring_pos_0 = from->coring_pos_0; - to->coring_pos_1 = from->coring_pos_1; - to->coring_neg_0 = from->coring_neg_0; - to->coring_neg_1 = from->coring_neg_1; - - to->gain_pos_0 = from->gain_pos_0; - to->gain_pos_1 = from->gain_pos_1; - to->gain_neg_0 = from->gain_neg_0; - to->gain_neg_1 = from->gain_neg_1; - - to->crop_pos_0 = from->crop_pos_0; - to->crop_pos_1 = from->crop_pos_1; - to->crop_neg_0 = from->crop_neg_0; - to->crop_neg_1 = from->crop_neg_1; -} - -void -ia_css_ynr_dump( - const struct sh_css_isp_yee2_params *yee2, - unsigned level); - -void -ia_css_fc_dump( - const struct sh_css_isp_fc_params *fc, - unsigned level); - -void -ia_css_fc_debug_dtrace( - const struct ia_css_fc_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.gain_exp=%d, " - "config.coring_pos_0=%d, config.coring_pos_1=%d, " - "config.coring_neg_0=%d, config.coring_neg_1=%d, " - "config.gain_pos_0=%d, config.gain_pos_1=%d, " - "config.gain_neg_0=%d, config.gain_neg_1=%d, " - "config.crop_pos_0=%d, config.crop_pos_1=%d, " - "config.crop_neg_0=%d, config.crop_neg_1=%d\n", - config->gain_exp, - config->coring_pos_0, config->coring_pos_1, - config->coring_neg_0, config->coring_neg_1, - config->gain_pos_0, config->gain_pos_1, - config->gain_neg_0, config->gain_neg_1, - config->crop_pos_0, config->crop_pos_1, - config->crop_neg_0, config->crop_neg_1); -} - -void -ia_css_ynr_debug_dtrace( - const struct ia_css_ynr_config *config, - unsigned level) -{ - ia_css_debug_dtrace(level, - "config.edge_sense_gain_0=%d, config.edge_sense_gain_1=%d, " - "config.corner_sense_gain_0=%d, config.corner_sense_gain_1=%d\n", - config->edge_sense_gain_0, config->edge_sense_gain_1, - config->corner_sense_gain_0, config->corner_sense_gain_1); -} diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h deleted file mode 100644 index 71e89c4..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h +++ /dev/null @@ -1,56 +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_YNR2_HOST_H -#define __IA_CSS_YNR2_HOST_H - -#include "ia_css_ynr2_types.h" -#include "ia_css_ynr2_param.h" - -extern const struct ia_css_ynr_config default_ynr_config; -extern const struct ia_css_fc_config default_fc_config; - -void -ia_css_ynr_encode( - struct sh_css_isp_yee2_params *to, - const struct ia_css_ynr_config *from, - unsigned size); - -void -ia_css_fc_encode( - struct sh_css_isp_fc_params *to, - const struct ia_css_fc_config *from, - unsigned size); - -void -ia_css_ynr_dump( - const struct sh_css_isp_yee2_params *yee2, - unsigned level); - -void -ia_css_fc_dump( - const struct sh_css_isp_fc_params *fc, - unsigned level); - -void -ia_css_fc_debug_dtrace( - const struct ia_css_fc_config *config, - unsigned level); - -void -ia_css_ynr_debug_dtrace( - const struct ia_css_ynr_config *config, - unsigned level); - -#endif /* __IA_CSS_YNR2_HOST_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h deleted file mode 100644 index e56b695..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h +++ /dev/null @@ -1,45 +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_YNR2_PARAM_H -#define __IA_CSS_YNR2_PARAM_H - -#include "type_support.h" - -/* YNR (Y Noise Reduction), YEE (Y Edge Enhancement) */ -struct sh_css_isp_yee2_params { - int32_t edge_sense_gain_0; - int32_t edge_sense_gain_1; - int32_t corner_sense_gain_0; - int32_t corner_sense_gain_1; -}; - -/* Fringe Control */ -struct sh_css_isp_fc_params { - int32_t gain_exp; - uint16_t coring_pos_0; - uint16_t coring_pos_1; - uint16_t coring_neg_0; - uint16_t coring_neg_1; - int32_t gain_pos_0; - int32_t gain_pos_1; - int32_t gain_neg_0; - int32_t gain_neg_1; - int32_t crop_pos_0; - int32_t crop_pos_1; - int32_t crop_neg_0; - int32_t crop_neg_1; -}; - -#endif /* __IA_CSS_YNR2_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h deleted file mode 100644 index 83161a24..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h +++ /dev/null @@ -1,94 +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_YNR2_TYPES_H -#define __IA_CSS_YNR2_TYPES_H - -/* @file -* CSS-API header file for Y(Luma) Noise Reduction. -*/ - -/* Y(Luma) Noise Reduction configuration. - * - * ISP block: YNR2 & YEE2 - * (ISP1: YNR1 and YEE1 are used.) - * (ISP2: YNR1 and YEE1 are used for Preview/Video.) - * ISP2: YNR2 and YEE2 are used for Still. - */ -struct ia_css_ynr_config { - uint16_t edge_sense_gain_0; /** Sensitivity of edge in dark area. - u13.0, [0,8191], - default 1000, ineffective 0 */ - uint16_t edge_sense_gain_1; /** Sensitivity of edge in bright area. - u13.0, [0,8191], - default 1000, ineffective 0 */ - uint16_t corner_sense_gain_0; /** Sensitivity of corner in dark area. - u13.0, [0,8191], - default 1000, ineffective 0 */ - uint16_t corner_sense_gain_1; /** Sensitivity of corner in bright area. - u13.0, [0,8191], - default 1000, ineffective 0 */ -}; - -/* Fringe Control configuration. - * - * ISP block: FC2 (FC2 is used with YNR2/YEE2.) - * (ISP1: FC2 is not used.) - * (ISP2: FC2 is not for Preview/Video.) - * ISP2: FC2 is used for Still. - */ -struct ia_css_fc_config { - uint8_t gain_exp; /** Common exponent of gains. - u8.0, [0,13], - default 1, ineffective 0 */ - uint16_t coring_pos_0; /** Coring threshold for positive edge in dark area. - u0.13, [0,8191], - default 0(0), ineffective 0 */ - uint16_t coring_pos_1; /** Coring threshold for positive edge in bright area. - u0.13, [0,8191], - default 0(0), ineffective 0 */ - uint16_t coring_neg_0; /** Coring threshold for negative edge in dark area. - u0.13, [0,8191], - default 0(0), ineffective 0 */ - uint16_t coring_neg_1; /** Coring threshold for negative edge in bright area. - u0.13, [0,8191], - default 0(0), ineffective 0 */ - uint16_t gain_pos_0; /** Gain for positive edge in dark area. - u0.13, [0,8191], - default 4096(0.5), ineffective 0 */ - uint16_t gain_pos_1; /** Gain for positive edge in bright area. - u0.13, [0,8191], - default 4096(0.5), ineffective 0 */ - uint16_t gain_neg_0; /** Gain for negative edge in dark area. - u0.13, [0,8191], - default 4096(0.5), ineffective 0 */ - uint16_t gain_neg_1; /** Gain for negative edge in bright area. - u0.13, [0,8191], - default 4096(0.5), ineffective 0 */ - uint16_t crop_pos_0; /** Limit for positive edge in dark area. - u0.13, [0,8191], - default/ineffective 8191(almost 1.0) */ - uint16_t crop_pos_1; /** Limit for positive edge in bright area. - u0.13, [0,8191], - default/ineffective 8191(almost 1.0) */ - int16_t crop_neg_0; /** Limit for negative edge in dark area. - s0.13, [-8192,0], - default/ineffective -8192(-1.0) */ - int16_t crop_neg_1; /** Limit for negative edge in bright area. - s0.13, [-8192,0], - default/ineffective -8192(-1.0) */ -}; - -#endif /* __IA_CSS_YNR2_TYPES_H */ - diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h deleted file mode 100644 index 48fb7d2..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h +++ /dev/null @@ -1,20 +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_YNRX_PARAM_H -#define __IA_CSS_YNRX_PARAM_H - -#include "ia_css_ynr2_param.h" - -#endif /* __IA_CSS_YNRX_PARAM_H */ diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h deleted file mode 100644 index 2516dd3..0000000 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h +++ /dev/null @@ -1,21 +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_YNR2_STATE_H -#define __IA_CSS_YNR2_STATE_H - -/* Reuse YNR1 states */ -#include "../ynr_1.0/ia_css_ynr_state.h" - -#endif /* __IA_CSS_YNR2_STATE_H */ |
