diff options
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0')
4 files changed, 0 insertions, 435 deletions
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 955adc4d6ab0..000000000000 --- 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 2f513e29d88c..000000000000 --- 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 66a7e58659c0..000000000000 --- 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 30772d217fb2..000000000000 --- 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 */ - |