diff options
author | 2018-06-07 12:34:37 -0700 | |
---|---|---|
committer | 2018-06-07 12:34:37 -0700 | |
commit | 3036bc45364f98515a2c446d7fac2c34dcfbeff4 (patch) | |
tree | f565c03254413b779981ee5e9ed81b19d5b62c78 /drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c | |
parent | Merge tag 'powerpc-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/p... (diff) | |
parent | media: omap2: fix compile-testing with FB_OMAP2=m (diff) | |
download | linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.tar.gz linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.tar.bz2 linux-3036bc45364f98515a2c446d7fac2c34dcfbeff4.zip |
Merge tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- remove of atomisp driver from staging, as nobody would have time to
dedicate huge efforts to fix all the problems there. Also, we have a
feeling that the driver may not even run the way it is.
- move Zoran driver to staging, in order to be either fixed to use VB2
and the proper media kAPIs or to be removed
- remove videobuf-dvb driver, with is unused for a while
- some V4L2 documentation fixes/improvements
- new sensor drivers: imx258 and ov7251
- a new driver was added to allow using I2C transparent drivers
- several improvements at the ddbridge driver
- several improvements at the ISDB pt1 driver, making it more coherent
with the DVB framework
- added a new platform driver for MIPI CSI-2 RX: cadence
- now, all media drivers can be compiled on x86 with COMPILE_TEST
- almost all media drivers now build on non-x86 architectures with
COMPILE_TEST
- lots of other random stuff: cleanups, support for new board models,
bug fixes, etc
* tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits)
media: omap2: fix compile-testing with FB_OMAP2=m
media: media/radio/Kconfig: add back RADIO_ISA
media: v4l2-ioctl.c: fix missing unlock in __video_do_ioctl()
media: pxa_camera: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power
media: arch: sh: migor: Fix TW9910 PDN gpio
media: staging: tegra-vde: Reset VDE regardless of memory client resetting failure
media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG
media: marvel-ccic: allow ccic and mmp drivers to coexist
media: uvcvideo: Prevent setting unavailable flags
media: ddbridge: conditionally enable fast TS for stv0910-equipped bridges
media: dvb-frontends/stv0910: make TS speed configurable
media: ddbridge/mci: add identifiers to function definition arguments
media: ddbridge/mci: protect against out-of-bounds array access in stop()
media: rc: ensure input/lirc device can be opened after register
media: rc: nuvoton: Keep device enabled during reg init
media: rc: nuvoton: Keep track of users on CIR enable/disable
media: rc: nuvoton: Tweak the interrupt enabling dance
media: uvcvideo: Support realtek's UVC 1.5 device
media: uvcvideo: Fix driver reference counting
media: gspca_zc3xx: Enable short exposure times for OV7648
...
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c')
-rw-r--r-- | drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c | 162 |
1 files changed, 0 insertions, 162 deletions
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 9efe5e5e4e06..000000000000 --- 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); -} |