From c043298228982ac486d015b1c359cfff93f6bdc6 Mon Sep 17 00:00:00 2001 From: Pengpeng Cui Date: Thu, 2 Jul 2015 19:54:02 +0800 Subject: [PATCH 439/462] atomisp2: css2401 and 2401_legacy-irci_master_20150701_0213 Merge CSS2.1 for css2401 and 2401_legacy for irci_master_20150701_0213 firmware tag Change-Id: I38169f182e307f18fa73cd62247ac0def67af6b2 Tracked-On: https://jira01.devtools.intel.com/browse/IMINAN-40868 Signed-off-by: Pengpeng Cui Reviewed-on: https://icggerrit.ir.intel.com/63198 Build: IMIN (SC) Approver: WeiX Meng Integrator: WeiX Meng Build: WeiX Meng Reviewed-by: WeiX Meng Maintainer: WeiX Meng --- .../css/base/circbuf/interface/ia_css_circbuf.h | 3 +- .../base/circbuf/interface/ia_css_circbuf_comm.h | 3 +- .../base/circbuf/interface/ia_css_circbuf_desc.h | 3 +- .../pci/atomisp2/css/base/circbuf/src/circbuf.c | 3 +- .../css/base/refcount/interface/ia_css_refcount.h | 3 +- .../pci/atomisp2/css/base/refcount/src/refcount.c | 6 +- .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 3 +- .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 3 +- .../css/camera/pipe/interface/ia_css_pipe_util.h | 3 +- .../atomisp2/css/camera/pipe/src/pipe_binarydesc.c | 52 +- .../atomisp2/css/camera/pipe/src/pipe_stagedesc.c | 3 +- .../pci/atomisp2/css/camera/pipe/src/pipe_util.c | 3 +- .../css/camera/util/interface/ia_css_util.h | 35 +- .../media/pci/atomisp2/css/camera/util/src/util.c | 18 +- .../ia_css_isp_configs.c | 26 +- .../ia_css_isp_configs.h | 12 +- .../ia_css_isp_params.c | 95 +- .../ia_css_isp_params.h | 5 +- .../ia_css_isp_states.c | 2 +- .../ia_css_isp_states.h | 2 +- .../pci/atomisp2/css/css_2400_system/hrt/bits.h | 2 +- .../atomisp2/css/css_2400_system/hrt/cell_params.h | 2 +- .../hrt/css_receiver_2400_common_defs.h | 2 +- .../css_2400_system/hrt/css_receiver_2400_defs.h | 2 +- .../pci/atomisp2/css/css_2400_system/hrt/defs.h | 2 +- .../atomisp2/css/css_2400_system/hrt/dma_v2_defs.h | 2 +- .../atomisp2/css/css_2400_system/hrt/gdc_v2_defs.h | 2 +- .../css/css_2400_system/hrt/gp_regs_defs.h | 2 +- .../css/css_2400_system/hrt/gp_timer_defs.h | 2 +- .../css/css_2400_system/hrt/gpio_block_defs.h | 2 +- .../css/css_2400_system/hrt/hive_isp_css_defs.h | 2 +- .../hrt/hive_isp_css_host_ids_hrt.h | 2 +- .../hrt/hive_isp_css_irq_types_hrt.h | 2 +- .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 2 +- .../atomisp2/css/css_2400_system/hrt/hive_types.h | 2 +- .../pci/atomisp2/css/css_2400_system/hrt/if_defs.h | 2 +- .../hrt/input_formatter_subsystem_defs.h | 2 +- .../css/css_2400_system/hrt/input_selector_defs.h | 2 +- .../css_2400_system/hrt/input_switch_2400_defs.h | 2 +- .../css_2400_system/hrt/input_system_ctrl_defs.h | 2 +- .../css/css_2400_system/hrt/input_system_defs.h | 2 +- .../css/css_2400_system/hrt/irq_controller_defs.h | 2 +- .../css_2400_system/hrt/isp2400_mamoiada_params.h | 2 +- .../css/css_2400_system/hrt/isp2400_support.h | 2 +- .../css/css_2400_system/hrt/isp_acquisition_defs.h | 2 +- .../css/css_2400_system/hrt/isp_capture_defs.h | 2 +- .../atomisp2/css/css_2400_system/hrt/mmu_defs.h | 2 +- .../hrt/scalar_processor_2400_params.h | 2 +- .../pci/atomisp2/css/css_2400_system/hrt/sp_hrt.h | 22 - .../css/css_2400_system/hrt/str2mem_defs.h | 2 +- .../css_2400_system/hrt/streaming_to_mipi_defs.h | 2 +- .../css_2400_system/hrt/timed_controller_defs.h | 2 +- .../pci/atomisp2/css/css_2400_system/hrt/var.h | 97 -- .../pci/atomisp2/css/css_2400_system/hrt/version.h | 2 +- .../pci/atomisp2/css/css_2400_system/spmem_dump.c | 848 ++++++++-------- .../css/css_2401_csi2p_system/csi_rx_global.h | 2 +- .../ia_css_isp_configs.c | 26 +- .../ia_css_isp_configs.h | 12 +- .../ia_css_isp_params.c | 95 +- .../ia_css_isp_params.h | 5 +- .../ia_css_isp_states.c | 2 +- .../ia_css_isp_states.h | 2 +- .../css/css_2401_csi2p_system/host/csi_rx.c | 2 +- .../css/css_2401_csi2p_system/host/csi_rx_local.h | 2 +- .../css_2401_csi2p_system/host/csi_rx_private.h | 2 +- .../css/css_2401_csi2p_system/host/ibuf_ctrl.c | 2 +- .../css_2401_csi2p_system/host/ibuf_ctrl_local.h | 2 +- .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 2 +- .../host/input_system_local.h | 2 +- .../host/input_system_private.h | 2 +- .../css/css_2401_csi2p_system/host/isys_dma.c | 2 +- .../css_2401_csi2p_system/host/isys_dma_local.h | 2 +- .../css_2401_csi2p_system/host/isys_dma_private.h | 2 +- .../css/css_2401_csi2p_system/host/isys_irq.c | 2 +- .../css_2401_csi2p_system/host/isys_irq_local.h | 2 +- .../css_2401_csi2p_system/host/isys_irq_private.h | 2 +- .../css_2401_csi2p_system/host/isys_stream2mmio.c | 2 +- .../host/isys_stream2mmio_local.h | 2 +- .../host/isys_stream2mmio_private.h | 2 +- .../css_2401_csi2p_system/host/pixelgen_local.h | 2 +- .../css_2401_csi2p_system/host/pixelgen_private.h | 2 +- .../css/css_2401_csi2p_system/host/system_local.h | 2 +- .../hrt/PixelGen_SysBlock_defs.h | 2 +- .../atomisp2/css/css_2401_csi2p_system/hrt/bits.h | 2 +- .../css/css_2401_csi2p_system/hrt/cell_params.h | 2 +- .../hrt/css_receiver_2400_common_defs.h | 2 +- .../hrt/css_receiver_2400_defs.h | 2 +- .../atomisp2/css/css_2401_csi2p_system/hrt/defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/dma_v2_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/gdc_v2_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/gp_regs_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/gp_timer_defs.h | 2 +- .../css_2401_csi2p_system/hrt/gpio_block_defs.h | 2 +- .../hrt/hive_isp_css_2401_irq_types_hrt.h | 2 +- .../css_2401_csi2p_system/hrt/hive_isp_css_defs.h | 2 +- .../hrt/hive_isp_css_host_ids_hrt.h | 2 +- .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 2 +- .../css/css_2401_csi2p_system/hrt/hive_types.h | 2 +- .../css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/if_defs.h | 2 +- .../hrt/input_formatter_subsystem_defs.h | 2 +- .../hrt/input_selector_defs.h | 2 +- .../hrt/input_switch_2400_defs.h | 2 +- .../hrt/input_system_ctrl_defs.h | 2 +- .../css_2401_csi2p_system/hrt/input_system_defs.h | 2 +- .../hrt/irq_controller_defs.h | 2 +- .../css_2401_csi2p_system/hrt/isp2400_support.h | 2 +- .../hrt/isp2401_mamoiada_params.h | 2 +- .../hrt/isp_acquisition_defs.h | 2 +- .../css_2401_csi2p_system/hrt/isp_capture_defs.h | 2 +- .../hrt/mipi_backend_common_defs.h | 2 +- .../css_2401_csi2p_system/hrt/mipi_backend_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/mmu_defs.h | 2 +- .../css/css_2401_csi2p_system/hrt/rx_csi_defs.h | 2 +- .../hrt/scalar_processor_2400_params.h | 2 +- .../css/css_2401_csi2p_system/hrt/sp_hrt.h | 22 - .../css/css_2401_csi2p_system/hrt/str2mem_defs.h | 2 +- .../css_2401_csi2p_system/hrt/stream2mmio_defs.h | 2 +- .../hrt/streaming_to_mipi_defs.h | 2 +- .../hrt/timed_controller_defs.h | 2 +- .../atomisp2/css/css_2401_csi2p_system/hrt/var.h | 97 -- .../css/css_2401_csi2p_system/hrt/version.h | 2 +- .../css/css_2401_csi2p_system/ibuf_ctrl_global.h | 2 +- .../css_2401_csi2p_system/input_system_global.h | 10 +- .../css/css_2401_csi2p_system/isys_dma_global.h | 2 +- .../css/css_2401_csi2p_system/isys_irq_global.h | 2 +- .../isys_stream2mmio_global.h | 2 +- .../css/css_2401_csi2p_system/pixelgen_global.h | 2 +- .../css/css_2401_csi2p_system/spmem_dump.c | 848 ++++++++-------- .../css/css_2401_csi2p_system/system_global.h | 2 +- .../ia_css_isp_configs.c | 26 +- .../ia_css_isp_configs.h | 12 +- .../ia_css_isp_params.c | 95 +- .../ia_css_isp_params.h | 5 +- .../ia_css_isp_states.c | 2 +- .../ia_css_isp_states.h | 2 +- .../pci/atomisp2/css/css_2401_system/hrt/bits.h | 2 +- .../atomisp2/css/css_2401_system/hrt/cell_params.h | 2 +- .../hrt/css_receiver_2400_common_defs.h | 2 +- .../css_2401_system/hrt/css_receiver_2400_defs.h | 2 +- .../pci/atomisp2/css/css_2401_system/hrt/defs.h | 2 +- .../atomisp2/css/css_2401_system/hrt/dma_v2_defs.h | 2 +- .../atomisp2/css/css_2401_system/hrt/gdc_v2_defs.h | 2 +- .../css/css_2401_system/hrt/gp_regs_defs.h | 2 +- .../css/css_2401_system/hrt/gp_timer_defs.h | 2 +- .../css/css_2401_system/hrt/gpio_block_defs.h | 2 +- .../hrt/hive_isp_css_2401_irq_types_hrt.h | 2 +- .../css/css_2401_system/hrt/hive_isp_css_defs.h | 2 +- .../hrt/hive_isp_css_host_ids_hrt.h | 2 +- .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 2 +- .../atomisp2/css/css_2401_system/hrt/hive_types.h | 2 +- .../pci/atomisp2/css/css_2401_system/hrt/if_defs.h | 2 +- .../hrt/input_formatter_subsystem_defs.h | 2 +- .../css/css_2401_system/hrt/input_selector_defs.h | 2 +- .../css_2401_system/hrt/input_switch_2400_defs.h | 2 +- .../css_2401_system/hrt/input_system_ctrl_defs.h | 2 +- .../css/css_2401_system/hrt/input_system_defs.h | 2 +- .../css/css_2401_system/hrt/irq_controller_defs.h | 2 +- .../css/css_2401_system/hrt/isp2400_support.h | 2 +- .../css_2401_system/hrt/isp2401_mamoiada_params.h | 2 +- .../css/css_2401_system/hrt/isp_acquisition_defs.h | 2 +- .../css/css_2401_system/hrt/isp_capture_defs.h | 2 +- .../atomisp2/css/css_2401_system/hrt/mmu_defs.h | 2 +- .../hrt/scalar_processor_2400_params.h | 2 +- .../pci/atomisp2/css/css_2401_system/hrt/sp_hrt.h | 22 - .../css/css_2401_system/hrt/str2mem_defs.h | 2 +- .../css_2401_system/hrt/streaming_to_mipi_defs.h | 2 +- .../css_2401_system/hrt/timed_controller_defs.h | 2 +- .../pci/atomisp2/css/css_2401_system/hrt/var.h | 97 -- .../pci/atomisp2/css/css_2401_system/hrt/version.h | 2 +- .../pci/atomisp2/css/css_2401_system/spmem_dump.c | 848 ++++++++-------- .../media/pci/atomisp2/css/css_api_version.h | 207 ++-- .../drivers/media/pci/atomisp2/css/css_trace.h | 3 +- .../css/hive_isp_css_common/debug_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/dma_global.h | 3 +- .../css/hive_isp_css_common/event_fifo_global.h | 3 +- .../css/hive_isp_css_common/fifo_monitor_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/gdc_global.h | 3 +- .../css/hive_isp_css_common/gp_device_global.h | 3 +- .../css/hive_isp_css_common/gp_timer_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/gpio_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/hmem_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/debug.c | 3 +- .../css/hive_isp_css_common/host/debug_local.h | 3 +- .../css/hive_isp_css_common/host/debug_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/dma.c | 3 +- .../css/hive_isp_css_common/host/dma_local.h | 3 +- .../css/hive_isp_css_common/host/dma_private.h | 3 +- .../css/hive_isp_css_common/host/event_fifo.c | 3 +- .../hive_isp_css_common/host/event_fifo_local.h | 3 +- .../hive_isp_css_common/host/event_fifo_private.h | 3 +- .../css/hive_isp_css_common/host/fifo_monitor.c | 3 +- .../hive_isp_css_common/host/fifo_monitor_local.h | 3 +- .../host/fifo_monitor_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/gdc.c | 3 +- .../css/hive_isp_css_common/host/gdc_local.h | 3 +- .../css/hive_isp_css_common/host/gdc_private.h | 3 +- .../css/hive_isp_css_common/host/gp_device.c | 3 +- .../css/hive_isp_css_common/host/gp_device_local.h | 3 +- .../hive_isp_css_common/host/gp_device_private.h | 3 +- .../css/hive_isp_css_common/host/gp_timer.c | 3 +- .../css/hive_isp_css_common/host/gp_timer_local.h | 3 +- .../hive_isp_css_common/host/gp_timer_private.h | 3 +- .../css/hive_isp_css_common/host/gpio_local.h | 3 +- .../css/hive_isp_css_common/host/gpio_private.h | 3 +- .../host/hive_isp_css_ddr_hrt_modified.h | 3 +- .../host/hive_isp_css_hrt_modified.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/hmem.c | 3 +- .../css/hive_isp_css_common/host/hmem_local.h | 3 +- .../css/hive_isp_css_common/host/hmem_private.h | 3 +- .../css/hive_isp_css_common/host/input_formatter.c | 3 +- .../host/input_formatter_local.h | 3 +- .../host/input_formatter_private.h | 3 +- .../css/hive_isp_css_common/host/input_system.c | 3 +- .../hive_isp_css_common/host/input_system_local.h | 3 +- .../host/input_system_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/irq.c | 3 +- .../css/hive_isp_css_common/host/irq_local.h | 3 +- .../css/hive_isp_css_common/host/irq_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/isp.c | 3 +- .../css/hive_isp_css_common/host/isp_local.h | 3 +- .../css/hive_isp_css_common/host/isp_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/mmu.c | 3 +- .../css/hive_isp_css_common/host/mmu_local.h | 3 +- .../css/hive_isp_css_common/host/mmu_private.h | 3 +- .../pci/atomisp2/css/hive_isp_css_common/host/sp.c | 3 +- .../css/hive_isp_css_common/host/sp_local.h | 3 +- .../css/hive_isp_css_common/host/sp_private.h | 3 +- .../css/hive_isp_css_common/host/system_local.h | 3 +- .../css/hive_isp_css_common/host/timed_ctrl.c | 3 +- .../hive_isp_css_common/host/timed_ctrl_local.h | 3 +- .../hive_isp_css_common/host/timed_ctrl_private.h | 3 +- .../css/hive_isp_css_common/host/vamem_local.h | 3 +- .../css/hive_isp_css_common/host/vamem_private.h | 3 +- .../atomisp2/css/hive_isp_css_common/host/vmem.c | 3 +- .../css/hive_isp_css_common/host/vmem_local.h | 3 +- .../css/hive_isp_css_common/host/vmem_private.h | 3 +- .../hive_isp_css_common/input_formatter_global.h | 3 +- .../css/hive_isp_css_common/input_system_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/irq_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/isp_global.h | 20 +- .../atomisp2/css/hive_isp_css_common/mmu_global.h | 3 +- .../css/hive_isp_css_common/resource_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/sp_global.h | 3 +- .../css/hive_isp_css_common/system_global.h | 3 +- .../css/hive_isp_css_common/timed_ctrl_global.h | 3 +- .../css/hive_isp_css_common/vamem_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/vmem_global.h | 3 +- .../atomisp2/css/hive_isp_css_common/xmem_global.h | 3 +- .../css/hive_isp_css_include/assert_support.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/bamem.h | 3 +- .../atomisp2/css/hive_isp_css_include/bbb_config.h | 3 +- .../css/hive_isp_css_include/bitop_support.h | 3 +- .../css/hive_isp_css_include/cpu_mem_support.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/csi_rx.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/debug.h | 3 +- .../device_access/device_access.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/dma.h | 3 +- .../css/hive_isp_css_include/error_support.h | 3 +- .../atomisp2/css/hive_isp_css_include/event_fifo.h | 3 +- .../css/hive_isp_css_include/fifo_monitor.h | 3 +- .../atomisp2/css/hive_isp_css_include/gdc_device.h | 3 +- .../atomisp2/css/hive_isp_css_include/gp_device.h | 3 +- .../atomisp2/css/hive_isp_css_include/gp_timer.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/gpio.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/hmem.h | 3 +- .../css/hive_isp_css_include/host/csi_rx_public.h | 3 +- .../css/hive_isp_css_include/host/debug_public.h | 3 +- .../css/hive_isp_css_include/host/dma_public.h | 3 +- .../hive_isp_css_include/host/event_fifo_public.h | 3 +- .../host/fifo_monitor_public.h | 3 +- .../css/hive_isp_css_include/host/gdc_public.h | 3 +- .../hive_isp_css_include/host/gp_device_public.h | 3 +- .../hive_isp_css_include/host/gp_timer_public.h | 3 +- .../css/hive_isp_css_include/host/gpio_public.h | 3 +- .../css/hive_isp_css_include/host/hmem_public.h | 3 +- .../hive_isp_css_include/host/ibuf_ctrl_public.h | 3 +- .../host/input_formatter_public.h | 3 +- .../host/input_system_public.h | 3 +- .../css/hive_isp_css_include/host/irq_public.h | 3 +- .../css/hive_isp_css_include/host/isp2400_config.h | 3 +- .../css/hive_isp_css_include/host/isp2500_config.h | 3 +- .../css/hive_isp_css_include/host/isp2600_config.h | 34 - .../css/hive_isp_css_include/host/isp2601_config.h | 68 -- .../css/hive_isp_css_include/host/isp_config.h | 3 +- .../css/hive_isp_css_include/host/isp_op1w.h | 75 +- .../css/hive_isp_css_include/host/isp_op1w_types.h | 4 +- .../css/hive_isp_css_include/host/isp_op2w.h | 3 +- .../css/hive_isp_css_include/host/isp_op2w_types.h | 3 +- .../css/hive_isp_css_include/host/isp_op_count.h | 10 +- .../css/hive_isp_css_include/host/isp_public.h | 3 +- .../hive_isp_css_include/host/isys_dma_public.h | 3 +- .../hive_isp_css_include/host/isys_irq_public.h | 3 +- .../css/hive_isp_css_include/host/isys_public.h | 3 +- .../host/isys_stream2mmio_public.h | 3 +- .../css/hive_isp_css_include/host/mmu_public.h | 3 +- .../css/hive_isp_css_include/host/osys_public.h | 3 +- .../hive_isp_css_include/host/pipeline_public.h | 3 +- .../hive_isp_css_include/host/pixelgen_public.h | 3 +- .../hive_isp_css_include/host/ref_vector_func.h | 84 +- .../host/ref_vector_func_types.h | 10 +- .../css/hive_isp_css_include/host/sp_public.h | 3 +- .../css/hive_isp_css_include/host/tag_public.h | 3 +- .../hive_isp_css_include/host/timed_ctrl_public.h | 3 +- .../css/hive_isp_css_include/host/vamem_public.h | 3 +- .../css/hive_isp_css_include/host/vmem_public.h | 3 +- .../atomisp2/css/hive_isp_css_include/ibuf_ctrl.h | 3 +- .../css/hive_isp_css_include/input_formatter.h | 3 +- .../css/hive_isp_css_include/input_system.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/irq.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/isp.h | 5 +- .../atomisp2/css/hive_isp_css_include/isys_dma.h | 3 +- .../atomisp2/css/hive_isp_css_include/isys_irq.h | 3 +- .../css/hive_isp_css_include/isys_stream2mmio.h | 3 +- .../css/hive_isp_css_include/math_support.h | 18 +- .../memory_access/memory_access.h | 95 +- .../css/hive_isp_css_include/misc_support.h | 3 +- .../atomisp2/css/hive_isp_css_include/mmu_device.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/mpmath.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/osys.h | 3 +- .../atomisp2/css/hive_isp_css_include/pixelgen.h | 3 +- .../css/hive_isp_css_include/platform_support.h | 3 +- .../css/hive_isp_css_include/print_support.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/queue.h | 3 +- .../atomisp2/css/hive_isp_css_include/resource.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/socket.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/sp.h | 3 +- .../css/hive_isp_css_include/storage_class.h | 3 +- .../css/hive_isp_css_include/stream_buffer.h | 3 +- .../css/hive_isp_css_include/string_support.h | 3 +- .../css/hive_isp_css_include/system_types.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/tag.h | 3 +- .../atomisp2/css/hive_isp_css_include/timed_ctrl.h | 3 +- .../css/hive_isp_css_include/type_support.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/vamem.h | 3 +- .../css/hive_isp_css_include/vector_func.h | 3 +- .../atomisp2/css/hive_isp_css_include/vector_ops.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/vmem.h | 3 +- .../pci/atomisp2/css/hive_isp_css_include/xmem.h | 3 +- .../css/hive_isp_css_shared/host/queue_local.h | 3 +- .../css/hive_isp_css_shared/host/queue_private.h | 3 +- .../atomisp2/css/hive_isp_css_shared/host/tag.c | 3 +- .../css/hive_isp_css_shared/host/tag_local.h | 3 +- .../css/hive_isp_css_shared/host/tag_private.h | 3 +- .../css/hive_isp_css_shared/queue_global.h | 3 +- .../css/hive_isp_css_shared/socket_global.h | 3 +- .../css/hive_isp_css_shared/stream_buffer_global.h | 3 +- .../css/hive_isp_css_shared/sw_event_global.h | 3 +- .../atomisp2/css/hive_isp_css_shared/tag_global.h | 3 +- .../camera/drivers/media/pci/atomisp2/css/ia_css.h | 5 +- .../drivers/media/pci/atomisp2/css/ia_css_3a.h | 3 +- .../media/pci/atomisp2/css/ia_css_acc_types.h | 7 +- .../drivers/media/pci/atomisp2/css/ia_css_buffer.h | 3 +- .../media/pci/atomisp2/css/ia_css_control.h | 3 +- .../media/pci/atomisp2/css/ia_css_device_access.c | 3 +- .../media/pci/atomisp2/css/ia_css_device_access.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_dvs.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_env.h | 15 +- .../drivers/media/pci/atomisp2/css/ia_css_err.h | 3 +- .../media/pci/atomisp2/css/ia_css_event_public.h | 3 +- .../media/pci/atomisp2/css/ia_css_firmware.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_frac.h | 3 +- .../media/pci/atomisp2/css/ia_css_frame_format.h | 3 +- .../media/pci/atomisp2/css/ia_css_frame_public.h | 3 +- .../media/pci/atomisp2/css/ia_css_host_data.h | 5 +- .../media/pci/atomisp2/css/ia_css_input_port.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_irq.h | 3 +- .../media/pci/atomisp2/css/ia_css_lace_stat.h | 3 +- .../media/pci/atomisp2/css/ia_css_memory_access.c | 66 +- .../media/pci/atomisp2/css/ia_css_memory_access.h | 3 +- .../media/pci/atomisp2/css/ia_css_metadata.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_mipi.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_mmu.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_morph.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_pipe.h | 9 +- .../media/pci/atomisp2/css/ia_css_pipe_public.h | 63 +- .../drivers/media/pci/atomisp2/css/ia_css_prbs.h | 11 +- .../media/pci/atomisp2/css/ia_css_properties.h | 3 +- .../media/pci/atomisp2/css/ia_css_shading.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_stream.h | 4 +- .../media/pci/atomisp2/css/ia_css_stream_format.h | 3 +- .../media/pci/atomisp2/css/ia_css_stream_public.h | 10 +- .../drivers/media/pci/atomisp2/css/ia_css_timer.h | 3 +- .../drivers/media/pci/atomisp2/css/ia_css_tpg.h | 11 +- .../drivers/media/pci/atomisp2/css/ia_css_types.h | 245 +++-- .../media/pci/atomisp2/css/ia_css_version.h | 3 +- .../media/pci/atomisp2/css/ia_css_version_data.h | 5 +- .../css/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 3 +- .../css/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 3 +- .../css/isp/kernels/aa/aa_2/ia_css_aa2_param.h | 3 +- .../css/isp/kernels/aa/aa_2/ia_css_aa2_state.h | 3 +- .../css/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 3 +- .../css/isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 3 +- .../css/isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 3 +- .../css/isp/kernels/anr/anr_1.0/ia_css_anr_param.h | 3 +- .../css/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 3 +- .../css/isp/kernels/anr/anr_2/ia_css_anr2.host.c | 3 +- .../css/isp/kernels/anr/anr_2/ia_css_anr2.host.h | 3 +- .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.c | 3 +- .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.h | 3 +- .../css/isp/kernels/anr/anr_2/ia_css_anr2_types.h | 3 +- .../css/isp/kernels/anr/anr_2/ia_css_anr_param.h | 3 +- .../bayer_ls_1.0/ia_css_bayer_load_param.h | 3 +- .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 22 +- .../bayer_ls_1.0/ia_css_bayer_store_param.h | 3 +- .../css/isp/kernels/bh/bh_2/ia_css_bh.host.c | 3 +- .../css/isp/kernels/bh/bh_2/ia_css_bh.host.h | 3 +- .../css/isp/kernels/bh/bh_2/ia_css_bh_param.h | 3 +- .../css/isp/kernels/bh/bh_2/ia_css_bh_types.h | 3 +- .../css/isp/kernels/bnlm/ia_css_bnlm.host.c | 3 +- .../css/isp/kernels/bnlm/ia_css_bnlm.host.h | 3 +- .../isp/kernels/bnlm/ia_css_bnlm_default.host.c | 3 +- .../isp/kernels/bnlm/ia_css_bnlm_default.host.h | 3 +- .../css/isp/kernels/bnlm/ia_css_bnlm_param.h | 3 +- .../css/isp/kernels/bnlm/ia_css_bnlm_state.h | 3 +- .../css/isp/kernels/bnlm/ia_css_bnlm_types.h | 3 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 3 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 3 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 3 +- .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 3 +- .../css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 3 +- .../css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 3 +- .../css/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 3 +- .../css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 3 +- .../css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 3 +- .../css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 3 +- .../css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h | 3 +- .../css/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h | 3 +- .../conversion_1.0/ia_css_conversion.host.c | 3 +- .../conversion_1.0/ia_css_conversion.host.h | 5 +- .../conversion_1.0/ia_css_conversion_param.h | 3 +- .../conversion_1.0/ia_css_conversion_types.h | 3 +- .../copy_output_1.0/ia_css_copy_output.host.c | 3 +- .../copy_output_1.0/ia_css_copy_output.host.h | 3 +- .../copy_output_1.0/ia_css_copy_output_param.h | 3 +- .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 3 +- .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 3 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 3 +- .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 3 +- .../css/isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 3 +- .../css/isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 3 +- .../css/isp/kernels/csc/csc_1.0/ia_css_csc_param.h | 3 +- .../css/isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 3 +- .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 3 +- .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 3 +- .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 3 +- .../css/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h | 3 +- .../css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 3 +- .../css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 3 +- .../css/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 3 +- .../css/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 3 +- .../css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 3 +- .../css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 3 +- .../css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 3 +- .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 3 +- .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h | 3 +- .../css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 3 +- .../css/isp/kernels/de/de_1.0/ia_css_de.host.c | 3 +- .../css/isp/kernels/de/de_1.0/ia_css_de.host.h | 3 +- .../css/isp/kernels/de/de_1.0/ia_css_de_param.h | 3 +- .../css/isp/kernels/de/de_1.0/ia_css_de_state.h | 3 +- .../css/isp/kernels/de/de_1.0/ia_css_de_types.h | 3 +- .../css/isp/kernels/de/de_2/ia_css_de2.host.c | 3 +- .../css/isp/kernels/de/de_2/ia_css_de2.host.h | 3 +- .../css/isp/kernels/de/de_2/ia_css_de2_param.h | 3 +- .../css/isp/kernels/de/de_2/ia_css_de2_types.h | 3 +- .../css/isp/kernels/de/de_2/ia_css_de_param.h | 3 +- .../css/isp/kernels/de/de_2/ia_css_de_state.h | 3 +- .../css/isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 15 +- .../css/isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 4 +- .../css/isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 3 +- .../css/isp/kernels/dp/dp_1.0/ia_css_dp_state.h | 5 +- .../css/isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 3 +- .../css/isp/kernels/dpc2/ia_css_dpc2.host.c | 3 +- .../css/isp/kernels/dpc2/ia_css_dpc2.host.h | 3 +- .../isp/kernels/dpc2/ia_css_dpc2_default.host.c | 3 +- .../isp/kernels/dpc2/ia_css_dpc2_default.host.h | 3 +- .../css/isp/kernels/dpc2/ia_css_dpc2_param.h | 3 +- .../css/isp/kernels/dpc2/ia_css_dpc2_state.h | 3 +- .../css/isp/kernels/dpc2/ia_css_dpc2_types.h | 3 +- .../css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 +- .../css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 3 +- .../css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 8 +- .../css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 3 +- .../css/isp/kernels/eed1_8/ia_css_eed1_8.host.c | 3 +- .../css/isp/kernels/eed1_8/ia_css_eed1_8.host.h | 3 +- .../kernels/eed1_8/ia_css_eed1_8_default.host.c | 3 +- .../kernels/eed1_8/ia_css_eed1_8_default.host.h | 3 +- .../css/isp/kernels/eed1_8/ia_css_eed1_8_param.h | 3 +- .../css/isp/kernels/eed1_8/ia_css_eed1_8_state.h | 3 +- .../css/isp/kernels/eed1_8/ia_css_eed1_8_types.h | 3 +- .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 3 +- .../isp/kernels/fc/fc_1.0/ia_css_formats.host.h | 3 +- .../isp/kernels/fc/fc_1.0/ia_css_formats_param.h | 3 +- .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 7 +- .../fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c | 3 +- .../fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h | 3 +- .../fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h | 10 +- .../fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h | 3 +- .../css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 3 +- .../css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 3 +- .../css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 3 +- .../css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 3 +- .../css/isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 3 +- .../css/isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 3 +- .../css/isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 3 +- .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 3 +- .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h | 3 +- .../css/isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 3 +- .../css/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 3 +- .../css/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 3 +- .../css/isp/kernels/gc/gc_2/ia_css_gc2_param.h | 3 +- .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 3 +- .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.h | 3 +- .../css/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 3 +- .../atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.c | 5 +- .../atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.h | 5 +- .../css/isp/kernels/hdr/ia_css_hdr_param.h | 5 +- .../css/isp/kernels/hdr/ia_css_hdr_types.h | 5 +- .../css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.c | 3 +- .../css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h | 3 +- .../kernels/iefd2_6/ia_css_iefd2_6_default.host.c | 3 +- .../kernels/iefd2_6/ia_css_iefd2_6_default.host.h | 3 +- .../css/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h | 3 +- .../css/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h | 3 +- .../css/isp/kernels/iefd2_6/ia_css_iefd2_6_types.h | 3 +- .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 84 -- .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 29 - .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 20 - .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 20 - .../kernels/io_ls/common/ia_css_common_io_param.h | 20 - .../kernels/io_ls/common/ia_css_common_io_types.h | 29 - .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 20 - .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 28 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 20 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 20 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 20 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 20 - .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 85 ++ .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 30 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 21 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 21 + .../ipu2_io_ls/common/ia_css_common_io_param.h | 21 + .../ipu2_io_ls/common/ia_css_common_io_types.h | 30 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 21 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 29 + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 21 + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 21 + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 85 ++ .../yuv444_io_ls/ia_css_yuv444_io.host.h | 30 + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 21 + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 21 + .../iterator/iterator_1.0/ia_css_iterator.host.c | 3 +- .../iterator/iterator_1.0/ia_css_iterator.host.h | 3 +- .../iterator/iterator_1.0/ia_css_iterator_param.h | 3 +- .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 3 +- .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h | 3 +- .../kernels/macc/macc1_5/ia_css_macc1_5_param.h | 3 +- .../macc/macc1_5/ia_css_macc1_5_table.host.c | 3 +- .../macc/macc1_5/ia_css_macc1_5_table.host.h | 3 +- .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 3 +- .../isp/kernels/macc/macc_1.0/ia_css_macc.host.c | 3 +- .../isp/kernels/macc/macc_1.0/ia_css_macc.host.h | 3 +- .../isp/kernels/macc/macc_1.0/ia_css_macc_param.h | 3 +- .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 3 +- .../kernels/macc/macc_1.0/ia_css_macc_table.host.h | 3 +- .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 3 +- .../isp/kernels/norm/norm_1.0/ia_css_norm.host.c | 3 +- .../isp/kernels/norm/norm_1.0/ia_css_norm.host.h | 3 +- .../isp/kernels/norm/norm_1.0/ia_css_norm_param.h | 3 +- .../isp/kernels/norm/norm_1.0/ia_css_norm_types.h | 3 +- .../css/isp/kernels/ob/ob2/ia_css_ob2.host.c | 3 +- .../css/isp/kernels/ob/ob2/ia_css_ob2.host.h | 3 +- .../css/isp/kernels/ob/ob2/ia_css_ob2_param.h | 3 +- .../css/isp/kernels/ob/ob2/ia_css_ob2_types.h | 3 +- .../css/isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 3 +- .../css/isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 3 +- .../css/isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 3 +- .../css/isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 3 +- .../kernels/output/output_1.0/ia_css_output.host.c | 3 +- .../kernels/output/output_1.0/ia_css_output.host.h | 3 +- .../output/output_1.0/ia_css_output_param.h | 3 +- .../output/output_1.0/ia_css_output_types.h | 3 +- .../css/isp/kernels/pdaf/ia_css_pdaf.host.c | 82 -- .../css/isp/kernels/pdaf/ia_css_pdaf.host.h | 35 - .../css/isp/kernels/pdaf/ia_css_pdaf_param.h | 60 -- .../css/isp/kernels/pdaf/ia_css_pdaf_types.h | 54 - .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 3 +- .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 3 +- .../kernels/qplane/qplane_2/ia_css_qplane_param.h | 3 +- .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 3 +- .../css/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 3 +- .../css/isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 3 +- .../css/isp/kernels/raw/raw_1.0/ia_css_raw_param.h | 3 +- .../css/isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 3 +- .../raw_aa_binning_1.0/ia_css_raa.host.c | 3 +- .../raw_aa_binning_1.0/ia_css_raa.host.h | 3 +- .../css/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 3 +- .../css/isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 3 +- .../css/isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 3 +- .../css/isp/kernels/ref/ref_1.0/ia_css_ref_state.h | 3 +- .../css/isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 3 +- .../css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 3 +- .../css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 3 +- .../css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 3 +- .../css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 19 +- .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 13 +- .../s3a_stat_ls/ia_css_s3a_stat_store_param.h | 3 +- .../css/isp/kernels/satm/ia_css_satm.host.c | 3 +- .../css/isp/kernels/satm/ia_css_satm.host.h | 3 +- .../css/isp/kernels/satm/ia_css_satm_param.h | 3 +- .../css/isp/kernels/satm/ia_css_satm_types.h | 3 +- .../css/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 43 +- .../css/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 34 +- .../css/isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 45 +- .../css/isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 17 +- .../kernels/scale/scale_1.0/ia_css_scale_param.h | 3 +- .../kernels/sdis/common/ia_css_sdis_common.host.h | 3 +- .../kernels/sdis/common/ia_css_sdis_common_types.h | 3 +- .../isp/kernels/sdis/common/ia_css_sdis_param.h | 3 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 3 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h | 3 +- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 3 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 3 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h | 3 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 3 +- .../isp/kernels/sdis/sdis_2/ia_css_sdis_param.h | 3 +- .../css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 3 +- .../css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 3 +- .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 3 +- .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 3 +- .../css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 3 +- .../css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 3 +- .../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 60 ++ .../css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 8 +- .../css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 3 +- .../css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 7 +- .../css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 3 +- .../css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 3 +- .../css/isp/kernels/uds/uds_1.0/ia_css_uds.host.c | 3 +- .../css/isp/kernels/uds/uds_1.0/ia_css_uds.host.h | 3 +- .../css/isp/kernels/uds/uds_1.0/ia_css_uds_param.h | 3 +- .../css/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 3 +- .../css/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 3 +- .../css/isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 3 +- .../css/isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 3 +- .../css/isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 3 +- .../css/isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 3 +- .../css/isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 3 +- .../css/isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 3 +- .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c | 3 +- .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h | 3 +- .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h | 3 +- .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h | 3 +- .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c | 3 +- .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h | 3 +- .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h | 3 +- .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h | 3 +- .../css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 3 +- .../css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 3 +- .../css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 3 +- .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 3 +- .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h | 3 +- .../css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 3 +- .../css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 86 +- .../css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 9 +- .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 18 +- .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 3 +- .../xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h | 3 +- .../css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 3 +- .../css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 3 +- .../css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 3 +- .../css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h | 3 +- .../css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h | 3 +- .../css/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h | 3 +- .../yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h | 3 +- .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 19 +- .../yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h | 3 +- .../css/isp/modes/interface/input_buf.isp.h | 3 +- .../atomisp2/css/isp/modes/interface/isp_const.h | 195 ++-- .../atomisp2/css/isp/modes/interface/isp_exprs.h | 7 +- .../atomisp2/css/isp/modes/interface/isp_types.h | 3 +- .../css/runtime/binary/interface/ia_css_binary.h | 19 +- .../pci/atomisp2/css/runtime/binary/src/binary.c | 585 ++++++++--- .../css/runtime/bufq/interface/ia_css_bufq.h | 3 +- .../css/runtime/bufq/interface/ia_css_bufq_comm.h | 3 +- .../media/pci/atomisp2/css/runtime/bufq/src/bufq.c | 3 +- .../css/runtime/debug/interface/ia_css_debug.h | 36 +- .../debug/interface/ia_css_debug_internal.h | 3 +- .../runtime/debug/interface/ia_css_debug_pipe.h | 3 +- .../atomisp2/css/runtime/debug/src/ia_css_debug.c | 147 ++- .../css/runtime/event/interface/ia_css_event.h | 3 +- .../pci/atomisp2/css/runtime/event/src/event.c | 3 +- .../css/runtime/eventq/interface/ia_css_eventq.h | 3 +- .../pci/atomisp2/css/runtime/eventq/src/eventq.c | 8 +- .../css/runtime/frame/interface/ia_css_frame.h | 22 +- .../runtime/frame/interface/ia_css_frame_comm.h | 3 +- .../pci/atomisp2/css/runtime/frame/src/frame.c | 81 +- .../css/runtime/ifmtr/interface/ia_css_ifmtr.h | 3 +- .../pci/atomisp2/css/runtime/ifmtr/src/ifmtr.c | 3 +- .../runtime/inputfifo/interface/ia_css_inputfifo.h | 3 +- .../atomisp2/css/runtime/inputfifo/src/inputfifo.c | 3 +- .../runtime/isp_param/interface/ia_css_isp_param.h | 3 +- .../isp_param/interface/ia_css_isp_param_types.h | 3 +- .../atomisp2/css/runtime/isp_param/src/isp_param.c | 3 +- .../css/runtime/isys/interface/ia_css_isys.h | 3 +- .../css/runtime/isys/interface/ia_css_isys_comm.h | 3 +- .../atomisp2/css/runtime/isys/src/csi_rx_rmgr.c | 3 +- .../atomisp2/css/runtime/isys/src/csi_rx_rmgr.h | 3 +- .../atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.c | 3 +- .../atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.h | 3 +- .../atomisp2/css/runtime/isys/src/isys_dma_rmgr.c | 3 +- .../atomisp2/css/runtime/isys/src/isys_dma_rmgr.h | 3 +- .../pci/atomisp2/css/runtime/isys/src/isys_init.c | 3 +- .../css/runtime/isys/src/isys_stream2mmio_rmgr.c | 3 +- .../css/runtime/isys/src/isys_stream2mmio_rmgr.h | 3 +- .../media/pci/atomisp2/css/runtime/isys/src/rx.c | 3 +- .../atomisp2/css/runtime/isys/src/virtual_isys.c | 13 +- .../atomisp2/css/runtime/isys/src/virtual_isys.h | 3 +- .../runtime/pipeline/interface/ia_css_pipeline.h | 3 +- .../pipeline/interface/ia_css_pipeline_common.h | 3 +- .../atomisp2/css/runtime/pipeline/src/pipeline.c | 9 +- .../css/runtime/queue/interface/ia_css_queue.h | 3 +- .../runtime/queue/interface/ia_css_queue_comm.h | 3 +- .../pci/atomisp2/css/runtime/queue/src/queue.c | 9 +- .../atomisp2/css/runtime/queue/src/queue_access.c | 3 +- .../atomisp2/css/runtime/queue/src/queue_access.h | 3 +- .../css/runtime/rmgr/interface/ia_css_rmgr.h | 3 +- .../css/runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 3 +- .../media/pci/atomisp2/css/runtime/rmgr/src/rmgr.c | 3 +- .../pci/atomisp2/css/runtime/rmgr/src/rmgr_vbuf.c | 3 +- .../css/runtime/spctrl/interface/ia_css_spctrl.h | 3 +- .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 3 +- .../pci/atomisp2/css/runtime/spctrl/src/spctrl.c | 3 +- .../tagger/interface/ia_css_tagger_common.h | 3 +- .../pci/atomisp2/css/runtime/timer/src/timer.c | 3 +- .../camera/drivers/media/pci/atomisp2/css/sh_css.c | 1061 +++++++++++++++++--- .../media/pci/atomisp2/css/sh_css_control.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_defs.h | 68 +- .../media/pci/atomisp2/css/sh_css_dvs_info.h | 37 + .../media/pci/atomisp2/css/sh_css_firmware.c | 7 +- .../media/pci/atomisp2/css/sh_css_firmware.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_frac.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_frame.c | 3 +- .../media/pci/atomisp2/css/sh_css_host_data.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_hrt.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_hrt.h | 3 +- .../media/pci/atomisp2/css/sh_css_internal.h | 25 +- .../drivers/media/pci/atomisp2/css/sh_css_irq.c | 3 +- .../media/pci/atomisp2/css/sh_css_lace_stat.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_legacy.h | 10 +- .../media/pci/atomisp2/css/sh_css_metadata.c | 3 +- .../media/pci/atomisp2/css/sh_css_metrics.c | 3 +- .../media/pci/atomisp2/css/sh_css_metrics.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_mipi.c | 82 +- .../drivers/media/pci/atomisp2/css/sh_css_mipi.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_mmu.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_morph.c | 3 +- .../media/pci/atomisp2/css/sh_css_param_dvs.c | 65 +- .../media/pci/atomisp2/css/sh_css_param_dvs.h | 18 +- .../media/pci/atomisp2/css/sh_css_param_shading.c | 36 +- .../media/pci/atomisp2/css/sh_css_param_shading.h | 6 +- .../drivers/media/pci/atomisp2/css/sh_css_params.c | 282 ++++-- .../drivers/media/pci/atomisp2/css/sh_css_params.h | 31 +- .../pci/atomisp2/css/sh_css_params_internal.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_pipe.c | 3 +- .../media/pci/atomisp2/css/sh_css_properties.c | 3 +- .../media/pci/atomisp2/css/sh_css_shading.c | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_sp.c | 64 +- .../drivers/media/pci/atomisp2/css/sh_css_sp.h | 13 +- .../drivers/media/pci/atomisp2/css/sh_css_stream.c | 3 +- .../media/pci/atomisp2/css/sh_css_stream_format.c | 3 +- .../media/pci/atomisp2/css/sh_css_stream_format.h | 3 +- .../drivers/media/pci/atomisp2/css/sh_css_struct.h | 4 +- .../drivers/media/pci/atomisp2/css/sh_css_uds.h | 3 +- .../media/pci/atomisp2/css/sh_css_version.c | 3 +- .../css/css_2400_system/hrt/sp_hrt.h | 1 - .../css/css_2400_system/hrt/var.h | 1 - .../css/css_2401_csi2p_system/hrt/sp_hrt.h | 1 - .../css/css_2401_csi2p_system/hrt/var.h | 1 - .../css/css_2401_system/hrt/sp_hrt.h | 1 - .../css/css_2401_system/hrt/var.h | 1 - .../css/hive_isp_css_include/host/isp2600_config.h | 1 - .../css/hive_isp_css_include/host/isp2601_config.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 - .../kernels/io_ls/common/ia_css_common_io_param.h | 1 - .../kernels/io_ls/common/ia_css_common_io_types.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 1 - .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_param.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_types.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 1 + .../css/isp/kernels/pdaf/ia_css_pdaf.host.c | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf.host.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_param.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_types.h | 1 - .../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 1 + .../css2400b0_v21_build/css/sh_css_dvs_info.h | 1 + .../css/css_2400_system/hrt/sp_hrt.h | 1 - .../css/css_2400_system/hrt/var.h | 1 - .../css/css_2401_csi2p_system/hrt/sp_hrt.h | 1 - .../css/css_2401_csi2p_system/hrt/var.h | 1 - .../css/css_2401_system/hrt/sp_hrt.h | 1 - .../css/css_2401_system/hrt/var.h | 1 - .../css/hive_isp_css_include/host/isp2600_config.h | 1 - .../css/hive_isp_css_include/host/isp2601_config.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 - .../kernels/io_ls/common/ia_css_common_io_param.h | 1 - .../kernels/io_ls/common/ia_css_common_io_types.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 1 - .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_param.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_types.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 1 + .../css/isp/kernels/pdaf/ia_css_pdaf.host.c | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf.host.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_param.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_types.h | 1 - .../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 1 + .../css/sh_css_dvs_info.h | 1 + .../css/css_2400_system/hrt/sp_hrt.h | 1 - .../css/css_2400_system/hrt/var.h | 1 - .../css/css_2401_csi2p_system/hrt/sp_hrt.h | 1 - .../css/css_2401_csi2p_system/hrt/var.h | 1 - .../css/css_2401_system/hrt/sp_hrt.h | 1 - .../css/css_2401_system/hrt/var.h | 1 - .../css/hive_isp_css_include/host/isp2600_config.h | 1 - .../css/hive_isp_css_include/host/isp2601_config.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 - .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 - .../kernels/io_ls/common/ia_css_common_io_param.h | 1 - .../kernels/io_ls/common/ia_css_common_io_types.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 - .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 1 - .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 1 - .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 1 - .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 1 + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_param.h | 1 + .../ipu2_io_ls/common/ia_css_common_io_types.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 1 + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 1 + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 1 + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 1 + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 1 + .../css/isp/kernels/pdaf/ia_css_pdaf.host.c | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf.host.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_param.h | 1 - .../css/isp/kernels/pdaf/ia_css_pdaf_types.h | 1 - .../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 1 + .../css2401a0_v21_build/css/sh_css_dvs_info.h | 1 + 907 files changed, 6745 insertions(+), 4153 deletions(-) delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/sp_hrt.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/var.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/sp_hrt.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/var.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/sp_hrt.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/var.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2600_config.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2601_config.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_types.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.c delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_param.h delete mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h create mode 100644 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_dvs_info.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2600_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2601_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/sh_css_dvs_info.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2600_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2601_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/sh_css_dvs_info.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/sp_hrt.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/var.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2600_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2601_config.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h delete mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h create mode 120000 drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/sh_css_dvs_info.h diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf.h index 2a38e2b..a61eac6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_CIRCBUF_H #define _IA_CSS_CIRCBUF_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_comm.h index 3fc0330..f04971d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_CIRCBUF_COMM_H #define _IA_CSS_CIRCBUF_COMM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_desc.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_desc.h index a8447d4..3ecf8dc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_desc.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/interface/ia_css_circbuf_desc.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_CIRCBUF_DESC_H_ #define _IA_CSS_CIRCBUF_DESC_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/src/circbuf.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/src/circbuf.c index 2493dd2..890b843 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/src/circbuf.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/circbuf/src/circbuf.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_circbuf.h" #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/interface/ia_css_refcount.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/interface/ia_css_refcount.h index 20db4de..550b52f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/interface/ia_css_refcount.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/interface/ia_css_refcount.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_REFCOUNT_H_ #define _IA_CSS_REFCOUNT_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/src/refcount.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/src/refcount.c index 165da05..94923ea 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/src/refcount.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/base/refcount/src/refcount.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_refcount.h" #include "memory_access/memory_access.h" #include "sh_css_defs.h" @@ -196,6 +197,7 @@ bool ia_css_refcount_decrement(int32_t id, hrt_vaddress ptr) id, ptr, entry, entry->id, entry->count); else IA_CSS_ERROR("entry NULL\n"); + assert(false); return false; } @@ -245,7 +247,7 @@ void ia_css_refcount_clear(int32_t id, clear_func clear_func_ptr) "no clear_func\n"); mmgr_free(entry->data); } - + assert(entry->count == 0); if (entry->count != 0) { IA_CSS_WARNING("Ref count for entry %x is not zero!", entry->id); } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_binarydesc.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_binarydesc.h index 616789d9..ed396d1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_binarydesc.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_binarydesc.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPE_BINARYDESC_H__ #define __IA_CSS_PIPE_BINARYDESC_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_stagedesc.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_stagedesc.h index 38690ea..47c92b8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_stagedesc.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_stagedesc.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPE_STAGEDESC_H__ #define __IA_CSS_PIPE_STAGEDESC_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_util.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_util.h index ba88587..f59c7c6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_util.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/interface/ia_css_pipe_util.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPE_UTIL_H__ #define __IA_CSS_PIPE_UTIL_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_binarydesc.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_binarydesc.c index 23867ef..71b025e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_binarydesc.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_binarydesc.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_pipe_binarydesc.h" #include "ia_css_frame_format.h" #include "ia_css_pipe.h" @@ -56,6 +57,8 @@ static void pipe_binarydesc_get_offline( descr->enable_dz = true; descr->enable_xnr = false; descr->enable_dpc = false; + descr->enable_luma_only = false; + descr->enable_tnr = false; descr->enable_capture_pp_bli = false; descr->enable_fractional_ds = false; descr->dvs_env.width = 0; @@ -306,18 +309,48 @@ enum ia_css_err ia_css_pipe_get_preview_binarydesc( * of downscale, so there is no DS needed in vf_veceven. Therefore, * out and vf infos will be the same. Otherwise, we set out resolution * equal to in resolution. */ +#if !defined(IS_ISP_2500_SYSTEM) + /* The easy way out for SkyCam. This "solves" the following issues: + * a) In SkyCam the dvs envelope is inluded in bds out resolution. In 240x this evelope is not part of bds out + * todo - consider aligning to 240x + * b) SkyCam preview binary can always do fractional scaling (part of Output System) + * There is no need to test the enable_fractional_ds flag. + */ if (!pipe->extra_config.enable_fractional_ds) { /* TODO: Change this when bds_out_info is available! */ out_info->res.width = bds_out_info->res.width; out_info->res.height = bds_out_info->res.height; out_info->padded_width = bds_out_info->padded_width; } +#endif + +#if defined(IS_ISP_2500_SYSTEM) + /* rvanimme: in SkyCam preview case we only use the out pin and never use the vf pin. + * in case we have both pins defined, the ia_css_binary_find function tries to find a binary + * that support vf_veceven. We don't have these in SkyCam. We need a way to: + * a) Find out that we are in this use-case + * b) Tell this to the ia_css_binary_find function + * + * Ad a) + * The easy way out is using the above #if defined(IS_ISP_2500_SYSTEM). I stared too long at the code + * for a more elegant solution. I gave up (suggestions are welcome) + * + * Ad b) + * The current api of ia_css_pipe_get_preview_binarydesc function does not allow us to return NULL. We + * Could ofcourse add another flag to the preview_descr struct but again I choose for the easy way out, + * setting with and height of vf info to zero. + */ + preview_descr->vf_info->res.width = 0; + preview_descr->vf_info->res.height = 0; +#endif + preview_descr->enable_fractional_ds = pipe->extra_config.enable_fractional_ds; preview_descr->enable_dpc = pipe->config.enable_dpc; preview_descr->isp_pipe_version = pipe->config.isp_pipe_version; + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_SUCCESS); return IA_CSS_SUCCESS; } @@ -391,6 +424,10 @@ enum ia_css_err ia_css_pipe_get_video_binarydesc( pipe->extra_config.enable_fractional_ds; video_descr->enable_dpc = pipe->config.enable_dpc; + video_descr->enable_luma_only = + pipe->config.enable_luma_only; + video_descr->enable_tnr = + pipe->config.enable_tnr; #if defined(IS_ISP_2500_SYSTEM) /* @@ -616,6 +653,8 @@ void ia_css_pipe_get_primary_binarydesc( prim_descr->isp_pipe_version = pipe->config.isp_pipe_version; prim_descr->enable_fractional_ds = pipe->extra_config.enable_fractional_ds; + prim_descr->enable_luma_only = + pipe->config.enable_luma_only; /* We have both striped and non-striped primary binaries, * if continuous viewfinder is required, then we must select * a striped one. Otherwise we prefer to use a non-striped @@ -623,7 +662,11 @@ void ia_css_pipe_get_primary_binarydesc( if (pipe_version == IA_CSS_PIPE_VERSION_2_6_1) prim_descr->striped = false; else - prim_descr->striped = prim_descr->continuous && (!pipe->stream->stop_copy_preview || !pipe->stream->disable_cont_vf); + prim_descr->striped = prim_descr->continuous && !pipe->stream->disable_cont_vf; + + if ((pipe->config.default_capture_config.enable_xnr != 0) && + (pipe->extra_config.enable_dvs_6axis == true)) + prim_descr->enable_xnr = true; } IA_CSS_LEAVE_PRIVATE(""); } @@ -856,7 +899,10 @@ void ia_css_pipe_get_ldc_binarydesc( assert(out_info != NULL); IA_CSS_ENTER_PRIVATE(""); - *in_info = *out_info; + if (pipe->out_yuv_ds_input_info.res.width) + *in_info = pipe->out_yuv_ds_input_info; + else + *in_info = *out_info; in_info->format = IA_CSS_FRAME_FORMAT_YUV420; in_info->raw_bit_depth = 0; ia_css_frame_info_set_width(in_info, in_info->res.width, 0); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_stagedesc.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_stagedesc.c index 40af8da..ef8a77b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_stagedesc.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_stagedesc.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_pipe_stagedesc.h" #include "assert_support.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_util.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_util.c index 5fc1718..f00b69f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_util.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/pipe/src/pipe_util.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_pipe_util.h" #include "ia_css_frame_public.h" #include "ia_css_pipe.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/interface/ia_css_util.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/interface/ia_css_util.h index c7236f6..ba1b9c6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/interface/ia_css_util.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/interface/ia_css_util.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_UTIL_H__ #define __IA_CSS_UTIL_H__ @@ -74,6 +75,38 @@ extern enum ia_css_err ia_css_util_check_res( unsigned int width, unsigned int height); +/** @brief compare resolutions (less or equal) + * + * @param[in] a resolution + * @param[in] b resolution + * @return true if both dimensions of a are less or + * equal than those of b, false otherwise + * + */ +extern bool ia_css_util_res_leq( + struct ia_css_resolution a, + struct ia_css_resolution b); + +/** + * @brief Check if resolution is zero + * + * @param[in] resolution The resolution to check + * + * @returns true if resolution is zero + */ +extern bool ia_css_util_resolution_is_zero( + const struct ia_css_resolution resolution); + +/** + * @brief Check if resolution is even + * + * @param[in] resolution The resolution to check + * + * @returns true if resolution is even + */ +extern bool ia_css_util_resolution_is_even( + const struct ia_css_resolution resolution); + /** @brief check width and height * * @param[in] stream_format diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/src/util.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/src/util.c index 25f2b32..c2ccee0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/src/util.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/camera/util/src/util.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_util.h" #include #include @@ -158,6 +159,21 @@ enum ia_css_err ia_css_util_check_res(unsigned int width, unsigned int height) return IA_CSS_SUCCESS; } +bool ia_css_util_res_leq(struct ia_css_resolution a, struct ia_css_resolution b) +{ + return a.width <= b.width && a.height <= b.height; +} + +bool ia_css_util_resolution_is_zero(const struct ia_css_resolution resolution) +{ + return (resolution.width == 0) || (resolution.height == 0); +} + +bool ia_css_util_resolution_is_even(const struct ia_css_resolution resolution) +{ + return IS_EVEN(resolution.height) && IS_EVEN(resolution.width); +} + bool ia_css_util_is_input_format_raw(enum ia_css_stream_format format) { return ((format == IA_CSS_STREAM_FORMAT_RAW_6) || diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c index b7d90bb..18eec12 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -239,6 +239,30 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem) +{ + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() enter:\n"); + + { + unsigned offset = 0; + unsigned size = 0; + if (binary->info->mem_offsets.offsets.config) { + size = binary->info->mem_offsets.offsets.config->dmem.sc.size; + offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset; + } + if (size) { + ia_css_sc_config((struct sh_css_isp_sc_isp_config *) + &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset], + config_dmem, size); } + } + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() leave:\n"); +} + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h index ec3fb636..b41847b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,6 +22,7 @@ #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h" #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h" #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h" +#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h" #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h" #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h" #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h" @@ -44,6 +45,7 @@ enum ia_css_configuration_ids { IA_CSS_OUTPUT0_CONFIG_ID, IA_CSS_OUTPUT1_CONFIG_ID, IA_CSS_OUTPUT_CONFIG_ID, + IA_CSS_SC_CONFIG_ID, IA_CSS_RAW_CONFIG_ID, IA_CSS_TNR_CONFIG_ID, IA_CSS_REF_CONFIG_ID, @@ -64,6 +66,7 @@ struct ia_css_config_memory_offsets { struct ia_css_isp_parameter output0; struct ia_css_isp_parameter output1; struct ia_css_isp_parameter output; + struct ia_css_isp_parameter sc; struct ia_css_isp_parameter raw; struct ia_css_isp_parameter tnr; struct ia_css_isp_parameter ref; @@ -141,6 +144,13 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem); + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c index b00a812..e29bdfc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -1564,6 +1564,25 @@ size); } } + { + unsigned size = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size; + + unsigned offset = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.offset; + + if (size) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() enter:\n"); + + ia_css_xnr3_vmem_encode((struct sh_css_isp_xnr3_vmem_params *) + &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_VMEM].address[offset], + ¶ms->xnr3_config, +size); + params->isp_params_changed = true; + params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_VMEM] = true; + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() leave:\n"); + } + + } } /* Code generated by genparam/gencode.c:gen_param_process_table() */ @@ -1652,8 +1671,6 @@ ia_css_set_dp_config(struct ia_css_isp_parameters *params, ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->dp_config = *config; params->config_changed[IA_CSS_DP_ID] = true; - params->config_changed[IA_CSS_DP_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_dp_config() leave: " "return_void\n"); } @@ -1690,8 +1707,6 @@ ia_css_set_wb_config(struct ia_css_isp_parameters *params, ia_css_wb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->wb_config = *config; params->config_changed[IA_CSS_WB_ID] = true; - params->config_changed[IA_CSS_WB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_wb_config() leave: " "return_void\n"); } @@ -1728,8 +1743,6 @@ ia_css_set_tnr_config(struct ia_css_isp_parameters *params, ia_css_tnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->tnr_config = *config; params->config_changed[IA_CSS_TNR_ID] = true; - params->config_changed[IA_CSS_TNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_tnr_config() leave: " "return_void\n"); } @@ -1766,8 +1779,6 @@ ia_css_set_ob_config(struct ia_css_isp_parameters *params, ia_css_ob_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ob_config = *config; params->config_changed[IA_CSS_OB_ID] = true; - params->config_changed[IA_CSS_OB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ob_config() leave: " "return_void\n"); } @@ -1804,8 +1815,6 @@ ia_css_set_de_config(struct ia_css_isp_parameters *params, ia_css_de_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->de_config = *config; params->config_changed[IA_CSS_DE_ID] = true; - params->config_changed[IA_CSS_DE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_de_config() leave: " "return_void\n"); } @@ -1842,8 +1851,6 @@ ia_css_set_anr_config(struct ia_css_isp_parameters *params, ia_css_anr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_config = *config; params->config_changed[IA_CSS_ANR_ID] = true; - params->config_changed[IA_CSS_ANR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr_config() leave: " "return_void\n"); } @@ -1880,8 +1887,6 @@ ia_css_set_anr2_config(struct ia_css_isp_parameters *params, ia_css_anr2_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_thres = *config; params->config_changed[IA_CSS_ANR2_ID] = true; - params->config_changed[IA_CSS_ANR2_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr2_config() leave: " "return_void\n"); } @@ -1918,8 +1923,6 @@ ia_css_set_ce_config(struct ia_css_isp_parameters *params, ia_css_ce_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ce_config = *config; params->config_changed[IA_CSS_CE_ID] = true; - params->config_changed[IA_CSS_CE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ce_config() leave: " "return_void\n"); } @@ -1956,8 +1959,6 @@ ia_css_set_ecd_config(struct ia_css_isp_parameters *params, ia_css_ecd_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ecd_config = *config; params->config_changed[IA_CSS_ECD_ID] = true; - params->config_changed[IA_CSS_ECD_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ecd_config() leave: " "return_void\n"); } @@ -1994,8 +1995,6 @@ ia_css_set_ynr_config(struct ia_css_isp_parameters *params, ia_css_ynr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ynr_config = *config; params->config_changed[IA_CSS_YNR_ID] = true; - params->config_changed[IA_CSS_YNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ynr_config() leave: " "return_void\n"); } @@ -2032,8 +2031,6 @@ ia_css_set_fc_config(struct ia_css_isp_parameters *params, ia_css_fc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->fc_config = *config; params->config_changed[IA_CSS_FC_ID] = true; - params->config_changed[IA_CSS_FC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_fc_config() leave: " "return_void\n"); } @@ -2070,8 +2067,6 @@ ia_css_set_cnr_config(struct ia_css_isp_parameters *params, ia_css_cnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cnr_config = *config; params->config_changed[IA_CSS_CNR_ID] = true; - params->config_changed[IA_CSS_CNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_cnr_config() leave: " "return_void\n"); } @@ -2108,8 +2103,6 @@ ia_css_set_macc_config(struct ia_css_isp_parameters *params, ia_css_macc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->macc_config = *config; params->config_changed[IA_CSS_MACC_ID] = true; - params->config_changed[IA_CSS_MACC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_macc_config() leave: " "return_void\n"); } @@ -2146,8 +2139,6 @@ ia_css_set_ctc_config(struct ia_css_isp_parameters *params, ia_css_ctc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ctc_config = *config; params->config_changed[IA_CSS_CTC_ID] = true; - params->config_changed[IA_CSS_CTC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ctc_config() leave: " "return_void\n"); } @@ -2184,8 +2175,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->aa_config = *config; params->config_changed[IA_CSS_AA_ID] = true; - params->config_changed[IA_CSS_AA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_aa_config() leave: " "return_void\n"); } @@ -2222,8 +2211,6 @@ ia_css_set_yuv2rgb_config(struct ia_css_isp_parameters *params, ia_css_yuv2rgb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->yuv2rgb_cc_config = *config; params->config_changed[IA_CSS_YUV2RGB_ID] = true; - params->config_changed[IA_CSS_YUV2RGB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_yuv2rgb_config() leave: " "return_void\n"); } @@ -2260,8 +2247,6 @@ ia_css_set_rgb2yuv_config(struct ia_css_isp_parameters *params, ia_css_rgb2yuv_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->rgb2yuv_cc_config = *config; params->config_changed[IA_CSS_RGB2YUV_ID] = true; - params->config_changed[IA_CSS_RGB2YUV_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_rgb2yuv_config() leave: " "return_void\n"); } @@ -2298,8 +2283,6 @@ ia_css_set_csc_config(struct ia_css_isp_parameters *params, ia_css_csc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cc_config = *config; params->config_changed[IA_CSS_CSC_ID] = true; - params->config_changed[IA_CSS_CSC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_csc_config() leave: " "return_void\n"); } @@ -2337,8 +2320,6 @@ ia_css_set_nr_config(struct ia_css_isp_parameters *params, params->nr_config = *config; params->config_changed[IA_CSS_BNR_ID] = true; params->config_changed[IA_CSS_NR_ID] = true; - params->config_changed[IA_CSS_NR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_nr_config() leave: " "return_void\n"); } @@ -2375,8 +2356,6 @@ ia_css_set_gc_config(struct ia_css_isp_parameters *params, ia_css_gc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->gc_config = *config; params->config_changed[IA_CSS_GC_ID] = true; - params->config_changed[IA_CSS_GC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_gc_config() leave: " "return_void\n"); } @@ -2416,8 +2395,6 @@ ia_css_set_sdis_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horicoef_config() leave: " "return_void\n"); } @@ -2457,8 +2434,6 @@ ia_css_set_sdis_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertcoef_config() leave: " "return_void\n"); } @@ -2498,8 +2473,6 @@ ia_css_set_sdis_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horiproj_config() leave: " "return_void\n"); } @@ -2539,8 +2512,6 @@ ia_css_set_sdis_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertproj_config() leave: " "return_void\n"); } @@ -2580,8 +2551,6 @@ ia_css_set_sdis2_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horicoef_config() leave: " "return_void\n"); } @@ -2621,8 +2590,6 @@ ia_css_set_sdis2_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertcoef_config() leave: " "return_void\n"); } @@ -2662,8 +2629,6 @@ ia_css_set_sdis2_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horiproj_config() leave: " "return_void\n"); } @@ -2703,8 +2668,6 @@ ia_css_set_sdis2_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertproj_config() leave: " "return_void\n"); } @@ -2741,8 +2704,6 @@ ia_css_set_r_gamma_config(struct ia_css_isp_parameters *params, ia_css_r_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->r_gamma_table = *config; params->config_changed[IA_CSS_R_GAMMA_ID] = true; - params->config_changed[IA_CSS_R_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_r_gamma_config() leave: " "return_void\n"); } @@ -2779,8 +2740,6 @@ ia_css_set_g_gamma_config(struct ia_css_isp_parameters *params, ia_css_g_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->g_gamma_table = *config; params->config_changed[IA_CSS_G_GAMMA_ID] = true; - params->config_changed[IA_CSS_G_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_g_gamma_config() leave: " "return_void\n"); } @@ -2817,8 +2776,6 @@ ia_css_set_b_gamma_config(struct ia_css_isp_parameters *params, ia_css_b_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->b_gamma_table = *config; params->config_changed[IA_CSS_B_GAMMA_ID] = true; - params->config_changed[IA_CSS_B_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_b_gamma_config() leave: " "return_void\n"); } @@ -2855,8 +2812,6 @@ ia_css_set_xnr_table_config(struct ia_css_isp_parameters *params, ia_css_xnr_table_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_table = *config; params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_table_config() leave: " "return_void\n"); } @@ -2893,8 +2848,6 @@ ia_css_set_formats_config(struct ia_css_isp_parameters *params, ia_css_formats_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->formats_config = *config; params->config_changed[IA_CSS_FORMATS_ID] = true; - params->config_changed[IA_CSS_FORMATS_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_formats_config() leave: " "return_void\n"); } @@ -2931,8 +2884,6 @@ ia_css_set_xnr_config(struct ia_css_isp_parameters *params, ia_css_xnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_config = *config; params->config_changed[IA_CSS_XNR_ID] = true; - params->config_changed[IA_CSS_XNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_config() leave: " "return_void\n"); } @@ -2969,8 +2920,6 @@ ia_css_set_xnr3_config(struct ia_css_isp_parameters *params, ia_css_xnr3_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr3_config = *config; params->config_changed[IA_CSS_XNR3_ID] = true; - params->config_changed[IA_CSS_XNR3_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr3_config() leave: " "return_void\n"); } @@ -3008,8 +2957,6 @@ ia_css_set_s3a_config(struct ia_css_isp_parameters *params, params->s3a_config = *config; params->config_changed[IA_CSS_BH_ID] = true; params->config_changed[IA_CSS_S3A_ID] = true; - params->config_changed[IA_CSS_S3A_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_s3a_config() leave: " "return_void\n"); } @@ -3046,8 +2993,6 @@ ia_css_set_output_config(struct ia_css_isp_parameters *params, ia_css_output_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->output_config = *config; params->config_changed[IA_CSS_OUTPUT_ID] = true; - params->config_changed[IA_CSS_OUTPUT_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_output_config() leave: " "return_void\n"); } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h index 9680f4e..bf993bf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -120,6 +120,7 @@ struct ia_css_memory_offsets { struct ia_css_isp_parameter sdis_vertcoef; struct ia_css_isp_parameter sdis2_horicoef; struct ia_css_isp_parameter sdis2_vertcoef; + struct ia_css_isp_parameter xnr3; } vmem; struct { struct ia_css_isp_parameter bh; @@ -379,12 +380,14 @@ void ia_css_get_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + /* Code generated by genparam/gencode.c:gen_global_access_function() */ void ia_css_set_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + #endif /* IA_CSS_INCLUDE_PARAMETER */ #endif /* _IA_CSS_ISP_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c index a445d4f..2405fc99 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h index d658a00..b358e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/bits.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/bits.h index e71e33d..5fdd8b5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/bits.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/bits.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/cell_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/cell_params.h index b5756bf..ca1ec92 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/cell_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/cell_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_common_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_common_defs.h index f3054fe..cd0530b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_common_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_common_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_defs.h index 6f5b7d3..1a0f86e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/css_receiver_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/defs.h index 47505f4..bc4491e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/dma_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/dma_v2_defs.h index d184a8b..78ce973 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/dma_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/dma_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gdc_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gdc_v2_defs.h index 77722d2..b97f463 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gdc_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gdc_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_regs_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_regs_defs.h index 34e734f..320e48b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_regs_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_regs_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_timer_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_timer_defs.h index 3082e2f5..673b168 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_timer_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gp_timer_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gpio_block_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gpio_block_defs.h index a807d4c..349f2b7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gpio_block_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/gpio_block_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_defs.h index 3958499..9b7d77c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h index f4d033e..ab9b277 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h index 04c2370..9abfd42 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h index b4211a0..389d924 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_types.h index 58b0e6e..7bfea9f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/hive_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/if_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/if_defs.h index 7d39e45..d91f7de 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/if_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/if_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_formatter_subsystem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_formatter_subsystem_defs.h index 16bfe1d..2a16e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_formatter_subsystem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_formatter_subsystem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_selector_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_selector_defs.h index 87fbf82..4d9f9c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_selector_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_selector_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_switch_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_switch_2400_defs.h index 20a13c4..8bcc7a1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_switch_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_switch_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_ctrl_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_ctrl_defs.h index a7f0ca8..0e6423a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_ctrl_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_ctrl_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_defs.h index ae62163..e76c25a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/input_system_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/irq_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/irq_controller_defs.h index ec6dd44..c7c4401 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/irq_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/irq_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_mamoiada_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_mamoiada_params.h index c33d241..e3f15c0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_mamoiada_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_mamoiada_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_support.h index e00bc84..9e6dafe 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp2400_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_acquisition_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_acquisition_defs.h index 5936207..fb13c64 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_acquisition_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_acquisition_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_capture_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_capture_defs.h index 0a249ce..f512444 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_capture_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/isp_capture_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/mmu_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/mmu_defs.h index c038f39..f8c2fe9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/mmu_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/mmu_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/scalar_processor_2400_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/scalar_processor_2400_params.h index 9b6c2893..c889f67 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/scalar_processor_2400_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/scalar_processor_2400_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/sp_hrt.h deleted file mode 100644 index ca0b7b7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/sp_hrt.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 _sp_hrt_h_ -#define _sp_hrt_h_ - -#define hrt_sp_dmem(cell) HRT_PROC_TYPE_PROP(cell, _dmem) - -#define hrt_sp_dmem_master_port_address(cell) hrt_mem_master_port_address(cell, hrt_sp_dmem(cell)) - -#endif /* _sp_hrt_h_ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/str2mem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/str2mem_defs.h index 1cb6244..32667a3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/str2mem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/str2mem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/streaming_to_mipi_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/streaming_to_mipi_defs.h index 60143b8..fb81978 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/streaming_to_mipi_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/streaming_to_mipi_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/timed_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/timed_controller_defs.h index d2b8972..0549495 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/timed_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/timed_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/var.h deleted file mode 100644 index 30f900d..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/var.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 _HRT_VAR_H -#define _HRT_VAR_H - -#include "version.h" -#include "system_api.h" -#include "hive_types.h" - -#define hrt_int_type_of_char char -#define hrt_int_type_of_uchar unsigned char -#define hrt_int_type_of_short short -#define hrt_int_type_of_ushort unsigned short -#define hrt_int_type_of_int int -#define hrt_int_type_of_uint unsigned int -#define hrt_int_type_of_long long -#define hrt_int_type_of_ulong unsigned long -#define hrt_int_type_of_ptr unsigned int - -#define hrt_host_type_of_char char -#define hrt_host_type_of_uchar unsigned char -#define hrt_host_type_of_short short -#define hrt_host_type_of_ushort unsigned short -#define hrt_host_type_of_int int -#define hrt_host_type_of_uint unsigned int -#define hrt_host_type_of_long long -#define hrt_host_type_of_ulong unsigned long -#define hrt_host_type_of_ptr void* - -#define HRT_TYPE_BYTES(cell, type) (HRT_TYPE_BITS(cell, type)/8) -#define HRT_HOST_TYPE(cell_type) HRTCAT(hrt_host_type_of_, cell_type) -#define HRT_INT_TYPE(type) HRTCAT(hrt_int_type_of_, type) - -#ifdef C_RUN - -#ifdef C_RUN_DYNAMIC_LINK_PROGRAMS -extern void *csim_processor_get_crun_symbol(hive_proc_id p, const char *sym); -#define _hrt_cell_get_crun_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#else -#define _hrt_cell_get_crun_symbol(cell,sym) (&sym) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) (sym) -#endif // C_RUN_DYNAMIC_LINK_PROGRAMS - -#define hrt_scalar_store(cell, type, var, data) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var)) = (data)) -#define hrt_scalar_load(cell, type, var) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - ((((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) = (data)) -#define hrt_indexed_load(cell, type, array, index) \ - (((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) - -#else /* C_RUN */ - -#define hrt_scalar_store(cell, type, var, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_scalar_load(cell, type, var) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_indexed_load(cell, type, array, index) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)))) - -#endif /* C_RUN */ - -#endif /* _HRT_VAR_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/version.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/version.h index bbc4948..d1cf960 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/version.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/hrt/version.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/spmem_dump.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/spmem_dump.c index 5b05948..08d4124 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/spmem_dump.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2400_system/spmem_dump.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,9 +22,9 @@ #define _hrt_cell_load_program_sp(proc) _hrt_cell_load_program_embedded(proc, sp) -/* function input_system_acquisition_stop: ADE */ +/* function input_system_acquisition_stop: AE9 */ -/* function longjmp: 684E */ +/* function longjmp: 6A5C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SRST_MASK @@ -38,64 +38,66 @@ #define HIVE_ADDR_sp_HIVE_IF_SRST_MASK 0x1C8 #define HIVE_SIZE_sp_HIVE_IF_SRST_MASK 16 -/* function tmpmem_init_dmem: 6580 */ +/* function tmpmem_init_dmem: 6756 */ -/* function ia_css_isys_sp_token_map_receive_ack: 5EC4 */ +/* function ia_css_isys_sp_token_map_receive_ack: 609A */ -/* function ia_css_dmaproxy_sp_set_addr_B: 332C */ +/* function ia_css_dmaproxy_sp_set_addr_B: 350A */ + +/* function ia_css_pipe_data_init_tagger_resources: A60 */ /* function debug_buffer_set_ddr_addr: DD */ -/* function receiver_port_reg_load: AC2 */ +/* function receiver_port_reg_load: ACD */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_mipi #define HIVE_MEM_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_mipi 0x631C +#define HIVE_ADDR_vbuf_mipi 0x6348 #define HIVE_SIZE_vbuf_mipi 12 #else #endif #endif #define HIVE_MEM_sp_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_mipi 0x631C +#define HIVE_ADDR_sp_vbuf_mipi 0x6348 #define HIVE_SIZE_sp_vbuf_mipi 12 -/* function ia_css_event_sp_decode: 351D */ +/* function ia_css_event_sp_decode: 36FB */ -/* function ia_css_queue_get_size: 48A5 */ +/* function ia_css_queue_get_size: 4AD4 */ -/* function ia_css_queue_load: 4EE6 */ +/* function ia_css_queue_load: 50EB */ -/* function setjmp: 6857 */ +/* function setjmp: 6A65 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_isys_event_queue #define HIVE_MEM_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x4684 +#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x46B0 #define HIVE_SIZE_sem_for_sp2host_isys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x4684 +#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x46B0 #define HIVE_SIZE_sp_sem_for_sp2host_isys_event_queue 20 -/* function ia_css_dmaproxy_sp_wait_for_ack: 6E07 */ +/* function ia_css_dmaproxy_sp_wait_for_ack: 6FE6 */ -/* function ia_css_sp_rawcopy_func: 510B */ +/* function ia_css_sp_rawcopy_func: 5310 */ -/* function ia_css_tagger_buf_sp_pop_marked: 29F7 */ +/* function ia_css_tagger_buf_sp_pop_marked: 2B83 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stage #define HIVE_MEM_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stage 0x5C00 +#define HIVE_ADDR_isp_stage 0x5C30 #define HIVE_SIZE_isp_stage 832 #else #endif #endif #define HIVE_MEM_sp_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stage 0x5C00 +#define HIVE_ADDR_sp_isp_stage 0x5C30 #define HIVE_SIZE_sp_isp_stage 832 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -110,32 +112,32 @@ #define HIVE_ADDR_sp_vbuf_raw 0x2F4 #define HIVE_SIZE_sp_vbuf_raw 4 -/* function ia_css_sp_bin_copy_func: 5032 */ +/* function ia_css_sp_bin_copy_func: 5237 */ -/* function ia_css_queue_item_store: 4C34 */ +/* function ia_css_queue_item_store: 4E39 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4AA0 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4ACC #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4AA0 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4ACC #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AB4 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AE0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_buffer_bufs 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AB4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AE0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 160 /* function sp_start_isp: 45D */ @@ -143,110 +145,98 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_binary_group #define HIVE_MEM_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_binary_group 0x5FF0 +#define HIVE_ADDR_sp_binary_group 0x6020 #define HIVE_SIZE_sp_binary_group 32 #else #endif #endif #define HIVE_MEM_sp_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_binary_group 0x5FF0 +#define HIVE_ADDR_sp_sp_binary_group 0x6020 #define HIVE_SIZE_sp_sp_binary_group 32 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sw_state #define HIVE_MEM_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sw_state 0x62AC +#define HIVE_ADDR_sp_sw_state 0x62D8 #define HIVE_SIZE_sp_sw_state 4 #else #endif #endif #define HIVE_MEM_sp_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sw_state 0x62AC +#define HIVE_ADDR_sp_sp_sw_state 0x62D8 #define HIVE_SIZE_sp_sp_sw_state 4 -/* function ia_css_thread_sp_main: D5B */ +/* function ia_css_thread_sp_main: D66 */ -/* function ia_css_ispctrl_sp_init_internal_buffers: 3723 */ +/* function ia_css_ispctrl_sp_init_internal_buffers: 390F */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_psys_event_queue_handle #define HIVE_MEM_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x4B54 +#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x4B80 #define HIVE_SIZE_sp2host_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x4B54 +#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x4B80 #define HIVE_SIZE_sp_sp2host_psys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_psys_event_queue #define HIVE_MEM_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x4698 +#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x46C4 #define HIVE_SIZE_sem_for_sp2host_psys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x4698 +#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x46C4 #define HIVE_SIZE_sp_sem_for_sp2host_psys_event_queue 20 -/* function ia_css_tagger_sp_propagate_frame: 2410 */ - -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sp_stop_copy_preview -#define HIVE_MEM_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_stop_copy_preview 0x6290 -#define HIVE_SIZE_sp_stop_copy_preview 4 -#else -#endif -#endif -#define HIVE_MEM_sp_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_stop_copy_preview 0x6290 -#define HIVE_SIZE_sp_sp_stop_copy_preview 4 +/* function ia_css_tagger_sp_propagate_frame: 244A */ -/* function input_system_reg_load: B17 */ +/* function input_system_reg_load: B22 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_handles #define HIVE_MEM_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_handles 0x6328 +#define HIVE_ADDR_vbuf_handles 0x6354 #define HIVE_SIZE_vbuf_handles 960 #else #endif #endif #define HIVE_MEM_sp_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_handles 0x6328 +#define HIVE_ADDR_sp_vbuf_handles 0x6354 #define HIVE_SIZE_sp_vbuf_handles 960 -/* function ia_css_queue_store: 4D9A */ +/* function ia_css_queue_store: 4F9F */ -/* function ia_css_sp_flash_register: 2C2C */ +/* function ia_css_sp_flash_register: 2DB8 */ -/* function ia_css_sp_rawcopy_dummy_function: 5652 */ +/* function ia_css_sp_rawcopy_dummy_function: 5828 */ -/* function ia_css_isys_sp_backend_create: 5B37 */ +/* function ia_css_isys_sp_backend_create: 5D0D */ -/* function ia_css_pipeline_sp_init: 1833 */ +/* function ia_css_pipeline_sp_init: 1857 */ -/* function ia_css_tagger_sp_configure: 2300 */ +/* function ia_css_tagger_sp_configure: 233A */ -/* function ia_css_ispctrl_sp_end_binary: 3566 */ +/* function ia_css_ispctrl_sp_end_binary: 3744 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B60 +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B8C #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B60 +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B8C #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 -/* function receiver_port_reg_store: AC9 */ +/* function receiver_port_reg_store: AD4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_is_pending_mask @@ -263,114 +253,114 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_frame #define HIVE_MEM_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_frame 0x46AC +#define HIVE_ADDR_sp_all_cb_elems_frame 0x46D8 #define HIVE_SIZE_sp_all_cb_elems_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x46AC +#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x46D8 #define HIVE_SIZE_sp_sp_all_cb_elems_frame 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_isys_event_queue_handle #define HIVE_MEM_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x4B74 +#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x4BA0 #define HIVE_SIZE_sp2host_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x4B74 +#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x4BA0 #define HIVE_SIZE_sp_sp2host_isys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_com #define HIVE_MEM_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_com 0x4114 +#define HIVE_ADDR_host_sp_com 0x4118 #define HIVE_SIZE_host_sp_com 220 #else #endif #endif #define HIVE_MEM_sp_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_com 0x4114 +#define HIVE_ADDR_sp_host_sp_com 0x4118 #define HIVE_SIZE_sp_host_sp_com 220 -/* function ia_css_queue_get_free_space: 49F9 */ +/* function ia_css_queue_get_free_space: 4BFE */ -/* function exec_image_pipe: 6C4 */ +/* function exec_image_pipe: 669 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_init_dmem_data #define HIVE_MEM_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_init_dmem_data 0x62B0 +#define HIVE_ADDR_sp_init_dmem_data 0x62DC #define HIVE_SIZE_sp_init_dmem_data 24 #else #endif #endif #define HIVE_MEM_sp_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_init_dmem_data 0x62B0 +#define HIVE_ADDR_sp_sp_init_dmem_data 0x62DC #define HIVE_SIZE_sp_sp_init_dmem_data 24 -/* function ia_css_sp_metadata_start: 5914 */ +/* function ia_css_sp_metadata_start: 5AEA */ -/* function ia_css_bufq_sp_init_buffer_queues: 2C9B */ +/* function ia_css_bufq_sp_init_buffer_queues: 2E27 */ -/* function ia_css_pipeline_sp_stop: 1816 */ +/* function ia_css_pipeline_sp_stop: 183A */ -/* function ia_css_tagger_sp_connect_pipes: 27EA */ +/* function ia_css_tagger_sp_connect_pipes: 2824 */ -/* function sp_isys_copy_wait: 70D */ +/* function sp_isys_copy_wait: 6B2 */ /* function is_isp_debug_buffer_full: 337 */ -/* function ia_css_dmaproxy_sp_configure_channel_from_info: 32AF */ +/* function ia_css_dmaproxy_sp_configure_channel_from_info: 347A */ -/* function encode_and_post_timer_event: A30 */ +/* function encode_and_post_timer_event: 9D5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_per_frame_data #define HIVE_MEM_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_per_frame_data 0x41F0 +#define HIVE_ADDR_sp_per_frame_data 0x41F4 #define HIVE_SIZE_sp_per_frame_data 4 #else #endif #endif #define HIVE_MEM_sp_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_per_frame_data 0x41F0 +#define HIVE_ADDR_sp_sp_per_frame_data 0x41F4 #define HIVE_SIZE_sp_sp_per_frame_data 4 -/* function ia_css_rmgr_sp_vbuf_dequeue: 62D4 */ +/* function ia_css_rmgr_sp_vbuf_dequeue: 64AA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_psys_event_queue_handle #define HIVE_MEM_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x4B80 +#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x4BAC #define HIVE_SIZE_host2sp_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x4B80 +#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x4BAC #define HIVE_SIZE_sp_host2sp_psys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_xmem_bin_addr #define HIVE_MEM_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_xmem_bin_addr 0x41F4 +#define HIVE_ADDR_xmem_bin_addr 0x41F8 #define HIVE_SIZE_xmem_bin_addr 4 #else #endif #endif #define HIVE_MEM_sp_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_sp_xmem_bin_addr 0x41F4 +#define HIVE_ADDR_sp_xmem_bin_addr 0x41F8 #define HIVE_SIZE_sp_xmem_bin_addr 4 -/* function tmr_clock_init: 65A0 */ +/* function tmr_clock_init: 6776 */ -/* function ia_css_pipeline_sp_run: 1403 */ +/* function ia_css_pipeline_sp_run: 140E */ -/* function memcpy: 68F7 */ +/* function memcpy: 6B05 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_GP_DEVICE_BASE @@ -396,49 +386,49 @@ #define HIVE_ADDR_sp_ia_css_thread_sp_ready_queue 0x1E0 #define HIVE_SIZE_sp_ia_css_thread_sp_ready_queue 12 -/* function input_system_reg_store: B1E */ +/* function input_system_reg_store: B29 */ -/* function ia_css_isys_sp_frontend_start: 5D4D */ +/* function ia_css_isys_sp_frontend_start: 5F23 */ -/* function ia_css_uds_sp_scale_params: 6600 */ +/* function ia_css_uds_sp_scale_params: 680E */ -/* function ia_css_circbuf_increase_size: E40 */ +/* function ia_css_circbuf_increase_size: E4B */ -/* function __divu: 6875 */ +/* function __divu: 6A83 */ -/* function ia_css_thread_sp_get_state: C83 */ +/* function ia_css_thread_sp_get_state: C8E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_stop #define HIVE_MEM_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_stop 0x46BC +#define HIVE_ADDR_sem_for_cont_capt_stop 0x46E8 #define HIVE_SIZE_sem_for_cont_capt_stop 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x46BC +#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x46E8 #define HIVE_SIZE_sp_sem_for_cont_capt_stop 20 -/* function thread_fiber_sp_main: E39 */ +/* function thread_fiber_sp_main: E44 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_pipe_thread #define HIVE_MEM_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_pipe_thread 0x4800 +#define HIVE_ADDR_sp_isp_pipe_thread 0x482C #define HIVE_SIZE_sp_isp_pipe_thread 340 #else #endif #endif #define HIVE_MEM_sp_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x4800 +#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x482C #define HIVE_SIZE_sp_sp_isp_pipe_thread 340 -/* function ia_css_parambuf_sp_handle_parameter_sets: 128A */ +/* function ia_css_parambuf_sp_handle_parameter_sets: 1295 */ -/* function ia_css_spctrl_sp_set_state: 5943 */ +/* function ia_css_spctrl_sp_set_state: 5B19 */ -/* function ia_css_thread_sem_sp_signal: 6AF7 */ +/* function ia_css_thread_sem_sp_signal: 6D05 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_IRQ_BASE @@ -464,13 +454,25 @@ #define HIVE_ADDR_sp_TIMED_CTRL_BASE 0x40 #define HIVE_SIZE_sp_TIMED_CTRL_BASE 4 -/* function ia_css_isys_sp_isr: 6FDC */ +/* function ia_css_isys_sp_isr: 71D4 */ -/* function ia_css_isys_sp_generate_exp_id: 60E5 */ +/* function ia_css_isys_sp_generate_exp_id: 62BB */ -/* function ia_css_rmgr_sp_init: 61CF */ +/* function ia_css_rmgr_sp_init: 63A5 */ -/* function ia_css_thread_sem_sp_init: 6BC8 */ +/* function ia_css_thread_sem_sp_init: 6DD6 */ + +#ifndef HIVE_MULTIPLE_PROGRAMS +#ifndef HIVE_MEM_sem_for_reading_cb_frame +#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sem_for_reading_cb_frame 0x46FC +#define HIVE_SIZE_sem_for_reading_cb_frame 40 +#else +#endif +#endif +#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x46FC +#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_is_isp_requested @@ -484,27 +486,15 @@ #define HIVE_ADDR_sp_is_isp_requested 0x308 #define HIVE_SIZE_sp_is_isp_requested 4 -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sem_for_reading_cb_frame -#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_frame 0x46D0 -#define HIVE_SIZE_sem_for_reading_cb_frame 40 -#else -#endif -#endif -#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x46D0 -#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 - -/* function ia_css_dmaproxy_sp_execute: 3217 */ +/* function ia_css_dmaproxy_sp_execute: 33E0 */ -/* function ia_css_queue_is_empty: 48E0 */ +/* function ia_css_queue_is_empty: 7133 */ -/* function ia_css_pipeline_sp_has_stopped: 180C */ +/* function ia_css_pipeline_sp_has_stopped: 1830 */ -/* function ia_css_circbuf_extract: F44 */ +/* function ia_css_circbuf_extract: F4F */ -/* function ia_css_tagger_buf_sp_is_locked_from_start: 2B0D */ +/* function ia_css_tagger_buf_sp_is_locked_from_start: 2C99 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_sp_thread @@ -518,13 +508,13 @@ #define HIVE_ADDR_sp_current_sp_thread 0x1DC #define HIVE_SIZE_sp_current_sp_thread 4 -/* function ia_css_spctrl_sp_get_spid: 594A */ +/* function ia_css_spctrl_sp_get_spid: 5B20 */ -/* function ia_css_bufq_sp_reset_buffers: 2D22 */ +/* function ia_css_bufq_sp_reset_buffers: 2EAE */ -/* function ia_css_dmaproxy_sp_read_byte_addr: 6E35 */ +/* function ia_css_dmaproxy_sp_read_byte_addr: 7014 */ -/* function ia_css_rmgr_sp_uninit: 61C8 */ +/* function ia_css_rmgr_sp_uninit: 639E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_stack @@ -538,22 +528,22 @@ #define HIVE_ADDR_sp_sp_threads_stack 0x164 #define HIVE_SIZE_sp_sp_threads_stack 28 -/* function ia_css_circbuf_peek: F26 */ +/* function ia_css_circbuf_peek: F31 */ -/* function ia_css_parambuf_sp_wait_for_in_param: 1053 */ +/* function ia_css_parambuf_sp_wait_for_in_param: 105E */ -/* function ia_css_isys_sp_token_map_get_exp_id: 5FAD */ +/* function ia_css_isys_sp_token_map_get_exp_id: 6183 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_param #define HIVE_MEM_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_param 0x46F8 +#define HIVE_ADDR_sp_all_cb_elems_param 0x4724 #define HIVE_SIZE_sp_all_cb_elems_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x46F8 +#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x4724 #define HIVE_SIZE_sp_sp_all_cb_elems_param 16 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -571,105 +561,105 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame_desc #define HIVE_MEM_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame_desc 0x4708 +#define HIVE_ADDR_sp_all_cbs_frame_desc 0x4734 #define HIVE_SIZE_sp_all_cbs_frame_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x4708 +#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x4734 #define HIVE_SIZE_sp_sp_all_cbs_frame_desc 8 -/* function sp_isys_copy_func_v2: 706 */ +/* function sp_isys_copy_func_v2: 6AB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_cb_param #define HIVE_MEM_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_param 0x4710 +#define HIVE_ADDR_sem_for_reading_cb_param 0x473C #define HIVE_SIZE_sem_for_reading_cb_param 40 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x4710 +#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x473C #define HIVE_SIZE_sp_sem_for_reading_cb_param 40 -/* function ia_css_queue_get_used_space: 49AD */ +/* function ia_css_queue_get_used_space: 4BB2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_start #define HIVE_MEM_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_start 0x4738 +#define HIVE_ADDR_sem_for_cont_capt_start 0x4764 #define HIVE_SIZE_sem_for_cont_capt_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x4738 +#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x4764 #define HIVE_SIZE_sp_sem_for_cont_capt_start 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tmp_heap #define HIVE_MEM_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_tmp_heap 0x6010 +#define HIVE_ADDR_tmp_heap 0x6040 #define HIVE_SIZE_tmp_heap 640 #else #endif #endif #define HIVE_MEM_sp_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tmp_heap 0x6010 +#define HIVE_ADDR_sp_tmp_heap 0x6040 #define HIVE_SIZE_sp_tmp_heap 640 -/* function ia_css_rmgr_sp_get_num_vbuf: 64D8 */ +/* function ia_css_rmgr_sp_get_num_vbuf: 66AE */ -/* function ia_css_ispctrl_sp_output_compute_dma_info: 3F49 */ +/* function ia_css_ispctrl_sp_output_compute_dma_info: 4133 */ -/* function ia_css_tagger_sp_lock_exp_id: 20CD */ +/* function ia_css_tagger_sp_lock_exp_id: 2107 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4B8C +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4BB8 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_s3a_bufs 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4B8C +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4BB8 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 60 -/* function ia_css_queue_is_full: 4A44 */ +/* function ia_css_queue_is_full: 4C49 */ /* function debug_buffer_init_isp: E4 */ -/* function ia_css_isys_sp_frontend_uninit: 5D07 */ +/* function ia_css_isys_sp_frontend_uninit: 5EDD */ -/* function ia_css_tagger_sp_exp_id_is_locked: 2003 */ +/* function ia_css_tagger_sp_exp_id_is_locked: 203D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem #define HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x66E8 +#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x6714 #define HIVE_SIZE_ia_css_rmgr_sp_mipi_frame_sem 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x66E8 +#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x6714 #define HIVE_SIZE_sp_ia_css_rmgr_sp_mipi_frame_sem 60 -/* function ia_css_rmgr_sp_refcount_dump: 62AF */ +/* function ia_css_rmgr_sp_refcount_dump: 6485 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id #define HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BC8 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BF4 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BC8 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BF4 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -684,65 +674,65 @@ #define HIVE_ADDR_sp_sp_pipe_threads 0x150 #define HIVE_SIZE_sp_sp_pipe_threads 20 -/* function sp_event_proxy_func: 71B */ +/* function sp_event_proxy_func: 6C0 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_isys_event_queue_handle #define HIVE_MEM_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x4BDC +#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x4C08 #define HIVE_SIZE_host2sp_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x4BDC +#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x4C08 #define HIVE_SIZE_sp_host2sp_isys_event_queue_handle 12 -/* function ia_css_thread_sp_yield: 6A70 */ +/* function ia_css_thread_sp_yield: 6C7E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param_desc #define HIVE_MEM_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param_desc 0x474C +#define HIVE_ADDR_sp_all_cbs_param_desc 0x4778 #define HIVE_SIZE_sp_all_cbs_param_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x474C +#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x4778 #define HIVE_SIZE_sp_sp_all_cbs_param_desc 8 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb #define HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x5BF4 +#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x5C20 #define HIVE_SIZE_ia_css_dmaproxy_sp_invalidate_tlb 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x5BF4 +#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x5C20 #define HIVE_SIZE_sp_ia_css_dmaproxy_sp_invalidate_tlb 4 -/* function ia_css_thread_sp_fork: D10 */ +/* function ia_css_thread_sp_fork: D1B */ -/* function ia_css_tagger_sp_destroy: 27F4 */ +/* function ia_css_tagger_sp_destroy: 282E */ -/* function ia_css_dmaproxy_sp_vmem_read: 31B7 */ +/* function ia_css_dmaproxy_sp_vmem_read: 3380 */ -/* function ia_css_ifmtr_sp_init: 6136 */ +/* function ia_css_ifmtr_sp_init: 630C */ -/* function initialize_sp_group: 6D4 */ +/* function initialize_sp_group: 679 */ -/* function ia_css_tagger_buf_sp_peek: 2919 */ +/* function ia_css_tagger_buf_sp_peek: 2AA5 */ -/* function ia_css_thread_sp_init: D3C */ +/* function ia_css_thread_sp_init: D47 */ -/* function ia_css_isys_sp_reset_exp_id: 60DD */ +/* function ia_css_isys_sp_reset_exp_id: 62B3 */ -/* function qos_scheduler_update_fps: 65F0 */ +/* function qos_scheduler_update_fps: 67FE */ -/* function ia_css_ispctrl_sp_set_stream_base_addr: 461E */ +/* function ia_css_ispctrl_sp_set_stream_base_addr: 4820 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_DMEM_BASE @@ -768,7 +758,9 @@ #define HIVE_ADDR_sp_SP_DMEM_BASE 0x4 #define HIVE_SIZE_sp_SP_DMEM_BASE 4 -/* function ia_css_dmaproxy_sp_read: 322D */ +/* function __ia_css_queue_is_empty_text: 4B0F */ + +/* function ia_css_dmaproxy_sp_read: 33F6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_raw_copy_line_count @@ -785,27 +777,27 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_tag_cmd_queue_handle #define HIVE_MEM_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x4BE8 +#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x4C14 #define HIVE_SIZE_host2sp_tag_cmd_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x4BE8 +#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x4C14 #define HIVE_SIZE_sp_host2sp_tag_cmd_queue_handle 12 -/* function ia_css_queue_peek: 4923 */ +/* function ia_css_queue_peek: 4B28 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_frame_cnt #define HIVE_MEM_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x4A94 +#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x4AC0 #define HIVE_SIZE_ia_css_flash_sp_frame_cnt 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x4A94 +#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x4AC0 #define HIVE_SIZE_sp_ia_css_flash_sp_frame_cnt 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -823,26 +815,26 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_thread #define HIVE_MEM_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_isp_thread 0x5F40 +#define HIVE_ADDR_isp_thread 0x5F70 #define HIVE_SIZE_isp_thread 4 #else #endif #endif #define HIVE_MEM_sp_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_thread 0x5F40 +#define HIVE_ADDR_sp_isp_thread 0x5F70 #define HIVE_SIZE_sp_isp_thread 4 -/* function encode_and_post_sp_event_non_blocking: A78 */ +/* function encode_and_post_sp_event_non_blocking: A1D */ -/* function ia_css_isys_sp_frontend_destroy: 5DDF */ +/* function ia_css_isys_sp_frontend_destroy: 5FB5 */ /* function is_ddr_debug_buffer_full: 2CC */ -/* function ia_css_isys_sp_frontend_stop: 5D1F */ +/* function ia_css_isys_sp_frontend_stop: 5EF5 */ -/* function ia_css_isys_sp_token_map_init: 607B */ +/* function ia_css_isys_sp_token_map_init: 6251 */ -/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 2969 */ +/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 2AF5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_fiber @@ -856,98 +848,98 @@ #define HIVE_ADDR_sp_sp_threads_fiber 0x19C #define HIVE_SIZE_sp_sp_threads_fiber 28 -/* function encode_and_post_sp_event: A01 */ +/* function encode_and_post_sp_event: 9A6 */ /* function debug_enqueue_ddr: EE */ -/* function ia_css_rmgr_sp_refcount_init_vbuf: 626A */ +/* function ia_css_rmgr_sp_refcount_init_vbuf: 6440 */ -/* function dmaproxy_sp_read_write: 6EE4 */ +/* function dmaproxy_sp_read_write: 70B2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer #define HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5BF8 +#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5C24 #define HIVE_SIZE_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5BF8 +#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5C24 #define HIVE_SIZE_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_buffer_queue_handle #define HIVE_MEM_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_buffer_queue_handle 0x4BF4 +#define HIVE_ADDR_host2sp_buffer_queue_handle 0x4C20 #define HIVE_SIZE_host2sp_buffer_queue_handle 480 #else #endif #endif #define HIVE_MEM_sp_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x4BF4 +#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x4C20 #define HIVE_SIZE_sp_host2sp_buffer_queue_handle 480 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_service #define HIVE_MEM_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_service 0x3178 +#define HIVE_ADDR_ia_css_flash_sp_in_service 0x317C #define HIVE_SIZE_ia_css_flash_sp_in_service 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x3178 +#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x317C #define HIVE_SIZE_sp_ia_css_flash_sp_in_service 4 -/* function ia_css_dmaproxy_sp_process: 6BF0 */ +/* function ia_css_dmaproxy_sp_process: 6DFE */ -/* function ia_css_tagger_buf_sp_mark_from_end: 2BF1 */ +/* function ia_css_tagger_buf_sp_mark_from_end: 2D7D */ -/* function ia_css_isys_sp_backend_rcv_acquire_ack: 59EC */ +/* function ia_css_isys_sp_backend_rcv_acquire_ack: 5BC2 */ -/* function ia_css_isys_sp_backend_pre_acquire_request: 5A02 */ +/* function ia_css_isys_sp_backend_pre_acquire_request: 5BD8 */ -/* function ia_css_ispctrl_sp_init_cs: 3653 */ +/* function ia_css_ispctrl_sp_init_cs: 383F */ -/* function ia_css_spctrl_sp_init: 5958 */ +/* function ia_css_spctrl_sp_init: 5B2E */ -/* function sp_event_proxy_init: 730 */ +/* function sp_event_proxy_init: 6D5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick #define HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4DD4 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4E00 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4DD4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4E00 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_output #define HIVE_MEM_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_output 0x41F8 +#define HIVE_ADDR_sp_output 0x41FC #define HIVE_SIZE_sp_output 16 #else #endif #endif #define HIVE_MEM_sp_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_output 0x41F8 +#define HIVE_ADDR_sp_sp_output 0x41FC #define HIVE_SIZE_sp_sp_output 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4DFC +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4E28 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4DFC +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4E28 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -974,52 +966,52 @@ #define HIVE_ADDR_sp_INPUT_FORMATTER_BASE 0x4C #define HIVE_SIZE_sp_INPUT_FORMATTER_BASE 16 -/* function sp_dma_proxy_reset_channels: 3487 */ +/* function sp_dma_proxy_reset_channels: 3665 */ -/* function ia_css_isys_sp_backend_acquire: 5B0D */ +/* function ia_css_isys_sp_backend_acquire: 5CE3 */ -/* function ia_css_tagger_sp_update_size: 28E8 */ +/* function ia_css_tagger_sp_update_size: 2A74 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_host_sp_queue #define HIVE_MEM_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x511C +#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x5148 #define HIVE_SIZE_ia_css_bufq_host_sp_queue 2008 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x511C +#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x5148 #define HIVE_SIZE_sp_ia_css_bufq_host_sp_queue 2008 -/* function thread_fiber_sp_create: DA8 */ +/* function thread_fiber_sp_create: DB3 */ -/* function ia_css_dmaproxy_sp_set_increments: 3319 */ +/* function ia_css_dmaproxy_sp_set_increments: 34F7 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_frame #define HIVE_MEM_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_frame 0x4754 +#define HIVE_ADDR_sem_for_writing_cb_frame 0x4780 #define HIVE_SIZE_sem_for_writing_cb_frame 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x4754 +#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x4780 #define HIVE_SIZE_sp_sem_for_writing_cb_frame 20 -/* function receiver_reg_store: AD7 */ +/* function receiver_reg_store: AE2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_param #define HIVE_MEM_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_param 0x4768 +#define HIVE_ADDR_sem_for_writing_cb_param 0x4794 #define HIVE_SIZE_sem_for_writing_cb_param 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x4768 +#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x4794 #define HIVE_SIZE_sp_sem_for_writing_cb_param 20 /* function sp_start_isp_entry: 453 */ @@ -1030,51 +1022,51 @@ #endif #define HIVE_ADDR_sp_sp_start_isp_entry 0x453 -/* function ia_css_tagger_buf_sp_unmark_all: 2B75 */ +/* function ia_css_tagger_buf_sp_unmark_all: 2D01 */ -/* function ia_css_tagger_buf_sp_unmark_from_start: 2BB6 */ +/* function ia_css_tagger_buf_sp_unmark_from_start: 2D42 */ -/* function ia_css_dmaproxy_sp_channel_acquire: 34B3 */ +/* function ia_css_dmaproxy_sp_channel_acquire: 3691 */ -/* function ia_css_rmgr_sp_add_num_vbuf: 64B4 */ +/* function ia_css_rmgr_sp_add_num_vbuf: 668A */ -/* function ia_css_isys_sp_token_map_create: 60C4 */ +/* function ia_css_isys_sp_token_map_create: 629A */ -/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 3183 */ +/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 334C */ -/* function ia_css_tagger_sp_acquire_buf_elem: 1FDB */ +/* function ia_css_tagger_sp_acquire_buf_elem: 2015 */ -/* function ia_css_bufq_sp_is_dynamic_buffer: 306C */ +/* function ia_css_bufq_sp_is_dynamic_buffer: 31F8 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_group #define HIVE_MEM_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_group 0x4208 -#define HIVE_SIZE_sp_group 1144 +#define HIVE_ADDR_sp_group 0x420C +#define HIVE_SIZE_sp_group 1184 #else #endif #endif #define HIVE_MEM_sp_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_group 0x4208 -#define HIVE_SIZE_sp_sp_group 1144 +#define HIVE_ADDR_sp_sp_group 0x420C +#define HIVE_SIZE_sp_sp_group 1184 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_event_proxy_thread #define HIVE_MEM_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_event_proxy_thread 0x4954 +#define HIVE_ADDR_sp_event_proxy_thread 0x4980 #define HIVE_SIZE_sp_event_proxy_thread 68 #else #endif #endif #define HIVE_MEM_sp_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_event_proxy_thread 0x4954 +#define HIVE_ADDR_sp_sp_event_proxy_thread 0x4980 #define HIVE_SIZE_sp_sp_event_proxy_thread 68 -/* function ia_css_thread_sp_kill: CD6 */ +/* function ia_css_thread_sp_kill: CE1 */ -/* function ia_css_tagger_sp_create: 28A2 */ +/* function ia_css_tagger_sp_create: 2A22 */ -/* function tmpmem_acquire_dmem: 6561 */ +/* function tmpmem_acquire_dmem: 6737 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_MMU_BASE @@ -1088,41 +1080,41 @@ #define HIVE_ADDR_sp_MMU_BASE 0x24 #define HIVE_SIZE_sp_MMU_BASE 8 -/* function ia_css_dmaproxy_sp_channel_release: 349F */ +/* function ia_css_dmaproxy_sp_channel_release: 367D */ -/* function ia_css_dmaproxy_sp_is_idle: 347F */ +/* function ia_css_dmaproxy_sp_is_idle: 365D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_qos_start #define HIVE_MEM_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_qos_start 0x477C +#define HIVE_ADDR_sem_for_qos_start 0x47A8 #define HIVE_SIZE_sem_for_qos_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_qos_start 0x477C +#define HIVE_ADDR_sp_sem_for_qos_start 0x47A8 #define HIVE_SIZE_sp_sem_for_qos_start 20 -/* function isp_hmem_load: B55 */ +/* function isp_hmem_load: B60 */ -/* function ia_css_tagger_sp_release_buf_elem: 1FB7 */ +/* function ia_css_tagger_sp_release_buf_elem: 1FF1 */ -/* function ia_css_eventq_sp_send: 34F5 */ +/* function ia_css_eventq_sp_send: 36D3 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_isys_sp_error_cnt #define HIVE_MEM_ia_css_isys_sp_error_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_isys_sp_error_cnt 0x62D4 +#define HIVE_ADDR_ia_css_isys_sp_error_cnt 0x6300 #define HIVE_SIZE_ia_css_isys_sp_error_cnt 16 #else #endif #endif #define HIVE_MEM_sp_ia_css_isys_sp_error_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_isys_sp_error_cnt 0x62D4 +#define HIVE_ADDR_sp_ia_css_isys_sp_error_cnt 0x6300 #define HIVE_SIZE_sp_ia_css_isys_sp_error_cnt 16 -/* function ia_css_tagger_buf_sp_unlock_from_start: 2AA5 */ +/* function ia_css_tagger_buf_sp_unlock_from_start: 2C31 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_debug_buffer_ddr_address @@ -1136,34 +1128,38 @@ #define HIVE_ADDR_sp_debug_buffer_ddr_address 0xBC #define HIVE_SIZE_sp_debug_buffer_ddr_address 4 -/* function sp_isys_copy_request: 714 */ +/* function sp_isys_copy_request: 6B9 */ -/* function ia_css_rmgr_sp_refcount_retain_vbuf: 6344 */ +/* function ia_css_rmgr_sp_refcount_retain_vbuf: 651A */ -/* function ia_css_thread_sp_set_priority: CCE */ +/* function ia_css_thread_sp_set_priority: CD9 */ -/* function sizeof_hmem: BFC */ +/* function sizeof_hmem: C07 */ -/* function tmpmem_release_dmem: 6550 */ +/* function tmpmem_release_dmem: 6726 */ /* function cnd_input_system_cfg: 392 */ -/* function __ia_css_sp_rawcopy_func_critical: 6F65 */ +/* function __ia_css_sp_rawcopy_func_critical: 715D */ + +/* function __ia_css_dmaproxy_sp_process_text: 32F0 */ -/* function ia_css_dmaproxy_sp_set_width_exception: 3304 */ +/* function ia_css_dmaproxy_sp_set_width_exception: 34E2 */ -/* function sp_event_assert: 8B1 */ +/* function sp_event_assert: 856 */ -/* function ia_css_flash_sp_init_internal_params: 2C90 */ +/* function ia_css_flash_sp_init_internal_params: 2E1C */ -/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 29AB */ +/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 2B37 */ -/* function __modu: 68BB */ +/* function __modu: 6AC9 */ -/* function ia_css_dmaproxy_sp_init_isp_vector: 3189 */ +/* function ia_css_dmaproxy_sp_init_isp_vector: 3352 */ /* function isp_vamem_store: 0 */ +/* function ia_css_tagger_sp_set_copy_pipe: 2A19 */ + #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_GDC_BASE #define HIVE_MEM_GDC_BASE scalar_processor_2400_dmem @@ -1176,22 +1172,22 @@ #define HIVE_ADDR_sp_GDC_BASE 0x44 #define HIVE_SIZE_sp_GDC_BASE 8 -/* function ia_css_queue_local_init: 4C0E */ +/* function ia_css_queue_local_init: 4E13 */ -/* function sp_event_proxy_callout_func: 6988 */ +/* function sp_event_proxy_callout_func: 6B96 */ -/* function qos_scheduler_schedule_stage: 65C1 */ +/* function qos_scheduler_schedule_stage: 67AA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_thread_sp_num_ready_threads #define HIVE_MEM_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x49E0 +#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x4A0C #define HIVE_SIZE_ia_css_thread_sp_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x49E0 +#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x4A0C #define HIVE_SIZE_sp_ia_css_thread_sp_num_ready_threads 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -1206,29 +1202,31 @@ #define HIVE_ADDR_sp_sp_threads_stack_size 0x180 #define HIVE_SIZE_sp_sp_threads_stack_size 28 -/* function ia_css_ispctrl_sp_isp_done_row_striping: 3F2F */ +/* function ia_css_ispctrl_sp_isp_done_row_striping: 4119 */ + +/* function __ia_css_isys_sp_isr_text: 5FDF */ -/* function __ia_css_isys_sp_isr_text: 5E09 */ +/* function ia_css_queue_dequeue: 4C91 */ -/* function ia_css_queue_dequeue: 4A8C */ +/* function is_qos_standalone_mode: 6785 */ -/* function ia_css_dmaproxy_sp_configure_channel: 6E4C */ +/* function ia_css_dmaproxy_sp_configure_channel: 702B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_thread_fiber_sp #define HIVE_MEM_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_current_thread_fiber_sp 0x49E8 +#define HIVE_ADDR_current_thread_fiber_sp 0x4A14 #define HIVE_SIZE_current_thread_fiber_sp 4 #else #endif #endif #define HIVE_MEM_sp_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_sp_current_thread_fiber_sp 0x49E8 +#define HIVE_ADDR_sp_current_thread_fiber_sp 0x4A14 #define HIVE_SIZE_sp_current_thread_fiber_sp 4 -/* function ia_css_circbuf_pop: FD8 */ +/* function ia_css_circbuf_pop: FE3 */ -/* function memset: 693A */ +/* function memset: 6B48 */ /* function irq_raise_set_token: B6 */ @@ -1244,83 +1242,85 @@ #define HIVE_ADDR_sp_GPIO_BASE 0x3C #define HIVE_SIZE_sp_GPIO_BASE 4 -/* function ia_css_pipeline_acc_stage_enable: 17D7 */ +/* function ia_css_pipeline_acc_stage_enable: 17E9 */ -/* function ia_css_tagger_sp_unlock_exp_id: 2028 */ +/* function ia_css_tagger_sp_unlock_exp_id: 2062 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_ph #define HIVE_MEM_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_isp_ph 0x62E4 +#define HIVE_ADDR_isp_ph 0x6310 #define HIVE_SIZE_isp_ph 28 #else #endif #endif #define HIVE_MEM_sp_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_ph 0x62E4 +#define HIVE_ADDR_sp_isp_ph 0x6310 #define HIVE_SIZE_sp_isp_ph 28 -/* function ia_css_isys_sp_token_map_flush: 6009 */ +/* function ia_css_isys_sp_token_map_flush: 61DF */ -/* function ia_css_ispctrl_sp_init_ds: 37B2 */ +/* function ia_css_ispctrl_sp_init_ds: 399E */ -/* function get_xmem_base_addr_raw: 3B5F */ +/* function get_xmem_base_addr_raw: 3D49 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param #define HIVE_MEM_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param 0x4790 +#define HIVE_ADDR_sp_all_cbs_param 0x47BC #define HIVE_SIZE_sp_all_cbs_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param 0x4790 +#define HIVE_ADDR_sp_sp_all_cbs_param 0x47BC #define HIVE_SIZE_sp_sp_all_cbs_param 16 -/* function ia_css_circbuf_create: 1026 */ +/* function ia_css_circbuf_create: 1031 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp_group #define HIVE_MEM_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp_group 0x47A0 +#define HIVE_ADDR_sem_for_sp_group 0x47CC #define HIVE_SIZE_sem_for_sp_group 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp_group 0x47A0 +#define HIVE_ADDR_sp_sem_for_sp_group 0x47CC #define HIVE_SIZE_sp_sem_for_sp_group 20 -/* function ia_css_framebuf_sp_wait_for_in_frame: 64DF */ +/* function __ia_css_dmaproxy_sp_configure_channel_text: 34C1 */ -/* function ia_css_sp_rawcopy_tag_frame: 556F */ +/* function ia_css_framebuf_sp_wait_for_in_frame: 66B5 */ -/* function isp_hmem_clear: B25 */ +/* function ia_css_sp_rawcopy_tag_frame: 5757 */ -/* function ia_css_framebuf_sp_release_in_frame: 6522 */ +/* function isp_hmem_clear: B30 */ -/* function ia_css_isys_sp_backend_snd_acquire_request: 5A5F */ +/* function ia_css_framebuf_sp_release_in_frame: 66F8 */ -/* function ia_css_isys_sp_token_map_is_full: 5E90 */ +/* function ia_css_isys_sp_backend_snd_acquire_request: 5C35 */ -/* function input_system_acquisition_run: AF9 */ +/* function ia_css_isys_sp_token_map_is_full: 6066 */ -/* function ia_css_ispctrl_sp_start_binary: 3631 */ +/* function input_system_acquisition_run: B04 */ + +/* function ia_css_ispctrl_sp_start_binary: 381D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x58F4 +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x5920 #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x58F4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x5920 #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 -/* function ia_css_eventq_sp_recv: 34C7 */ +/* function ia_css_eventq_sp_recv: 36A5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_pool @@ -1334,9 +1334,11 @@ #define HIVE_ADDR_sp_isp_pool 0x2E8 #define HIVE_SIZE_sp_isp_pool 4 -/* function ia_css_rmgr_sp_rel_gen: 6211 */ +/* function ia_css_rmgr_sp_rel_gen: 63E7 */ + +/* function ia_css_tagger_sp_unblock_clients: 28EA */ -/* function css_get_frame_processing_time_end: 1FA7 */ +/* function css_get_frame_processing_time_end: 1FE1 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_any_pending_mask @@ -1350,15 +1352,15 @@ #define HIVE_ADDR_sp_event_any_pending_mask 0x300 #define HIVE_SIZE_sp_event_any_pending_mask 8 -/* function ia_css_isys_sp_backend_push: 5A16 */ +/* function ia_css_isys_sp_backend_push: 5BEC */ /* function sh_css_decode_tag_descr: 352 */ /* function debug_enqueue_isp: 27B */ -/* function qos_scheduler_update_stage_budget: 65AF */ +/* function qos_scheduler_update_stage_budget: 678D */ -/* function ia_css_spctrl_sp_uninit: 5951 */ +/* function ia_css_spctrl_sp_uninit: 5B27 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SWITCH_CODE @@ -1375,34 +1377,34 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x5908 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x5934 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_dis_bufs 140 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x5908 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x5934 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_dis_bufs 140 -/* function ia_css_tagger_buf_sp_lock_from_start: 2AD9 */ +/* function ia_css_tagger_buf_sp_lock_from_start: 2C65 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_isp_idle #define HIVE_MEM_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_isp_idle 0x47B4 +#define HIVE_ADDR_sem_for_isp_idle 0x47E0 #define HIVE_SIZE_sem_for_isp_idle 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_isp_idle 0x47B4 +#define HIVE_ADDR_sp_sem_for_isp_idle 0x47E0 #define HIVE_SIZE_sp_sem_for_isp_idle 20 -/* function ia_css_dmaproxy_sp_write_byte_addr: 31E6 */ +/* function ia_css_dmaproxy_sp_write_byte_addr: 33AF */ -/* function ia_css_dmaproxy_sp_init: 315D */ +/* function ia_css_dmaproxy_sp_init: 3326 */ -/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 2D62 */ +/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 2EEE */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_VAMEM_BASE @@ -1419,46 +1421,46 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rawcopy_sp_tagger #define HIVE_MEM_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x6294 +#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x62C0 #define HIVE_SIZE_ia_css_rawcopy_sp_tagger 24 #else #endif #endif #define HIVE_MEM_sp_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x6294 +#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x62C0 #define HIVE_SIZE_sp_ia_css_rawcopy_sp_tagger 24 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids #define HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x5994 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x59C0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_exp_ids 70 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x5994 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x59C0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_exp_ids 70 -/* function ia_css_queue_item_load: 4D00 */ +/* function ia_css_queue_item_load: 4F05 */ -/* function ia_css_spctrl_sp_get_state: 593C */ +/* function ia_css_spctrl_sp_get_state: 5B12 */ -/* function ia_css_isys_sp_token_map_uninit: 6026 */ +/* function ia_css_isys_sp_token_map_uninit: 61FC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_callout_sp_thread #define HIVE_MEM_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_callout_sp_thread 0x49DC +#define HIVE_ADDR_callout_sp_thread 0x4A08 #define HIVE_SIZE_callout_sp_thread 4 #else #endif #endif #define HIVE_MEM_sp_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_callout_sp_thread 0x49DC +#define HIVE_ADDR_sp_callout_sp_thread 0x4A08 #define HIVE_SIZE_sp_callout_sp_thread 4 -/* function thread_fiber_sp_init: E2F */ +/* function thread_fiber_sp_init: E3A */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_SP_PMEM_BASE @@ -1472,53 +1474,53 @@ #define HIVE_ADDR_sp_SP_PMEM_BASE 0x0 #define HIVE_SIZE_sp_SP_PMEM_BASE 4 -/* function ia_css_isys_sp_token_map_snd_acquire_req: 5F96 */ +/* function ia_css_isys_sp_token_map_snd_acquire_req: 616C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_input_stream_format #define HIVE_MEM_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_input_stream_format 0x40F8 +#define HIVE_ADDR_sp_isp_input_stream_format 0x40FC #define HIVE_SIZE_sp_isp_input_stream_format 20 #else #endif #endif #define HIVE_MEM_sp_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x40F8 +#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x40FC #define HIVE_SIZE_sp_sp_isp_input_stream_format 20 -/* function __mod: 68A7 */ +/* function __mod: 6AB5 */ -/* function ia_css_dmaproxy_sp_init_dmem_channel: 3247 */ +/* function ia_css_dmaproxy_sp_init_dmem_channel: 3410 */ -/* function ia_css_thread_sp_join: CFF */ +/* function ia_css_thread_sp_join: D0A */ -/* function ia_css_dmaproxy_sp_add_command: 6F4F */ +/* function ia_css_dmaproxy_sp_add_command: 711D */ -/* function ia_css_sp_metadata_thread_func: 57F0 */ +/* function ia_css_sp_metadata_thread_func: 59C6 */ -/* function __sp_event_proxy_func_critical: 6975 */ +/* function __sp_event_proxy_func_critical: 6B83 */ -/* function ia_css_sp_metadata_wait: 5903 */ +/* function ia_css_sp_metadata_wait: 5AD9 */ -/* function ia_css_circbuf_peek_from_start: F08 */ +/* function ia_css_circbuf_peek_from_start: F13 */ -/* function ia_css_event_sp_encode: 3552 */ +/* function ia_css_event_sp_encode: 3730 */ -/* function ia_css_thread_sp_run: D72 */ +/* function ia_css_thread_sp_run: D7D */ -/* function sp_isys_copy_func: 6F6 */ +/* function sp_isys_copy_func: 69B */ -/* function ia_css_isys_sp_backend_flush: 5A7F */ +/* function ia_css_isys_sp_backend_flush: 5C55 */ -/* function ia_css_isys_sp_backend_frame_exists: 599B */ +/* function ia_css_isys_sp_backend_frame_exists: 5B71 */ -/* function ia_css_sp_isp_param_init_isp_memories: 4789 */ +/* function ia_css_sp_isp_param_init_isp_memories: 49B8 */ -/* function register_isr: 8A9 */ +/* function register_isr: 84E */ /* function irq_raise: C8 */ -/* function ia_css_dmaproxy_sp_mmu_invalidate: 3124 */ +/* function ia_css_dmaproxy_sp_mmu_invalidate: 32B6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SRST_ADDRESS @@ -1532,27 +1534,27 @@ #define HIVE_ADDR_sp_HIVE_IF_SRST_ADDRESS 0x1B8 #define HIVE_SIZE_sp_HIVE_IF_SRST_ADDRESS 16 -/* function pipeline_sp_initialize_stage: 190B */ +/* function pipeline_sp_initialize_stage: 192F */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_isys_sp_frontend_states #define HIVE_MEM_ia_css_isys_sp_frontend_states scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_isys_sp_frontend_states 0x62C8 +#define HIVE_ADDR_ia_css_isys_sp_frontend_states 0x62F4 #define HIVE_SIZE_ia_css_isys_sp_frontend_states 12 #else #endif #endif #define HIVE_MEM_sp_ia_css_isys_sp_frontend_states scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_isys_sp_frontend_states 0x62C8 +#define HIVE_ADDR_sp_ia_css_isys_sp_frontend_states 0x62F4 #define HIVE_SIZE_sp_ia_css_isys_sp_frontend_states 12 -/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 6E1E */ +/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 6FFD */ -/* function ia_css_ispctrl_sp_done_ds: 3799 */ +/* function ia_css_ispctrl_sp_done_ds: 3985 */ -/* function ia_css_sp_isp_param_get_mem_inits: 4764 */ +/* function ia_css_sp_isp_param_get_mem_inits: 4993 */ -/* function ia_css_parambuf_sp_init_buffer_queues: 13D0 */ +/* function ia_css_parambuf_sp_init_buffer_queues: 13DB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_pfp_spref @@ -1566,7 +1568,7 @@ #define HIVE_ADDR_sp_vbuf_pfp_spref 0x2F0 #define HIVE_SIZE_sp_vbuf_pfp_spref 4 -/* function input_system_cfg: ABB */ +/* function input_system_cfg: AC6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_HMEM_BASE @@ -1583,134 +1585,134 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_frames #define HIVE_MEM_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x59DC +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x5A08 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_frames 280 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x59DC +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x5A08 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_frames 280 -/* function qos_scheduler_init_stage_budget: 65E8 */ +/* function qos_scheduler_init_stage_budget: 67EB */ -/* function ia_css_isys_sp_backend_release: 5AF4 */ +/* function ia_css_isys_sp_backend_release: 5CCA */ -/* function ia_css_isys_sp_backend_destroy: 5B1E */ +/* function ia_css_isys_sp_backend_destroy: 5CF4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_buffer_queue_handle #define HIVE_MEM_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_buffer_queue_handle 0x5AF4 +#define HIVE_ADDR_sp2host_buffer_queue_handle 0x5B20 #define HIVE_SIZE_sp2host_buffer_queue_handle 96 #else #endif #endif #define HIVE_MEM_sp_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x5AF4 +#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x5B20 #define HIVE_SIZE_sp_sp2host_buffer_queue_handle 96 -/* function ia_css_isys_sp_token_map_check_mipi_frame_size: 5F5A */ +/* function ia_css_isys_sp_token_map_check_mipi_frame_size: 6130 */ -/* function ia_css_ispctrl_sp_init_isp_vars: 4483 */ +/* function ia_css_ispctrl_sp_init_isp_vars: 4685 */ -/* function ia_css_isys_sp_frontend_has_empty_mipi_buffer_cb: 5B70 */ +/* function ia_css_isys_sp_frontend_has_empty_mipi_buffer_cb: 5D46 */ -/* function sp_warning: 8DC */ +/* function sp_warning: 881 */ -/* function ia_css_rmgr_sp_vbuf_enqueue: 6304 */ +/* function ia_css_rmgr_sp_vbuf_enqueue: 64DA */ -/* function ia_css_tagger_sp_tag_exp_id: 2142 */ +/* function ia_css_tagger_sp_tag_exp_id: 217C */ -/* function ia_css_dmaproxy_sp_write: 31FD */ +/* function ia_css_dmaproxy_sp_write: 33C6 */ -/* function ia_css_parambuf_sp_release_in_param: 1250 */ +/* function ia_css_parambuf_sp_release_in_param: 125B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_irq_sw_interrupt_token #define HIVE_MEM_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_irq_sw_interrupt_token 0x40F4 +#define HIVE_ADDR_irq_sw_interrupt_token 0x40F8 #define HIVE_SIZE_irq_sw_interrupt_token 4 #else #endif #endif #define HIVE_MEM_sp_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x40F4 +#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x40F8 #define HIVE_SIZE_sp_irq_sw_interrupt_token 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_addresses #define HIVE_MEM_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_addresses 0x5F44 +#define HIVE_ADDR_sp_isp_addresses 0x5F74 #define HIVE_SIZE_sp_isp_addresses 172 #else #endif #endif #define HIVE_MEM_sp_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_addresses 0x5F44 +#define HIVE_ADDR_sp_sp_isp_addresses 0x5F74 #define HIVE_SIZE_sp_sp_isp_addresses 172 -/* function ia_css_rmgr_sp_acq_gen: 6229 */ +/* function ia_css_rmgr_sp_acq_gen: 63FF */ -/* function receiver_reg_load: AD0 */ +/* function receiver_reg_load: ADB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isps #define HIVE_MEM_isps scalar_processor_2400_dmem -#define HIVE_ADDR_isps 0x6300 +#define HIVE_ADDR_isps 0x632C #define HIVE_SIZE_isps 28 #else #endif #endif #define HIVE_MEM_sp_isps scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isps 0x6300 +#define HIVE_ADDR_sp_isps 0x632C #define HIVE_SIZE_sp_isps 28 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_queues_initialized #define HIVE_MEM_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_queues_initialized 0x410C +#define HIVE_ADDR_host_sp_queues_initialized 0x4110 #define HIVE_SIZE_host_sp_queues_initialized 4 #else #endif #endif #define HIVE_MEM_sp_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_queues_initialized 0x410C +#define HIVE_ADDR_sp_host_sp_queues_initialized 0x4110 #define HIVE_SIZE_sp_host_sp_queues_initialized 4 -/* function ia_css_queue_uninit: 4BCC */ +/* function ia_css_queue_uninit: 4DD1 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_ispctrl_sp_isp_started #define HIVE_MEM_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x5BFC +#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x5C28 #define HIVE_SIZE_ia_css_ispctrl_sp_isp_started 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x5BFC +#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x5C28 #define HIVE_SIZE_sp_ia_css_ispctrl_sp_isp_started 4 -/* function ia_css_bufq_sp_release_dynamic_buf: 2DCE */ +/* function ia_css_bufq_sp_release_dynamic_buf: 2F5A */ -/* function ia_css_dmaproxy_sp_set_height_exception: 32F5 */ +/* function ia_css_dmaproxy_sp_set_height_exception: 34D3 */ -/* function ia_css_dmaproxy_sp_init_vmem_channel: 327A */ +/* function ia_css_dmaproxy_sp_init_vmem_channel: 3444 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_num_ready_threads #define HIVE_MEM_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_num_ready_threads 0x49E4 +#define HIVE_ADDR_num_ready_threads 0x4A10 #define HIVE_SIZE_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_num_ready_threads 0x49E4 +#define HIVE_ADDR_sp_num_ready_threads 0x4A10 #define HIVE_SIZE_sp_num_ready_threads 4 -/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 31CF */ +/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 3398 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_spref @@ -1727,64 +1729,64 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_metadata_thread #define HIVE_MEM_sp_metadata_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_metadata_thread 0x4998 +#define HIVE_ADDR_sp_metadata_thread 0x49C4 #define HIVE_SIZE_sp_metadata_thread 68 #else #endif #endif #define HIVE_MEM_sp_sp_metadata_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_metadata_thread 0x4998 +#define HIVE_ADDR_sp_sp_metadata_thread 0x49C4 #define HIVE_SIZE_sp_sp_metadata_thread 68 -/* function ia_css_queue_enqueue: 4B16 */ +/* function ia_css_queue_enqueue: 4D1B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_request #define HIVE_MEM_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_request 0x4A98 +#define HIVE_ADDR_ia_css_flash_sp_request 0x4AC4 #define HIVE_SIZE_ia_css_flash_sp_request 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x4A98 +#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x4AC4 #define HIVE_SIZE_sp_ia_css_flash_sp_request 4 -/* function ia_css_dmaproxy_sp_vmem_write: 31A0 */ +/* function ia_css_dmaproxy_sp_vmem_write: 3369 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tagger_frames #define HIVE_MEM_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_tagger_frames 0x49EC +#define HIVE_ADDR_tagger_frames 0x4A18 #define HIVE_SIZE_tagger_frames 168 #else #endif #endif #define HIVE_MEM_sp_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tagger_frames 0x49EC +#define HIVE_ADDR_sp_tagger_frames 0x4A18 #define HIVE_SIZE_sp_tagger_frames 168 -/* function ia_css_isys_sp_token_map_snd_capture_req: 5FB8 */ +/* function ia_css_isys_sp_token_map_snd_capture_req: 618E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_if #define HIVE_MEM_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_if 0x47C8 +#define HIVE_ADDR_sem_for_reading_if 0x47F4 #define HIVE_SIZE_sem_for_reading_if 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_if 0x47C8 +#define HIVE_ADDR_sp_sem_for_reading_if 0x47F4 #define HIVE_SIZE_sp_sem_for_reading_if 20 -/* function sp_generate_interrupts: 95B */ +/* function sp_generate_interrupts: 900 */ -/* function ia_css_pipeline_sp_start: 181E */ +/* function ia_css_pipeline_sp_start: 1842 */ -/* function ia_css_sp_rawcopy_init: 50F3 */ +/* function ia_css_sp_rawcopy_init: 52F8 */ -/* function tmr_clock_read: 6596 */ +/* function tmr_clock_read: 676C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_BAMEM_BASE @@ -1798,55 +1800,55 @@ #define HIVE_ADDR_sp_ISP_BAMEM_BASE 0x2F8 #define HIVE_SIZE_sp_ISP_BAMEM_BASE 4 -/* function ia_css_isys_sp_frontend_rcv_capture_ack: 5C1F */ +/* function ia_css_isys_sp_frontend_rcv_capture_ack: 5DF5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B54 +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B80 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B54 +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B80 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 -/* function css_get_frame_processing_time_start: 1FAF */ +/* function css_get_frame_processing_time_start: 1FE9 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame #define HIVE_MEM_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame 0x47DC +#define HIVE_ADDR_sp_all_cbs_frame 0x4808 #define HIVE_SIZE_sp_all_cbs_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame 0x47DC +#define HIVE_ADDR_sp_sp_all_cbs_frame 0x4808 #define HIVE_SIZE_sp_sp_all_cbs_frame 16 -/* function thread_sp_queue_print: D8F */ +/* function thread_sp_queue_print: D9A */ -/* function sp_notify_eof: 907 */ +/* function sp_notify_eof: 8AC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_str2mem #define HIVE_MEM_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_str2mem 0x47EC +#define HIVE_ADDR_sem_for_str2mem 0x4818 #define HIVE_SIZE_sem_for_str2mem 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_str2mem 0x47EC +#define HIVE_ADDR_sp_sem_for_str2mem 0x4818 #define HIVE_SIZE_sp_sem_for_str2mem 20 -/* function ia_css_tagger_buf_sp_is_marked_from_start: 2B41 */ +/* function ia_css_tagger_buf_sp_is_marked_from_start: 2CCD */ -/* function ia_css_bufq_sp_acquire_dynamic_buf: 2F86 */ +/* function ia_css_bufq_sp_acquire_dynamic_buf: 3112 */ -/* function ia_css_circbuf_destroy: 101D */ +/* function ia_css_circbuf_destroy: 1028 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_PMEM_BASE @@ -1860,43 +1862,43 @@ #define HIVE_ADDR_sp_ISP_PMEM_BASE 0xC #define HIVE_SIZE_sp_ISP_PMEM_BASE 4 -/* function ia_css_sp_isp_param_mem_load: 46F7 */ +/* function ia_css_sp_isp_param_mem_load: 4926 */ -/* function ia_css_tagger_buf_sp_pop_from_start: 292D */ +/* function ia_css_tagger_buf_sp_pop_from_start: 2AB9 */ -/* function __div: 685F */ +/* function __div: 6A6D */ -/* function ia_css_isys_sp_frontend_create: 5DF0 */ +/* function ia_css_isys_sp_frontend_create: 5FC6 */ -/* function ia_css_rmgr_sp_refcount_release_vbuf: 6323 */ +/* function ia_css_rmgr_sp_refcount_release_vbuf: 64F9 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_use #define HIVE_MEM_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_use 0x4A9C +#define HIVE_ADDR_ia_css_flash_sp_in_use 0x4AC8 #define HIVE_SIZE_ia_css_flash_sp_in_use 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x4A9C +#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x4AC8 #define HIVE_SIZE_sp_ia_css_flash_sp_in_use 4 -/* function ia_css_thread_sem_sp_wait: 6B42 */ +/* function ia_css_thread_sem_sp_wait: 6D50 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sleep_mode #define HIVE_MEM_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sleep_mode 0x4110 +#define HIVE_ADDR_sp_sleep_mode 0x4114 #define HIVE_SIZE_sp_sleep_mode 4 #else #endif #endif #define HIVE_MEM_sp_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sleep_mode 0x4110 +#define HIVE_ADDR_sp_sp_sleep_mode 0x4114 #define HIVE_SIZE_sp_sp_sleep_mode 4 -/* function ia_css_tagger_buf_sp_push: 2A3C */ +/* function ia_css_tagger_buf_sp_push: 2BC8 */ /* function mmu_invalidate_cache: D3 */ @@ -1912,22 +1914,20 @@ #define HIVE_ADDR_sp_sp_max_cb_elems 0x148 #define HIVE_SIZE_sp_sp_max_cb_elems 8 -/* function ia_css_queue_remote_init: 4BEE */ +/* function ia_css_queue_remote_init: 4DF3 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stop_req #define HIVE_MEM_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stop_req 0x4680 +#define HIVE_ADDR_isp_stop_req 0x46AC #define HIVE_SIZE_isp_stop_req 4 #else #endif #endif #define HIVE_MEM_sp_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stop_req 0x4680 +#define HIVE_ADDR_sp_isp_stop_req 0x46AC #define HIVE_SIZE_sp_isp_stop_req 4 -#define HIVE_ICACHE_sp_critical_SEGMENT_START 0 -#define HIVE_ICACHE_sp_critical_NUM_SEGMENTS 1 #endif /* _sp_map_h_ */ extern void sh_css_dump_sp_dmem(void); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/csi_rx_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/csi_rx_global.h index 146a578..da67ce2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/csi_rx_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/csi_rx_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c index b7d90bb..18eec12 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -239,6 +239,30 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem) +{ + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() enter:\n"); + + { + unsigned offset = 0; + unsigned size = 0; + if (binary->info->mem_offsets.offsets.config) { + size = binary->info->mem_offsets.offsets.config->dmem.sc.size; + offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset; + } + if (size) { + ia_css_sc_config((struct sh_css_isp_sc_isp_config *) + &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset], + config_dmem, size); } + } + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() leave:\n"); +} + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h index ec3fb636..b41847b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,6 +22,7 @@ #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h" #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h" #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h" +#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h" #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h" #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h" #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h" @@ -44,6 +45,7 @@ enum ia_css_configuration_ids { IA_CSS_OUTPUT0_CONFIG_ID, IA_CSS_OUTPUT1_CONFIG_ID, IA_CSS_OUTPUT_CONFIG_ID, + IA_CSS_SC_CONFIG_ID, IA_CSS_RAW_CONFIG_ID, IA_CSS_TNR_CONFIG_ID, IA_CSS_REF_CONFIG_ID, @@ -64,6 +66,7 @@ struct ia_css_config_memory_offsets { struct ia_css_isp_parameter output0; struct ia_css_isp_parameter output1; struct ia_css_isp_parameter output; + struct ia_css_isp_parameter sc; struct ia_css_isp_parameter raw; struct ia_css_isp_parameter tnr; struct ia_css_isp_parameter ref; @@ -141,6 +144,13 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem); + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c index b00a812..e29bdfc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -1564,6 +1564,25 @@ size); } } + { + unsigned size = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size; + + unsigned offset = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.offset; + + if (size) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() enter:\n"); + + ia_css_xnr3_vmem_encode((struct sh_css_isp_xnr3_vmem_params *) + &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_VMEM].address[offset], + ¶ms->xnr3_config, +size); + params->isp_params_changed = true; + params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_VMEM] = true; + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() leave:\n"); + } + + } } /* Code generated by genparam/gencode.c:gen_param_process_table() */ @@ -1652,8 +1671,6 @@ ia_css_set_dp_config(struct ia_css_isp_parameters *params, ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->dp_config = *config; params->config_changed[IA_CSS_DP_ID] = true; - params->config_changed[IA_CSS_DP_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_dp_config() leave: " "return_void\n"); } @@ -1690,8 +1707,6 @@ ia_css_set_wb_config(struct ia_css_isp_parameters *params, ia_css_wb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->wb_config = *config; params->config_changed[IA_CSS_WB_ID] = true; - params->config_changed[IA_CSS_WB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_wb_config() leave: " "return_void\n"); } @@ -1728,8 +1743,6 @@ ia_css_set_tnr_config(struct ia_css_isp_parameters *params, ia_css_tnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->tnr_config = *config; params->config_changed[IA_CSS_TNR_ID] = true; - params->config_changed[IA_CSS_TNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_tnr_config() leave: " "return_void\n"); } @@ -1766,8 +1779,6 @@ ia_css_set_ob_config(struct ia_css_isp_parameters *params, ia_css_ob_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ob_config = *config; params->config_changed[IA_CSS_OB_ID] = true; - params->config_changed[IA_CSS_OB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ob_config() leave: " "return_void\n"); } @@ -1804,8 +1815,6 @@ ia_css_set_de_config(struct ia_css_isp_parameters *params, ia_css_de_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->de_config = *config; params->config_changed[IA_CSS_DE_ID] = true; - params->config_changed[IA_CSS_DE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_de_config() leave: " "return_void\n"); } @@ -1842,8 +1851,6 @@ ia_css_set_anr_config(struct ia_css_isp_parameters *params, ia_css_anr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_config = *config; params->config_changed[IA_CSS_ANR_ID] = true; - params->config_changed[IA_CSS_ANR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr_config() leave: " "return_void\n"); } @@ -1880,8 +1887,6 @@ ia_css_set_anr2_config(struct ia_css_isp_parameters *params, ia_css_anr2_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_thres = *config; params->config_changed[IA_CSS_ANR2_ID] = true; - params->config_changed[IA_CSS_ANR2_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr2_config() leave: " "return_void\n"); } @@ -1918,8 +1923,6 @@ ia_css_set_ce_config(struct ia_css_isp_parameters *params, ia_css_ce_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ce_config = *config; params->config_changed[IA_CSS_CE_ID] = true; - params->config_changed[IA_CSS_CE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ce_config() leave: " "return_void\n"); } @@ -1956,8 +1959,6 @@ ia_css_set_ecd_config(struct ia_css_isp_parameters *params, ia_css_ecd_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ecd_config = *config; params->config_changed[IA_CSS_ECD_ID] = true; - params->config_changed[IA_CSS_ECD_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ecd_config() leave: " "return_void\n"); } @@ -1994,8 +1995,6 @@ ia_css_set_ynr_config(struct ia_css_isp_parameters *params, ia_css_ynr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ynr_config = *config; params->config_changed[IA_CSS_YNR_ID] = true; - params->config_changed[IA_CSS_YNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ynr_config() leave: " "return_void\n"); } @@ -2032,8 +2031,6 @@ ia_css_set_fc_config(struct ia_css_isp_parameters *params, ia_css_fc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->fc_config = *config; params->config_changed[IA_CSS_FC_ID] = true; - params->config_changed[IA_CSS_FC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_fc_config() leave: " "return_void\n"); } @@ -2070,8 +2067,6 @@ ia_css_set_cnr_config(struct ia_css_isp_parameters *params, ia_css_cnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cnr_config = *config; params->config_changed[IA_CSS_CNR_ID] = true; - params->config_changed[IA_CSS_CNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_cnr_config() leave: " "return_void\n"); } @@ -2108,8 +2103,6 @@ ia_css_set_macc_config(struct ia_css_isp_parameters *params, ia_css_macc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->macc_config = *config; params->config_changed[IA_CSS_MACC_ID] = true; - params->config_changed[IA_CSS_MACC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_macc_config() leave: " "return_void\n"); } @@ -2146,8 +2139,6 @@ ia_css_set_ctc_config(struct ia_css_isp_parameters *params, ia_css_ctc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ctc_config = *config; params->config_changed[IA_CSS_CTC_ID] = true; - params->config_changed[IA_CSS_CTC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ctc_config() leave: " "return_void\n"); } @@ -2184,8 +2175,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->aa_config = *config; params->config_changed[IA_CSS_AA_ID] = true; - params->config_changed[IA_CSS_AA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_aa_config() leave: " "return_void\n"); } @@ -2222,8 +2211,6 @@ ia_css_set_yuv2rgb_config(struct ia_css_isp_parameters *params, ia_css_yuv2rgb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->yuv2rgb_cc_config = *config; params->config_changed[IA_CSS_YUV2RGB_ID] = true; - params->config_changed[IA_CSS_YUV2RGB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_yuv2rgb_config() leave: " "return_void\n"); } @@ -2260,8 +2247,6 @@ ia_css_set_rgb2yuv_config(struct ia_css_isp_parameters *params, ia_css_rgb2yuv_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->rgb2yuv_cc_config = *config; params->config_changed[IA_CSS_RGB2YUV_ID] = true; - params->config_changed[IA_CSS_RGB2YUV_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_rgb2yuv_config() leave: " "return_void\n"); } @@ -2298,8 +2283,6 @@ ia_css_set_csc_config(struct ia_css_isp_parameters *params, ia_css_csc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cc_config = *config; params->config_changed[IA_CSS_CSC_ID] = true; - params->config_changed[IA_CSS_CSC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_csc_config() leave: " "return_void\n"); } @@ -2337,8 +2320,6 @@ ia_css_set_nr_config(struct ia_css_isp_parameters *params, params->nr_config = *config; params->config_changed[IA_CSS_BNR_ID] = true; params->config_changed[IA_CSS_NR_ID] = true; - params->config_changed[IA_CSS_NR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_nr_config() leave: " "return_void\n"); } @@ -2375,8 +2356,6 @@ ia_css_set_gc_config(struct ia_css_isp_parameters *params, ia_css_gc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->gc_config = *config; params->config_changed[IA_CSS_GC_ID] = true; - params->config_changed[IA_CSS_GC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_gc_config() leave: " "return_void\n"); } @@ -2416,8 +2395,6 @@ ia_css_set_sdis_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horicoef_config() leave: " "return_void\n"); } @@ -2457,8 +2434,6 @@ ia_css_set_sdis_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertcoef_config() leave: " "return_void\n"); } @@ -2498,8 +2473,6 @@ ia_css_set_sdis_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horiproj_config() leave: " "return_void\n"); } @@ -2539,8 +2512,6 @@ ia_css_set_sdis_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertproj_config() leave: " "return_void\n"); } @@ -2580,8 +2551,6 @@ ia_css_set_sdis2_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horicoef_config() leave: " "return_void\n"); } @@ -2621,8 +2590,6 @@ ia_css_set_sdis2_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertcoef_config() leave: " "return_void\n"); } @@ -2662,8 +2629,6 @@ ia_css_set_sdis2_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horiproj_config() leave: " "return_void\n"); } @@ -2703,8 +2668,6 @@ ia_css_set_sdis2_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertproj_config() leave: " "return_void\n"); } @@ -2741,8 +2704,6 @@ ia_css_set_r_gamma_config(struct ia_css_isp_parameters *params, ia_css_r_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->r_gamma_table = *config; params->config_changed[IA_CSS_R_GAMMA_ID] = true; - params->config_changed[IA_CSS_R_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_r_gamma_config() leave: " "return_void\n"); } @@ -2779,8 +2740,6 @@ ia_css_set_g_gamma_config(struct ia_css_isp_parameters *params, ia_css_g_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->g_gamma_table = *config; params->config_changed[IA_CSS_G_GAMMA_ID] = true; - params->config_changed[IA_CSS_G_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_g_gamma_config() leave: " "return_void\n"); } @@ -2817,8 +2776,6 @@ ia_css_set_b_gamma_config(struct ia_css_isp_parameters *params, ia_css_b_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->b_gamma_table = *config; params->config_changed[IA_CSS_B_GAMMA_ID] = true; - params->config_changed[IA_CSS_B_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_b_gamma_config() leave: " "return_void\n"); } @@ -2855,8 +2812,6 @@ ia_css_set_xnr_table_config(struct ia_css_isp_parameters *params, ia_css_xnr_table_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_table = *config; params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_table_config() leave: " "return_void\n"); } @@ -2893,8 +2848,6 @@ ia_css_set_formats_config(struct ia_css_isp_parameters *params, ia_css_formats_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->formats_config = *config; params->config_changed[IA_CSS_FORMATS_ID] = true; - params->config_changed[IA_CSS_FORMATS_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_formats_config() leave: " "return_void\n"); } @@ -2931,8 +2884,6 @@ ia_css_set_xnr_config(struct ia_css_isp_parameters *params, ia_css_xnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_config = *config; params->config_changed[IA_CSS_XNR_ID] = true; - params->config_changed[IA_CSS_XNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_config() leave: " "return_void\n"); } @@ -2969,8 +2920,6 @@ ia_css_set_xnr3_config(struct ia_css_isp_parameters *params, ia_css_xnr3_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr3_config = *config; params->config_changed[IA_CSS_XNR3_ID] = true; - params->config_changed[IA_CSS_XNR3_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr3_config() leave: " "return_void\n"); } @@ -3008,8 +2957,6 @@ ia_css_set_s3a_config(struct ia_css_isp_parameters *params, params->s3a_config = *config; params->config_changed[IA_CSS_BH_ID] = true; params->config_changed[IA_CSS_S3A_ID] = true; - params->config_changed[IA_CSS_S3A_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_s3a_config() leave: " "return_void\n"); } @@ -3046,8 +2993,6 @@ ia_css_set_output_config(struct ia_css_isp_parameters *params, ia_css_output_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->output_config = *config; params->config_changed[IA_CSS_OUTPUT_ID] = true; - params->config_changed[IA_CSS_OUTPUT_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_output_config() leave: " "return_void\n"); } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h index 9680f4e..bf993bf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -120,6 +120,7 @@ struct ia_css_memory_offsets { struct ia_css_isp_parameter sdis_vertcoef; struct ia_css_isp_parameter sdis2_horicoef; struct ia_css_isp_parameter sdis2_vertcoef; + struct ia_css_isp_parameter xnr3; } vmem; struct { struct ia_css_isp_parameter bh; @@ -379,12 +380,14 @@ void ia_css_get_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + /* Code generated by genparam/gencode.c:gen_global_access_function() */ void ia_css_set_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + #endif /* IA_CSS_INCLUDE_PARAMETER */ #endif /* _IA_CSS_ISP_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c index a445d4f..2405fc99 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h index d658a00..b358e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx.c index 17b7c78..1983824 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_local.h index a2e9d54..35c9775 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_private.h index 5819bcf..58ee6d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/csi_rx_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl.c index 14973d1..d9e8ac7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_local.h index ea40284..b59eef5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_private.h index 470c92d..c4b24ad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/ibuf_ctrl_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_local.h index f199423..a819bdb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_private.h index 97505e4..ffb6fa0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/input_system_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma.c index 7776722..a7c8482 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_local.h index 5c694a2..e139c64 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_private.h index 2cd1aee..c4466d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_dma_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq.c index 14d1d3b..8413d63 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_local.h index 0bffb56..ac335d9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_private.h index c17ce13..fa82007 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_irq_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio.c index 6757013..b57ab7f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_local.h index 8015239..282cf17 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_private.h index 1603a09..edefa8b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/isys_stream2mmio_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_local.h index 24f4da9..39d3757 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_private.h index 3f34b50..69054d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/pixelgen_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/system_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/system_local.h index c166709..93c82d5a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/system_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/host/system_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h index 1b3391c..efefde9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/bits.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/bits.h index e71e33d..5fdd8b5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/bits.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/bits.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/cell_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/cell_params.h index b5756bf..ca1ec92 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/cell_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/cell_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h index f3054fe..cd0530b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h index 6f5b7d3..1a0f86e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/defs.h index 47505f4..bc4491e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/dma_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/dma_v2_defs.h index d184a8b..78ce973 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/dma_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/dma_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gdc_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gdc_v2_defs.h index 77722d2..b97f463 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gdc_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gdc_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_regs_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_regs_defs.h index 34e734f..320e48b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_regs_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_regs_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_timer_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_timer_defs.h index 3082e2f5..673b168 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_timer_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gp_timer_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gpio_block_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gpio_block_defs.h index a807d4c..349f2b7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gpio_block_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/gpio_block_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h index 2f7cb2d..95a0a28 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_defs.h index 5a2ce91..c97ea0b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h index 8d4c9d6..aaa7314 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h index b4211a0..389d924 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_types.h index 58b0e6e..7bfea9f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/hive_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h index f82bb79..235235d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/if_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/if_defs.h index 7d39e45..d91f7de 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/if_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/if_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h index 16bfe1d..2a16e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_selector_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_selector_defs.h index 87fbf82..4d9f9c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_selector_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_selector_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_switch_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_switch_2400_defs.h index 20a13c4..8bcc7a1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_switch_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_switch_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h index a7f0ca8..0e6423a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_defs.h index ae62163..e76c25a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/input_system_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/irq_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/irq_controller_defs.h index ec6dd44..c7c4401 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/irq_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/irq_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2400_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2400_support.h index e00bc84..9e6dafe 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2400_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2400_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h index 033e23b..5162859 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_acquisition_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_acquisition_defs.h index 5936207..fb13c64 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_acquisition_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_acquisition_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_capture_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_capture_defs.h index aa413df..5bd9496 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_capture_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/isp_capture_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h index 76705d7..f48aacd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_defs.h index db5a1d2..29e1b591 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mipi_backend_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mmu_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mmu_defs.h index c038f39..f8c2fe9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mmu_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/mmu_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/rx_csi_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/rx_csi_defs.h index 0aad86e..365de0c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/rx_csi_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/rx_csi_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h index 9b6c2893..c889f67 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/sp_hrt.h deleted file mode 100644 index ca0b7b7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/sp_hrt.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 _sp_hrt_h_ -#define _sp_hrt_h_ - -#define hrt_sp_dmem(cell) HRT_PROC_TYPE_PROP(cell, _dmem) - -#define hrt_sp_dmem_master_port_address(cell) hrt_mem_master_port_address(cell, hrt_sp_dmem(cell)) - -#endif /* _sp_hrt_h_ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/str2mem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/str2mem_defs.h index 1cb6244..32667a3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/str2mem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/str2mem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/stream2mmio_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/stream2mmio_defs.h index 46b52fe..db3e7f6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/stream2mmio_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/stream2mmio_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h index 60143b8..fb81978 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/timed_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/timed_controller_defs.h index d2b8972..0549495 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/timed_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/timed_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/var.h deleted file mode 100644 index 30f900d..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/var.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 _HRT_VAR_H -#define _HRT_VAR_H - -#include "version.h" -#include "system_api.h" -#include "hive_types.h" - -#define hrt_int_type_of_char char -#define hrt_int_type_of_uchar unsigned char -#define hrt_int_type_of_short short -#define hrt_int_type_of_ushort unsigned short -#define hrt_int_type_of_int int -#define hrt_int_type_of_uint unsigned int -#define hrt_int_type_of_long long -#define hrt_int_type_of_ulong unsigned long -#define hrt_int_type_of_ptr unsigned int - -#define hrt_host_type_of_char char -#define hrt_host_type_of_uchar unsigned char -#define hrt_host_type_of_short short -#define hrt_host_type_of_ushort unsigned short -#define hrt_host_type_of_int int -#define hrt_host_type_of_uint unsigned int -#define hrt_host_type_of_long long -#define hrt_host_type_of_ulong unsigned long -#define hrt_host_type_of_ptr void* - -#define HRT_TYPE_BYTES(cell, type) (HRT_TYPE_BITS(cell, type)/8) -#define HRT_HOST_TYPE(cell_type) HRTCAT(hrt_host_type_of_, cell_type) -#define HRT_INT_TYPE(type) HRTCAT(hrt_int_type_of_, type) - -#ifdef C_RUN - -#ifdef C_RUN_DYNAMIC_LINK_PROGRAMS -extern void *csim_processor_get_crun_symbol(hive_proc_id p, const char *sym); -#define _hrt_cell_get_crun_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#else -#define _hrt_cell_get_crun_symbol(cell,sym) (&sym) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) (sym) -#endif // C_RUN_DYNAMIC_LINK_PROGRAMS - -#define hrt_scalar_store(cell, type, var, data) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var)) = (data)) -#define hrt_scalar_load(cell, type, var) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - ((((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) = (data)) -#define hrt_indexed_load(cell, type, array, index) \ - (((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) - -#else /* C_RUN */ - -#define hrt_scalar_store(cell, type, var, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_scalar_load(cell, type, var) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_indexed_load(cell, type, array, index) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)))) - -#endif /* C_RUN */ - -#endif /* _HRT_VAR_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/version.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/version.h index bbc4948..d1cf960 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/version.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/hrt/version.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/ibuf_ctrl_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/ibuf_ctrl_global.h index edb2325..8d72609 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/ibuf_ctrl_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/ibuf_ctrl_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/input_system_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/input_system_global.h index ab404ff..704a5e3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/input_system_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/input_system_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -60,6 +60,11 @@ typedef enum { N_INPUT_SYSTEM_SOURCE_TYPE } input_system_source_type_t; +typedef enum { + INPUT_SYSTEM_POLL_ON_WAIT_FOR_FRAME, + INPUT_SYSTEM_POLL_ON_CAPTURE_REQUEST, +} input_system_polling_mode_t; + typedef struct input_system_channel_s input_system_channel_t; struct input_system_channel_s { stream2mmio_ID_t stream2mmio_id; @@ -121,6 +126,7 @@ struct input_system_cfg_s { input_system_input_port_ID_t input_port_id; input_system_source_type_t mode; + input_system_polling_mode_t polling_mode; bool online; bool raw_packed; @@ -173,6 +179,8 @@ struct virtual_input_system_stream_s { uint8_t online; int8_t linked_isys_stream_id; uint8_t valid; + input_system_polling_mode_t polling_mode; + int32_t subscr_index; }; typedef struct virtual_input_system_stream_cfg_s virtual_input_system_stream_cfg_t; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_dma_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_dma_global.h index 9ad9f33..08c2e21 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_dma_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_dma_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_irq_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_irq_global.h index 41d051d..90a4cb4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_irq_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_irq_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_stream2mmio_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_stream2mmio_global.h index 649f44f..9a34b8a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_stream2mmio_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/isys_stream2mmio_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/pixelgen_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/pixelgen_global.h index 94377d8..dc226ae 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/pixelgen_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/pixelgen_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/spmem_dump.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/spmem_dump.c index f294038..ee2ee39 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/spmem_dump.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/spmem_dump.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,53 +22,55 @@ #define _hrt_cell_load_program_sp(proc) _hrt_cell_load_program_embedded(proc, sp) -/* function longjmp: 680D */ +/* function longjmp: 6A5B */ -/* function tmpmem_init_dmem: 6558 */ +/* function tmpmem_init_dmem: 676E */ -/* function ia_css_dmaproxy_sp_set_addr_B: 3C50 */ +/* function ia_css_dmaproxy_sp_set_addr_B: 3DAF */ + +/* function ia_css_pipe_data_init_tagger_resources: AD8 */ /* function debug_buffer_set_ddr_addr: DD */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_mipi #define HIVE_MEM_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_mipi 0x7398 +#define HIVE_ADDR_vbuf_mipi 0x7414 #define HIVE_SIZE_vbuf_mipi 12 #else #endif #endif #define HIVE_MEM_sp_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_mipi 0x7398 +#define HIVE_ADDR_sp_vbuf_mipi 0x7414 #define HIVE_SIZE_sp_vbuf_mipi 12 -/* function ia_css_event_sp_decode: 3E41 */ +/* function ia_css_event_sp_decode: 3FA0 */ -/* function ia_css_queue_get_size: 51BF */ +/* function ia_css_queue_get_size: 536F */ -/* function ia_css_queue_load: 5800 */ +/* function ia_css_queue_load: 5986 */ -/* function setjmp: 6816 */ +/* function setjmp: 6A64 */ -/* function ia_css_pipeline_sp_sfi_get_current_frame: 27BF */ +/* function ia_css_pipeline_sp_sfi_get_current_frame: 277A */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_isys_event_queue #define HIVE_MEM_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x5760 +#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x57DC #define HIVE_SIZE_sem_for_sp2host_isys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x5760 +#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x57DC #define HIVE_SIZE_sp_sem_for_sp2host_isys_event_queue 20 -/* function ia_css_dmaproxy_sp_wait_for_ack: 6DA9 */ +/* function ia_css_dmaproxy_sp_wait_for_ack: 7047 */ -/* function ia_css_sp_rawcopy_func: 596B */ +/* function ia_css_sp_rawcopy_func: 5AF1 */ -/* function ia_css_tagger_buf_sp_pop_marked: 3339 */ +/* function ia_css_tagger_buf_sp_pop_marked: 3446 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_N_CSI_RX_BE_SID_WIDTH @@ -85,13 +87,13 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stage #define HIVE_MEM_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stage 0x6C98 +#define HIVE_ADDR_isp_stage 0x6D18 #define HIVE_SIZE_isp_stage 832 #else #endif #endif #define HIVE_MEM_sp_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stage 0x6C98 +#define HIVE_ADDR_sp_isp_stage 0x6D18 #define HIVE_SIZE_sp_isp_stage 832 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -106,34 +108,34 @@ #define HIVE_ADDR_sp_vbuf_raw 0x37C #define HIVE_SIZE_sp_vbuf_raw 4 -/* function ia_css_sp_bin_copy_func: 594C */ +/* function ia_css_sp_bin_copy_func: 5AD2 */ -/* function ia_css_queue_item_store: 554E */ +/* function ia_css_queue_item_store: 56D4 */ -/* function input_system_reset: 1286 */ +/* function input_system_reset: 1212 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x5B38 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x5BB4 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x5B38 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x5BB4 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x5B4C +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x5BC8 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_buffer_bufs 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x5B4C +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x5BC8 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 160 /* function sp_start_isp: 39C */ @@ -141,108 +143,96 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_binary_group #define HIVE_MEM_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_binary_group 0x7088 +#define HIVE_ADDR_sp_binary_group 0x7108 #define HIVE_SIZE_sp_binary_group 32 #else #endif #endif #define HIVE_MEM_sp_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_binary_group 0x7088 +#define HIVE_ADDR_sp_sp_binary_group 0x7108 #define HIVE_SIZE_sp_sp_binary_group 32 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sw_state #define HIVE_MEM_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sw_state 0x7344 +#define HIVE_ADDR_sp_sw_state 0x73C0 #define HIVE_SIZE_sp_sw_state 4 #else #endif #endif #define HIVE_MEM_sp_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sw_state 0x7344 +#define HIVE_ADDR_sp_sp_sw_state 0x73C0 #define HIVE_SIZE_sp_sp_sw_state 4 -/* function ia_css_thread_sp_main: 13F7 */ +/* function ia_css_thread_sp_main: 1383 */ -/* function ia_css_ispctrl_sp_init_internal_buffers: 4047 */ +/* function ia_css_ispctrl_sp_init_internal_buffers: 41B4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_psys_event_queue_handle #define HIVE_MEM_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x5BEC +#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x5C68 #define HIVE_SIZE_sp2host_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x5BEC +#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x5C68 #define HIVE_SIZE_sp_sp2host_psys_event_queue_handle 12 -/* function pixelgen_unit_test: E68 */ +/* function pixelgen_unit_test: E73 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_psys_event_queue #define HIVE_MEM_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x5774 +#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x57F0 #define HIVE_SIZE_sem_for_sp2host_psys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x5774 +#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x57F0 #define HIVE_SIZE_sp_sem_for_sp2host_psys_event_queue 20 -/* function ia_css_tagger_sp_propagate_frame: 2D52 */ - -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sp_stop_copy_preview -#define HIVE_MEM_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_stop_copy_preview 0x7328 -#define HIVE_SIZE_sp_stop_copy_preview 4 -#else -#endif -#endif -#define HIVE_MEM_sp_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_stop_copy_preview 0x7328 -#define HIVE_SIZE_sp_sp_stop_copy_preview 4 +/* function ia_css_tagger_sp_propagate_frame: 2D0D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_handles #define HIVE_MEM_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_handles 0x73A4 +#define HIVE_ADDR_vbuf_handles 0x7420 #define HIVE_SIZE_vbuf_handles 960 #else #endif #endif #define HIVE_MEM_sp_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_handles 0x73A4 +#define HIVE_ADDR_sp_vbuf_handles 0x7420 #define HIVE_SIZE_sp_vbuf_handles 960 -/* function ia_css_queue_store: 56B4 */ +/* function ia_css_queue_store: 583A */ -/* function ia_css_sp_flash_register: 356E */ +/* function ia_css_sp_flash_register: 367B */ -/* function ia_css_sp_rawcopy_dummy_function: 5CF7 */ +/* function ia_css_sp_rawcopy_dummy_function: 5E50 */ -/* function ia_css_pipeline_sp_init: 201C */ +/* function ia_css_pipeline_sp_init: 1FC1 */ -/* function ia_css_tagger_sp_configure: 2C42 */ +/* function ia_css_tagger_sp_configure: 2BFD */ -/* function ia_css_ispctrl_sp_end_binary: 3E8A */ +/* function ia_css_ispctrl_sp_end_binary: 3FE9 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x5BF8 +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x5C74 #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x5BF8 +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x5C74 #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 -/* function pixelgen_tpg_run: F1E */ +/* function pixelgen_tpg_run: F29 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_is_pending_mask @@ -259,70 +249,70 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_frame #define HIVE_MEM_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_frame 0x5788 +#define HIVE_ADDR_sp_all_cb_elems_frame 0x5804 #define HIVE_SIZE_sp_all_cb_elems_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x5788 +#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x5804 #define HIVE_SIZE_sp_sp_all_cb_elems_frame 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_isys_event_queue_handle #define HIVE_MEM_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x5C0C +#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x5C88 #define HIVE_SIZE_sp2host_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x5C0C +#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x5C88 #define HIVE_SIZE_sp_sp2host_isys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_com #define HIVE_MEM_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_com 0x3E48 +#define HIVE_ADDR_host_sp_com 0x3E4C #define HIVE_SIZE_host_sp_com 220 #else #endif #endif #define HIVE_MEM_sp_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_com 0x3E48 +#define HIVE_ADDR_sp_host_sp_com 0x3E4C #define HIVE_SIZE_sp_host_sp_com 220 -/* function ia_css_queue_get_free_space: 5313 */ +/* function ia_css_queue_get_free_space: 5499 */ -/* function exec_image_pipe: 5E6 */ +/* function exec_image_pipe: 58B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_init_dmem_data #define HIVE_MEM_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_init_dmem_data 0x7348 +#define HIVE_ADDR_sp_init_dmem_data 0x73C4 #define HIVE_SIZE_sp_init_dmem_data 24 #else #endif #endif #define HIVE_MEM_sp_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_init_dmem_data 0x7348 +#define HIVE_ADDR_sp_sp_init_dmem_data 0x73C4 #define HIVE_SIZE_sp_sp_init_dmem_data 24 -/* function ia_css_sp_metadata_start: 5DD1 */ +/* function ia_css_sp_metadata_start: 5F2A */ -/* function ia_css_bufq_sp_init_buffer_queues: 35BF */ +/* function ia_css_bufq_sp_init_buffer_queues: 36CC */ -/* function ia_css_pipeline_sp_stop: 1FFF */ +/* function ia_css_pipeline_sp_stop: 1FA4 */ -/* function ia_css_tagger_sp_connect_pipes: 312C */ +/* function ia_css_tagger_sp_connect_pipes: 30E7 */ -/* function sp_isys_copy_wait: 644 */ +/* function sp_isys_copy_wait: 5E9 */ /* function is_isp_debug_buffer_full: 337 */ -/* function ia_css_dmaproxy_sp_configure_channel_from_info: 3BD3 */ +/* function ia_css_dmaproxy_sp_configure_channel_from_info: 3D1F */ -/* function encode_and_post_timer_event: AA8 */ +/* function encode_and_post_timer_event: A4D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_input_system_bz2788_active @@ -351,46 +341,46 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_per_frame_data #define HIVE_MEM_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_per_frame_data 0x3F24 +#define HIVE_ADDR_sp_per_frame_data 0x3F28 #define HIVE_SIZE_sp_per_frame_data 4 #else #endif #endif #define HIVE_MEM_sp_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_per_frame_data 0x3F24 +#define HIVE_ADDR_sp_sp_per_frame_data 0x3F28 #define HIVE_SIZE_sp_sp_per_frame_data 4 -/* function ia_css_rmgr_sp_vbuf_dequeue: 62AC */ +/* function ia_css_rmgr_sp_vbuf_dequeue: 64C2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_psys_event_queue_handle #define HIVE_MEM_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x5C18 +#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x5C94 #define HIVE_SIZE_host2sp_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x5C18 +#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x5C94 #define HIVE_SIZE_sp_host2sp_psys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_xmem_bin_addr #define HIVE_MEM_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_xmem_bin_addr 0x3F28 +#define HIVE_ADDR_xmem_bin_addr 0x3F2C #define HIVE_SIZE_xmem_bin_addr 4 #else #endif #endif #define HIVE_MEM_sp_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_sp_xmem_bin_addr 0x3F28 +#define HIVE_ADDR_sp_xmem_bin_addr 0x3F2C #define HIVE_SIZE_sp_xmem_bin_addr 4 -/* function tmr_clock_init: 16F9 */ +/* function tmr_clock_init: 1685 */ -/* function ia_css_pipeline_sp_run: 1ABF */ +/* function ia_css_pipeline_sp_run: 1A4B */ -/* function memcpy: 68B6 */ +/* function memcpy: 6B04 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_N_ISYS2401_DMA_CHANNEL_PROCS @@ -428,26 +418,26 @@ #define HIVE_ADDR_sp_ia_css_thread_sp_ready_queue 0x278 #define HIVE_SIZE_sp_ia_css_thread_sp_ready_queue 12 -/* function stream2mmio_send_command: E0A */ +/* function stream2mmio_send_command: E15 */ -/* function ia_css_uds_sp_scale_params: 65BF */ +/* function ia_css_uds_sp_scale_params: 680D */ -/* function ia_css_circbuf_increase_size: 14DC */ +/* function ia_css_circbuf_increase_size: 1468 */ -/* function __divu: 6834 */ +/* function __divu: 6A82 */ -/* function ia_css_thread_sp_get_state: 131F */ +/* function ia_css_thread_sp_get_state: 12AB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_stop #define HIVE_MEM_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_stop 0x5798 +#define HIVE_ADDR_sem_for_cont_capt_stop 0x5814 #define HIVE_SIZE_sem_for_cont_capt_stop 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x5798 +#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x5814 #define HIVE_SIZE_sp_sem_for_cont_capt_stop 20 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -462,25 +452,25 @@ #define HIVE_ADDR_sp_N_SHORT_PACKET_LUT_ENTRIES 0x1AC #define HIVE_SIZE_sp_N_SHORT_PACKET_LUT_ENTRIES 12 -/* function thread_fiber_sp_main: 14D5 */ +/* function thread_fiber_sp_main: 1461 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_pipe_thread #define HIVE_MEM_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_pipe_thread 0x58DC +#define HIVE_ADDR_sp_isp_pipe_thread 0x5958 #define HIVE_SIZE_sp_isp_pipe_thread 340 #else #endif #endif #define HIVE_MEM_sp_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x58DC +#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x5958 #define HIVE_SIZE_sp_sp_isp_pipe_thread 340 -/* function ia_css_parambuf_sp_handle_parameter_sets: 193F */ +/* function ia_css_parambuf_sp_handle_parameter_sets: 18CB */ -/* function ia_css_spctrl_sp_set_state: 5DED */ +/* function ia_css_spctrl_sp_set_state: 5F46 */ -/* function ia_css_thread_sem_sp_signal: 6A99 */ +/* function ia_css_thread_sem_sp_signal: 6D66 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_IRQ_BASE @@ -494,7 +484,7 @@ #define HIVE_ADDR_sp_IRQ_BASE 0x2C #define HIVE_SIZE_sp_IRQ_BASE 16 -/* function ia_css_virtual_isys_sp_isr_init: 5E8C */ +/* function ia_css_virtual_isys_sp_isr_init: 5FC0 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_TIMED_CTRL_BASE @@ -508,11 +498,23 @@ #define HIVE_ADDR_sp_TIMED_CTRL_BASE 0x40 #define HIVE_SIZE_sp_TIMED_CTRL_BASE 4 -/* function ia_css_isys_sp_generate_exp_id: 613C */ +/* function ia_css_isys_sp_generate_exp_id: 6352 */ -/* function ia_css_rmgr_sp_init: 61A7 */ +/* function ia_css_rmgr_sp_init: 63BD */ -/* function ia_css_thread_sem_sp_init: 6B6A */ +/* function ia_css_thread_sem_sp_init: 6E37 */ + +#ifndef HIVE_MULTIPLE_PROGRAMS +#ifndef HIVE_MEM_sem_for_reading_cb_frame +#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sem_for_reading_cb_frame 0x5828 +#define HIVE_SIZE_sem_for_reading_cb_frame 40 +#else +#endif +#endif +#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x5828 +#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_is_isp_requested @@ -526,29 +528,17 @@ #define HIVE_ADDR_sp_is_isp_requested 0x390 #define HIVE_SIZE_sp_is_isp_requested 4 -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sem_for_reading_cb_frame -#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_frame 0x57AC -#define HIVE_SIZE_sem_for_reading_cb_frame 40 -#else -#endif -#endif -#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x57AC -#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 - -/* function ia_css_dmaproxy_sp_execute: 3B3B */ +/* function ia_css_dmaproxy_sp_execute: 3C85 */ -/* function csi_rx_backend_rst: CE6 */ +/* function csi_rx_backend_rst: CF1 */ -/* function ia_css_queue_is_empty: 51FA */ +/* function ia_css_queue_is_empty: 7194 */ -/* function ia_css_pipeline_sp_has_stopped: 1FF5 */ +/* function ia_css_pipeline_sp_has_stopped: 1F9A */ -/* function ia_css_circbuf_extract: 15E0 */ +/* function ia_css_circbuf_extract: 156C */ -/* function ia_css_tagger_buf_sp_is_locked_from_start: 344F */ +/* function ia_css_tagger_buf_sp_is_locked_from_start: 355C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_sp_thread @@ -562,13 +552,13 @@ #define HIVE_ADDR_sp_current_sp_thread 0x274 #define HIVE_SIZE_sp_current_sp_thread 4 -/* function ia_css_spctrl_sp_get_spid: 5DF4 */ +/* function ia_css_spctrl_sp_get_spid: 5F4D */ -/* function ia_css_bufq_sp_reset_buffers: 3646 */ +/* function ia_css_bufq_sp_reset_buffers: 3753 */ -/* function ia_css_dmaproxy_sp_read_byte_addr: 6DD7 */ +/* function ia_css_dmaproxy_sp_read_byte_addr: 7075 */ -/* function ia_css_rmgr_sp_uninit: 61A0 */ +/* function ia_css_rmgr_sp_uninit: 63B6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_stack @@ -594,20 +584,20 @@ #define HIVE_ADDR_sp_N_STREAM2MMIO_SID_PROCS 0x218 #define HIVE_SIZE_sp_N_STREAM2MMIO_SID_PROCS 12 -/* function ia_css_circbuf_peek: 15C2 */ +/* function ia_css_circbuf_peek: 154E */ -/* function ia_css_parambuf_sp_wait_for_in_param: 1708 */ +/* function ia_css_parambuf_sp_wait_for_in_param: 1694 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_param #define HIVE_MEM_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_param 0x57D4 +#define HIVE_ADDR_sp_all_cb_elems_param 0x5850 #define HIVE_SIZE_sp_all_cb_elems_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x57D4 +#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x5850 #define HIVE_SIZE_sp_sp_all_cb_elems_param 16 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -625,103 +615,103 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame_desc #define HIVE_MEM_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame_desc 0x57E4 +#define HIVE_ADDR_sp_all_cbs_frame_desc 0x5860 #define HIVE_SIZE_sp_all_cbs_frame_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x57E4 +#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x5860 #define HIVE_SIZE_sp_sp_all_cbs_frame_desc 8 -/* function sp_isys_copy_func_v2: 629 */ +/* function sp_isys_copy_func_v2: 5CE */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_cb_param #define HIVE_MEM_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_param 0x57EC +#define HIVE_ADDR_sem_for_reading_cb_param 0x5868 #define HIVE_SIZE_sem_for_reading_cb_param 40 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x57EC +#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x5868 #define HIVE_SIZE_sp_sem_for_reading_cb_param 40 -/* function ia_css_queue_get_used_space: 52C7 */ +/* function ia_css_queue_get_used_space: 544D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_start #define HIVE_MEM_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_start 0x5814 +#define HIVE_ADDR_sem_for_cont_capt_start 0x5890 #define HIVE_SIZE_sem_for_cont_capt_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x5814 +#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x5890 #define HIVE_SIZE_sp_sem_for_cont_capt_start 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tmp_heap #define HIVE_MEM_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_tmp_heap 0x70A8 +#define HIVE_ADDR_tmp_heap 0x7128 #define HIVE_SIZE_tmp_heap 640 #else #endif #endif #define HIVE_MEM_sp_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tmp_heap 0x70A8 +#define HIVE_ADDR_sp_tmp_heap 0x7128 #define HIVE_SIZE_sp_tmp_heap 640 -/* function ia_css_rmgr_sp_get_num_vbuf: 64B0 */ +/* function ia_css_rmgr_sp_get_num_vbuf: 66C6 */ -/* function ia_css_ispctrl_sp_output_compute_dma_info: 4863 */ +/* function ia_css_ispctrl_sp_output_compute_dma_info: 49CE */ -/* function ia_css_tagger_sp_lock_exp_id: 2A0F */ +/* function ia_css_tagger_sp_lock_exp_id: 29CA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x5C24 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x5CA0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_s3a_bufs 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x5C24 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x5CA0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 60 -/* function ia_css_queue_is_full: 535E */ +/* function ia_css_queue_is_full: 54E4 */ /* function debug_buffer_init_isp: E4 */ -/* function ia_css_tagger_sp_exp_id_is_locked: 2945 */ +/* function ia_css_tagger_sp_exp_id_is_locked: 2900 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem #define HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x7764 +#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x77E0 #define HIVE_SIZE_ia_css_rmgr_sp_mipi_frame_sem 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x7764 +#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x77E0 #define HIVE_SIZE_sp_ia_css_rmgr_sp_mipi_frame_sem 60 -/* function ia_css_rmgr_sp_refcount_dump: 6287 */ +/* function ia_css_rmgr_sp_refcount_dump: 649D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id #define HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x5C60 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x5CDC #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x5C60 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x5CDC #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -736,53 +726,53 @@ #define HIVE_ADDR_sp_sp_pipe_threads 0x150 #define HIVE_SIZE_sp_sp_pipe_threads 20 -/* function sp_event_proxy_func: 78D */ +/* function sp_event_proxy_func: 732 */ -/* function ibuf_ctrl_run: D7F */ +/* function ibuf_ctrl_run: D8A */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_isys_event_queue_handle #define HIVE_MEM_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x5C74 +#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x5CF0 #define HIVE_SIZE_host2sp_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x5C74 +#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x5CF0 #define HIVE_SIZE_sp_host2sp_isys_event_queue_handle 12 -/* function ia_css_thread_sp_yield: 6A12 */ +/* function ia_css_thread_sp_yield: 6CDF */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param_desc #define HIVE_MEM_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param_desc 0x5828 +#define HIVE_ADDR_sp_all_cbs_param_desc 0x58A4 #define HIVE_SIZE_sp_all_cbs_param_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x5828 +#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x58A4 #define HIVE_SIZE_sp_sp_all_cbs_param_desc 8 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb #define HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x6C8C +#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x6D08 #define HIVE_SIZE_ia_css_dmaproxy_sp_invalidate_tlb 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x6C8C +#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x6D08 #define HIVE_SIZE_sp_ia_css_dmaproxy_sp_invalidate_tlb 4 -/* function ia_css_thread_sp_fork: 13AC */ +/* function ia_css_thread_sp_fork: 1338 */ -/* function ia_css_tagger_sp_destroy: 3136 */ +/* function ia_css_tagger_sp_destroy: 30F1 */ -/* function ia_css_dmaproxy_sp_vmem_read: 3ADB */ +/* function ia_css_dmaproxy_sp_vmem_read: 3C25 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_N_LONG_PACKET_LUT_ENTRIES @@ -796,17 +786,17 @@ #define HIVE_ADDR_sp_N_LONG_PACKET_LUT_ENTRIES 0x1B8 #define HIVE_SIZE_sp_N_LONG_PACKET_LUT_ENTRIES 12 -/* function initialize_sp_group: 5F6 */ +/* function initialize_sp_group: 59B */ -/* function ia_css_tagger_buf_sp_peek: 325B */ +/* function ia_css_tagger_buf_sp_peek: 3368 */ -/* function ia_css_thread_sp_init: 13D8 */ +/* function ia_css_thread_sp_init: 1364 */ -/* function ia_css_isys_sp_reset_exp_id: 6133 */ +/* function qos_scheduler_update_fps: 67FD */ -/* function qos_scheduler_update_fps: 65AF */ +/* function ia_css_isys_sp_reset_exp_id: 6349 */ -/* function ia_css_ispctrl_sp_set_stream_base_addr: 4F38 */ +/* function ia_css_ispctrl_sp_set_stream_base_addr: 50BB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_DMEM_BASE @@ -832,11 +822,13 @@ #define HIVE_ADDR_sp_SP_DMEM_BASE 0x4 #define HIVE_SIZE_sp_SP_DMEM_BASE 4 -/* function ibuf_ctrl_transfer: D67 */ +/* function ibuf_ctrl_transfer: D72 */ -/* function ia_css_dmaproxy_sp_read: 3B51 */ +/* function __ia_css_queue_is_empty_text: 53AA */ -/* function virtual_isys_stream_is_capture_done: 5EB0 */ +/* function ia_css_dmaproxy_sp_read: 3C9B */ + +/* function virtual_isys_stream_is_capture_done: 5FE4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_raw_copy_line_count @@ -853,27 +845,27 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_tag_cmd_queue_handle #define HIVE_MEM_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x5C80 +#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x5CFC #define HIVE_SIZE_host2sp_tag_cmd_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x5C80 +#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x5CFC #define HIVE_SIZE_sp_host2sp_tag_cmd_queue_handle 12 -/* function ia_css_queue_peek: 523D */ +/* function ia_css_queue_peek: 53C3 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_frame_cnt #define HIVE_MEM_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x5B2C +#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x5BA8 #define HIVE_SIZE_ia_css_flash_sp_frame_cnt 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x5B2C +#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x5BA8 #define HIVE_SIZE_sp_ia_css_flash_sp_frame_cnt 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -888,25 +880,25 @@ #define HIVE_ADDR_sp_event_can_send_token_mask 0x88 #define HIVE_SIZE_sp_event_can_send_token_mask 44 -/* function csi_rx_frontend_stop: C11 */ +/* function csi_rx_frontend_stop: C1C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_thread #define HIVE_MEM_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_isp_thread 0x6FD8 +#define HIVE_ADDR_isp_thread 0x7058 #define HIVE_SIZE_isp_thread 4 #else #endif #endif #define HIVE_MEM_sp_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_thread 0x6FD8 +#define HIVE_ADDR_sp_isp_thread 0x7058 #define HIVE_SIZE_sp_isp_thread 4 -/* function encode_and_post_sp_event_non_blocking: AF0 */ +/* function encode_and_post_sp_event_non_blocking: A95 */ /* function is_ddr_debug_buffer_full: 2CC */ -/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 32AB */ +/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 33B8 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_fiber @@ -920,99 +912,99 @@ #define HIVE_ADDR_sp_sp_threads_fiber 0x194 #define HIVE_SIZE_sp_sp_threads_fiber 24 -/* function encode_and_post_sp_event: A79 */ +/* function encode_and_post_sp_event: A1E */ /* function debug_enqueue_ddr: EE */ -/* function ia_css_rmgr_sp_refcount_init_vbuf: 6242 */ +/* function ia_css_rmgr_sp_refcount_init_vbuf: 6458 */ -/* function dmaproxy_sp_read_write: 6E86 */ +/* function dmaproxy_sp_read_write: 7113 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer #define HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x6C90 +#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x6D0C #define HIVE_SIZE_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x6C90 +#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x6D0C #define HIVE_SIZE_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_buffer_queue_handle #define HIVE_MEM_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_buffer_queue_handle 0x5C8C +#define HIVE_ADDR_host2sp_buffer_queue_handle 0x5D08 #define HIVE_SIZE_host2sp_buffer_queue_handle 480 #else #endif #endif #define HIVE_MEM_sp_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x5C8C +#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x5D08 #define HIVE_SIZE_sp_host2sp_buffer_queue_handle 480 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_service #define HIVE_MEM_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_service 0x3054 +#define HIVE_ADDR_ia_css_flash_sp_in_service 0x3058 #define HIVE_SIZE_ia_css_flash_sp_in_service 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x3054 +#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x3058 #define HIVE_SIZE_sp_ia_css_flash_sp_in_service 4 -/* function ia_css_dmaproxy_sp_process: 6B92 */ +/* function ia_css_dmaproxy_sp_process: 6E5F */ -/* function ia_css_tagger_buf_sp_mark_from_end: 3533 */ +/* function ia_css_tagger_buf_sp_mark_from_end: 3640 */ -/* function ia_css_ispctrl_sp_init_cs: 3F77 */ +/* function ia_css_ispctrl_sp_init_cs: 40E4 */ -/* function ia_css_spctrl_sp_init: 5E02 */ +/* function ia_css_spctrl_sp_init: 5F5B */ -/* function sp_event_proxy_init: 7A2 */ +/* function sp_event_proxy_init: 747 */ -/* function input_system_input_port_close: 109B */ +/* function input_system_input_port_close: 10A6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick #define HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x5E6C +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x5EE8 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x5E6C +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x5EE8 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_output #define HIVE_MEM_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_output 0x3F2C +#define HIVE_ADDR_sp_output 0x3F30 #define HIVE_SIZE_sp_output 16 #else #endif #endif #define HIVE_MEM_sp_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_output 0x3F2C +#define HIVE_ADDR_sp_sp_output 0x3F30 #define HIVE_SIZE_sp_sp_output 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x5E94 +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x5F10 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x5E94 +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x5F10 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 -/* function pixelgen_prbs_config: E93 */ +/* function pixelgen_prbs_config: E9E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_CTRL_BASE @@ -1038,53 +1030,53 @@ #define HIVE_ADDR_sp_INPUT_FORMATTER_BASE 0x4C #define HIVE_SIZE_sp_INPUT_FORMATTER_BASE 16 -/* function sp_dma_proxy_reset_channels: 3DAB */ +/* function sp_dma_proxy_reset_channels: 3F0A */ -/* function ia_css_tagger_sp_update_size: 322A */ +/* function ia_css_tagger_sp_update_size: 3337 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_host_sp_queue #define HIVE_MEM_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x61B4 +#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x6230 #define HIVE_SIZE_ia_css_bufq_host_sp_queue 2008 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x61B4 +#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x6230 #define HIVE_SIZE_sp_ia_css_bufq_host_sp_queue 2008 -/* function thread_fiber_sp_create: 1444 */ +/* function thread_fiber_sp_create: 13D0 */ -/* function ia_css_dmaproxy_sp_set_increments: 3C3D */ +/* function ia_css_dmaproxy_sp_set_increments: 3D9C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_frame #define HIVE_MEM_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_frame 0x5830 +#define HIVE_ADDR_sem_for_writing_cb_frame 0x58AC #define HIVE_SIZE_sem_for_writing_cb_frame 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x5830 +#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x58AC #define HIVE_SIZE_sp_sem_for_writing_cb_frame 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_param #define HIVE_MEM_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_param 0x5844 +#define HIVE_ADDR_sem_for_writing_cb_param 0x58C0 #define HIVE_SIZE_sem_for_writing_cb_param 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x5844 +#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x58C0 #define HIVE_SIZE_sp_sem_for_writing_cb_param 20 -/* function pixelgen_tpg_is_done: F0D */ +/* function pixelgen_tpg_is_done: F18 */ -/* function ia_css_isys_stream_capture_indication: 5FB6 */ +/* function ia_css_isys_stream_capture_indication: 6127 */ /* function sp_start_isp_entry: 392 */ #ifndef HIVE_MULTIPLE_PROGRAMS @@ -1094,53 +1086,53 @@ #endif #define HIVE_ADDR_sp_sp_start_isp_entry 0x392 -/* function ia_css_tagger_buf_sp_unmark_all: 34B7 */ +/* function ia_css_tagger_buf_sp_unmark_all: 35C4 */ -/* function ia_css_tagger_buf_sp_unmark_from_start: 34F8 */ +/* function ia_css_tagger_buf_sp_unmark_from_start: 3605 */ -/* function ia_css_dmaproxy_sp_channel_acquire: 3DD7 */ +/* function ia_css_dmaproxy_sp_channel_acquire: 3F36 */ -/* function ia_css_rmgr_sp_add_num_vbuf: 648C */ +/* function ia_css_rmgr_sp_add_num_vbuf: 66A2 */ -/* function ibuf_ctrl_config: D8B */ +/* function ibuf_ctrl_config: D96 */ -/* function ia_css_isys_stream_stop: 602E */ +/* function ia_css_isys_stream_stop: 6244 */ -/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 3AA7 */ +/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 3BF1 */ -/* function ia_css_tagger_sp_acquire_buf_elem: 291D */ +/* function ia_css_tagger_sp_acquire_buf_elem: 28D8 */ -/* function ia_css_bufq_sp_is_dynamic_buffer: 3990 */ +/* function ia_css_bufq_sp_is_dynamic_buffer: 3A9D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_group #define HIVE_MEM_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_group 0x3F3C -#define HIVE_SIZE_sp_group 6176 +#define HIVE_ADDR_sp_group 0x3F40 +#define HIVE_SIZE_sp_group 6296 #else #endif #endif #define HIVE_MEM_sp_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_group 0x3F3C -#define HIVE_SIZE_sp_sp_group 6176 +#define HIVE_ADDR_sp_sp_group 0x3F40 +#define HIVE_SIZE_sp_sp_group 6296 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_event_proxy_thread #define HIVE_MEM_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_event_proxy_thread 0x5A30 +#define HIVE_ADDR_sp_event_proxy_thread 0x5AAC #define HIVE_SIZE_sp_event_proxy_thread 68 #else #endif #endif #define HIVE_MEM_sp_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_event_proxy_thread 0x5A30 +#define HIVE_ADDR_sp_sp_event_proxy_thread 0x5AAC #define HIVE_SIZE_sp_sp_event_proxy_thread 68 -/* function ia_css_thread_sp_kill: 1372 */ +/* function ia_css_thread_sp_kill: 12FE */ -/* function ia_css_tagger_sp_create: 31E4 */ +/* function ia_css_tagger_sp_create: 32E5 */ -/* function tmpmem_acquire_dmem: 6539 */ +/* function tmpmem_acquire_dmem: 674F */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_MMU_BASE @@ -1154,31 +1146,31 @@ #define HIVE_ADDR_sp_MMU_BASE 0x24 #define HIVE_SIZE_sp_MMU_BASE 8 -/* function ia_css_dmaproxy_sp_channel_release: 3DC3 */ +/* function ia_css_dmaproxy_sp_channel_release: 3F22 */ -/* function pixelgen_prbs_run: E81 */ +/* function pixelgen_prbs_run: E8C */ -/* function ia_css_dmaproxy_sp_is_idle: 3DA3 */ +/* function ia_css_dmaproxy_sp_is_idle: 3F02 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_qos_start #define HIVE_MEM_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_qos_start 0x5858 +#define HIVE_ADDR_sem_for_qos_start 0x58D4 #define HIVE_SIZE_sem_for_qos_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_qos_start 0x5858 +#define HIVE_ADDR_sp_sem_for_qos_start 0x58D4 #define HIVE_SIZE_sp_sem_for_qos_start 20 -/* function isp_hmem_load: B63 */ +/* function isp_hmem_load: B6E */ -/* function ia_css_tagger_sp_release_buf_elem: 28F9 */ +/* function ia_css_tagger_sp_release_buf_elem: 28B4 */ -/* function ia_css_eventq_sp_send: 3E19 */ +/* function ia_css_eventq_sp_send: 3F78 */ -/* function ia_css_tagger_buf_sp_unlock_from_start: 33E7 */ +/* function ia_css_tagger_buf_sp_unlock_from_start: 34F4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_debug_buffer_ddr_address @@ -1192,36 +1184,40 @@ #define HIVE_ADDR_sp_debug_buffer_ddr_address 0xBC #define HIVE_SIZE_sp_debug_buffer_ddr_address 4 -/* function sp_isys_copy_request: 6ED */ +/* function sp_isys_copy_request: 692 */ + +/* function ia_css_rmgr_sp_refcount_retain_vbuf: 6532 */ -/* function ia_css_rmgr_sp_refcount_retain_vbuf: 631C */ +/* function ia_css_thread_sp_set_priority: 12F6 */ -/* function ia_css_thread_sp_set_priority: 136A */ +/* function sizeof_hmem: C15 */ -/* function sizeof_hmem: C0A */ +/* function input_system_channel_open: 11CD */ -/* function input_system_channel_open: 1241 */ +/* function pixelgen_tpg_stop: F06 */ -/* function pixelgen_tpg_stop: EFB */ +/* function tmpmem_release_dmem: 673E */ -/* function tmpmem_release_dmem: 6528 */ +/* function __ia_css_dmaproxy_sp_process_text: 3B95 */ -/* function ia_css_dmaproxy_sp_set_width_exception: 3C28 */ +/* function ia_css_dmaproxy_sp_set_width_exception: 3D87 */ -/* function sp_event_assert: 929 */ +/* function sp_event_assert: 8CE */ -/* function ia_css_flash_sp_init_internal_params: 35B4 */ +/* function ia_css_flash_sp_init_internal_params: 36C1 */ -/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 32ED */ +/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 33FA */ -/* function __modu: 687A */ +/* function __modu: 6AC8 */ -/* function ia_css_dmaproxy_sp_init_isp_vector: 3AAD */ +/* function ia_css_dmaproxy_sp_init_isp_vector: 3BF7 */ -/* function input_system_channel_transfer: 122A */ +/* function input_system_channel_transfer: 11B6 */ /* function isp_vamem_store: 0 */ +/* function ia_css_tagger_sp_set_copy_pipe: 32DC */ + #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_GDC_BASE #define HIVE_MEM_GDC_BASE scalar_processor_2400_dmem @@ -1234,22 +1230,22 @@ #define HIVE_ADDR_sp_GDC_BASE 0x44 #define HIVE_SIZE_sp_GDC_BASE 8 -/* function ia_css_queue_local_init: 5528 */ +/* function ia_css_queue_local_init: 56AE */ -/* function sp_event_proxy_callout_func: 6947 */ +/* function sp_event_proxy_callout_func: 6B95 */ -/* function qos_scheduler_schedule_stage: 6580 */ +/* function qos_scheduler_schedule_stage: 67A9 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_thread_sp_num_ready_threads #define HIVE_MEM_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x5A78 +#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x5AF4 #define HIVE_SIZE_ia_css_thread_sp_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x5A78 +#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x5AF4 #define HIVE_SIZE_sp_ia_css_thread_sp_num_ready_threads 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -1264,29 +1260,31 @@ #define HIVE_ADDR_sp_sp_threads_stack_size 0x17C #define HIVE_SIZE_sp_sp_threads_stack_size 24 -/* function ia_css_ispctrl_sp_isp_done_row_striping: 4849 */ +/* function ia_css_ispctrl_sp_isp_done_row_striping: 49B4 */ + +/* function __ia_css_virtual_isys_sp_isr_text: 5F9E */ -/* function __ia_css_virtual_isys_sp_isr_text: 5E45 */ +/* function ia_css_queue_dequeue: 552C */ -/* function ia_css_queue_dequeue: 53A6 */ +/* function is_qos_standalone_mode: 6784 */ -/* function ia_css_dmaproxy_sp_configure_channel: 6DEE */ +/* function ia_css_dmaproxy_sp_configure_channel: 708C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_thread_fiber_sp #define HIVE_MEM_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_current_thread_fiber_sp 0x5A80 +#define HIVE_ADDR_current_thread_fiber_sp 0x5AFC #define HIVE_SIZE_current_thread_fiber_sp 4 #else #endif #endif #define HIVE_MEM_sp_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_sp_current_thread_fiber_sp 0x5A80 +#define HIVE_ADDR_sp_current_thread_fiber_sp 0x5AFC #define HIVE_SIZE_sp_current_thread_fiber_sp 4 -/* function ia_css_circbuf_pop: 1674 */ +/* function ia_css_circbuf_pop: 1600 */ -/* function memset: 68F9 */ +/* function memset: 6B47 */ /* function irq_raise_set_token: B6 */ @@ -1302,89 +1300,91 @@ #define HIVE_ADDR_sp_GPIO_BASE 0x3C #define HIVE_SIZE_sp_GPIO_BASE 4 -/* function pixelgen_prbs_stop: E6F */ +/* function pixelgen_prbs_stop: E7A */ -/* function ia_css_pipeline_acc_stage_enable: 1FC0 */ +/* function ia_css_pipeline_acc_stage_enable: 1F53 */ -/* function ia_css_tagger_sp_unlock_exp_id: 296A */ +/* function ia_css_tagger_sp_unlock_exp_id: 2925 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_ph #define HIVE_MEM_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_isp_ph 0x7360 +#define HIVE_ADDR_isp_ph 0x73DC #define HIVE_SIZE_isp_ph 28 #else #endif #endif #define HIVE_MEM_sp_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_ph 0x7360 +#define HIVE_ADDR_sp_isp_ph 0x73DC #define HIVE_SIZE_sp_isp_ph 28 -/* function ia_css_ispctrl_sp_init_ds: 40D6 */ +/* function ia_css_ispctrl_sp_init_ds: 4243 */ -/* function get_xmem_base_addr_raw: 4479 */ +/* function get_xmem_base_addr_raw: 45E4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param #define HIVE_MEM_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param 0x586C +#define HIVE_ADDR_sp_all_cbs_param 0x58E8 #define HIVE_SIZE_sp_all_cbs_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param 0x586C +#define HIVE_ADDR_sp_sp_all_cbs_param 0x58E8 #define HIVE_SIZE_sp_sp_all_cbs_param 16 -/* function pixelgen_tpg_config: F30 */ +/* function pixelgen_tpg_config: F3B */ -/* function ia_css_circbuf_create: 16C2 */ +/* function ia_css_circbuf_create: 164E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp_group #define HIVE_MEM_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp_group 0x587C +#define HIVE_ADDR_sem_for_sp_group 0x58F8 #define HIVE_SIZE_sem_for_sp_group 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp_group 0x587C +#define HIVE_ADDR_sp_sem_for_sp_group 0x58F8 #define HIVE_SIZE_sp_sem_for_sp_group 20 -/* function csi_rx_frontend_run: C22 */ +/* function csi_rx_frontend_run: C2D */ -/* function ia_css_framebuf_sp_wait_for_in_frame: 64B7 */ +/* function __ia_css_dmaproxy_sp_configure_channel_text: 3D66 */ -/* function ia_css_isys_stream_open: 60E3 */ +/* function ia_css_framebuf_sp_wait_for_in_frame: 66CD */ -/* function ia_css_sp_rawcopy_tag_frame: 5C71 */ +/* function ia_css_isys_stream_open: 62F9 */ -/* function input_system_channel_configure: 125D */ +/* function ia_css_sp_rawcopy_tag_frame: 5DDC */ -/* function isp_hmem_clear: B33 */ +/* function input_system_channel_configure: 11E9 */ -/* function ia_css_framebuf_sp_release_in_frame: 64FA */ +/* function isp_hmem_clear: B3E */ -/* function stream2mmio_config: E1B */ +/* function ia_css_framebuf_sp_release_in_frame: 6710 */ -/* function ia_css_ispctrl_sp_start_binary: 3F55 */ +/* function stream2mmio_config: E26 */ + +/* function ia_css_ispctrl_sp_start_binary: 40C2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x698C +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x6A08 #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x698C +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x6A08 #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 -/* function ia_css_eventq_sp_recv: 3DEB */ +/* function ia_css_eventq_sp_recv: 3F4A */ -/* function csi_rx_frontend_config: C7A */ +/* function csi_rx_frontend_config: C85 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_pool @@ -1398,9 +1398,11 @@ #define HIVE_ADDR_sp_isp_pool 0x370 #define HIVE_SIZE_sp_isp_pool 4 -/* function ia_css_rmgr_sp_rel_gen: 61E9 */ +/* function ia_css_rmgr_sp_rel_gen: 63FF */ + +/* function ia_css_tagger_sp_unblock_clients: 31AD */ -/* function css_get_frame_processing_time_end: 28E9 */ +/* function css_get_frame_processing_time_end: 28A4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_any_pending_mask @@ -1414,49 +1416,49 @@ #define HIVE_ADDR_sp_event_any_pending_mask 0x388 #define HIVE_SIZE_sp_event_any_pending_mask 8 -/* function ia_css_pipeline_sp_get_pipe_io_status: 1AB8 */ +/* function ia_css_pipeline_sp_get_pipe_io_status: 1A44 */ /* function sh_css_decode_tag_descr: 352 */ /* function debug_enqueue_isp: 27B */ -/* function qos_scheduler_update_stage_budget: 656E */ +/* function qos_scheduler_update_stage_budget: 678C */ -/* function ia_css_spctrl_sp_uninit: 5DFB */ +/* function ia_css_spctrl_sp_uninit: 5F54 */ -/* function csi_rx_backend_run: C68 */ +/* function csi_rx_backend_run: C73 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x69A0 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x6A1C #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_dis_bufs 140 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x69A0 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x6A1C #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_dis_bufs 140 -/* function ia_css_tagger_buf_sp_lock_from_start: 341B */ +/* function ia_css_tagger_buf_sp_lock_from_start: 3528 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_isp_idle #define HIVE_MEM_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_isp_idle 0x5890 +#define HIVE_ADDR_sem_for_isp_idle 0x590C #define HIVE_SIZE_sem_for_isp_idle 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_isp_idle 0x5890 +#define HIVE_ADDR_sp_sem_for_isp_idle 0x590C #define HIVE_SIZE_sp_sem_for_isp_idle 20 -/* function ia_css_dmaproxy_sp_write_byte_addr: 3B0A */ +/* function ia_css_dmaproxy_sp_write_byte_addr: 3C54 */ -/* function ia_css_dmaproxy_sp_init: 3A81 */ +/* function ia_css_dmaproxy_sp_init: 3BCB */ -/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 3686 */ +/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 3793 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_VAMEM_BASE @@ -1470,49 +1472,49 @@ #define HIVE_ADDR_sp_ISP_VAMEM_BASE 0x14 #define HIVE_SIZE_sp_ISP_VAMEM_BASE 12 -/* function input_system_channel_sync: 11A4 */ +/* function input_system_channel_sync: 6C60 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rawcopy_sp_tagger #define HIVE_MEM_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x732C +#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x73A8 #define HIVE_SIZE_ia_css_rawcopy_sp_tagger 24 #else #endif #endif #define HIVE_MEM_sp_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x732C +#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x73A8 #define HIVE_SIZE_sp_ia_css_rawcopy_sp_tagger 24 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids #define HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x6A2C +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x6AA8 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_exp_ids 70 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x6A2C +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x6AA8 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_exp_ids 70 -/* function ia_css_queue_item_load: 561A */ +/* function ia_css_queue_item_load: 57A0 */ -/* function ia_css_spctrl_sp_get_state: 5DE6 */ +/* function ia_css_spctrl_sp_get_state: 5F3F */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_callout_sp_thread #define HIVE_MEM_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_callout_sp_thread 0x5A74 +#define HIVE_ADDR_callout_sp_thread 0x5AF0 #define HIVE_SIZE_callout_sp_thread 4 #else #endif #endif #define HIVE_MEM_sp_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_callout_sp_thread 0x5A74 +#define HIVE_ADDR_sp_callout_sp_thread 0x5AF0 #define HIVE_SIZE_sp_callout_sp_thread 4 -/* function thread_fiber_sp_init: 14CB */ +/* function thread_fiber_sp_init: 1457 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_SP_PMEM_BASE @@ -1529,50 +1531,50 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_input_stream_format #define HIVE_MEM_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_input_stream_format 0x3E2C +#define HIVE_ADDR_sp_isp_input_stream_format 0x3E30 #define HIVE_SIZE_sp_isp_input_stream_format 20 #else #endif #endif #define HIVE_MEM_sp_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x3E2C +#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x3E30 #define HIVE_SIZE_sp_sp_isp_input_stream_format 20 -/* function __mod: 6866 */ +/* function __mod: 6AB4 */ -/* function ia_css_dmaproxy_sp_init_dmem_channel: 3B6B */ +/* function ia_css_dmaproxy_sp_init_dmem_channel: 3CB5 */ -/* function ia_css_thread_sp_join: 139B */ +/* function ia_css_thread_sp_join: 1327 */ -/* function ia_css_dmaproxy_sp_add_command: 6EF1 */ +/* function ia_css_dmaproxy_sp_add_command: 717E */ -/* function ia_css_sp_metadata_thread_func: 5DDF */ +/* function ia_css_sp_metadata_thread_func: 5F38 */ -/* function __sp_event_proxy_func_critical: 6934 */ +/* function __sp_event_proxy_func_critical: 6B82 */ -/* function ia_css_pipeline_sp_wait_for_isys_stream_N: 5F53 */ +/* function ia_css_pipeline_sp_wait_for_isys_stream_N: 60C4 */ -/* function ia_css_sp_metadata_wait: 5DD8 */ +/* function ia_css_sp_metadata_wait: 5F31 */ -/* function ia_css_circbuf_peek_from_start: 15A4 */ +/* function ia_css_circbuf_peek_from_start: 1530 */ -/* function ia_css_event_sp_encode: 3E76 */ +/* function ia_css_event_sp_encode: 3FD5 */ -/* function ia_css_thread_sp_run: 140E */ +/* function ia_css_thread_sp_run: 139A */ -/* function sp_isys_copy_func: 618 */ +/* function sp_isys_copy_func: 5BD */ -/* function ia_css_sp_isp_param_init_isp_memories: 50A3 */ +/* function ia_css_sp_isp_param_init_isp_memories: 5253 */ -/* function register_isr: 921 */ +/* function register_isr: 8C6 */ /* function irq_raise: C8 */ -/* function ia_css_dmaproxy_sp_mmu_invalidate: 3A48 */ +/* function ia_css_dmaproxy_sp_mmu_invalidate: 3B5B */ -/* function csi_rx_backend_disable: C34 */ +/* function csi_rx_backend_disable: C3F */ -/* function pipeline_sp_initialize_stage: 2104 */ +/* function pipeline_sp_initialize_stage: 20A9 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_N_CSI_RX_FE_CTRL_DLANES @@ -1586,15 +1588,15 @@ #define HIVE_ADDR_sp_N_CSI_RX_FE_CTRL_DLANES 0x1C4 #define HIVE_SIZE_sp_N_CSI_RX_FE_CTRL_DLANES 12 -/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 6DC0 */ +/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 705E */ -/* function ia_css_ispctrl_sp_done_ds: 40BD */ +/* function ia_css_ispctrl_sp_done_ds: 422A */ -/* function csi_rx_backend_config: C8B */ +/* function csi_rx_backend_config: C96 */ -/* function ia_css_sp_isp_param_get_mem_inits: 507E */ +/* function ia_css_sp_isp_param_get_mem_inits: 522E */ -/* function ia_css_parambuf_sp_init_buffer_queues: 1A85 */ +/* function ia_css_parambuf_sp_init_buffer_queues: 1A11 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_pfp_spref @@ -1623,134 +1625,134 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_frames #define HIVE_MEM_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x6A74 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x6AF0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_frames 280 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x6A74 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x6AF0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_frames 280 -/* function qos_scheduler_init_stage_budget: 65A7 */ +/* function qos_scheduler_init_stage_budget: 67EA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_buffer_queue_handle #define HIVE_MEM_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_buffer_queue_handle 0x6B8C +#define HIVE_ADDR_sp2host_buffer_queue_handle 0x6C08 #define HIVE_SIZE_sp2host_buffer_queue_handle 96 #else #endif #endif #define HIVE_MEM_sp_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x6B8C +#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x6C08 #define HIVE_SIZE_sp_sp2host_buffer_queue_handle 96 -/* function ia_css_ispctrl_sp_init_isp_vars: 4D9D */ +/* function ia_css_ispctrl_sp_init_isp_vars: 4F20 */ -/* function ia_css_isys_stream_start: 6010 */ +/* function ia_css_isys_stream_start: 61D7 */ -/* function sp_warning: 954 */ +/* function sp_warning: 8F9 */ -/* function ia_css_rmgr_sp_vbuf_enqueue: 62DC */ +/* function ia_css_rmgr_sp_vbuf_enqueue: 64F2 */ -/* function ia_css_tagger_sp_tag_exp_id: 2A84 */ +/* function ia_css_tagger_sp_tag_exp_id: 2A3F */ -/* function ia_css_pipeline_sp_sfi_release_current_frame: 276B */ +/* function ia_css_pipeline_sp_sfi_release_current_frame: 2726 */ -/* function ia_css_dmaproxy_sp_write: 3B21 */ +/* function ia_css_dmaproxy_sp_write: 3C6B */ -/* function ia_css_isys_stream_start_async: 608A */ +/* function ia_css_isys_stream_start_async: 62A0 */ -/* function ia_css_parambuf_sp_release_in_param: 1905 */ +/* function ia_css_parambuf_sp_release_in_param: 1891 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_irq_sw_interrupt_token #define HIVE_MEM_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_irq_sw_interrupt_token 0x3E28 +#define HIVE_ADDR_irq_sw_interrupt_token 0x3E2C #define HIVE_SIZE_irq_sw_interrupt_token 4 #else #endif #endif #define HIVE_MEM_sp_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x3E28 +#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x3E2C #define HIVE_SIZE_sp_irq_sw_interrupt_token 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_addresses #define HIVE_MEM_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_addresses 0x6FDC +#define HIVE_ADDR_sp_isp_addresses 0x705C #define HIVE_SIZE_sp_isp_addresses 172 #else #endif #endif #define HIVE_MEM_sp_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_addresses 0x6FDC +#define HIVE_ADDR_sp_sp_isp_addresses 0x705C #define HIVE_SIZE_sp_sp_isp_addresses 172 -/* function ia_css_rmgr_sp_acq_gen: 6201 */ +/* function ia_css_rmgr_sp_acq_gen: 6417 */ -/* function input_system_input_port_open: 10ED */ +/* function input_system_input_port_open: 10F8 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isps #define HIVE_MEM_isps scalar_processor_2400_dmem -#define HIVE_ADDR_isps 0x737C +#define HIVE_ADDR_isps 0x73F8 #define HIVE_SIZE_isps 28 #else #endif #endif #define HIVE_MEM_sp_isps scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isps 0x737C +#define HIVE_ADDR_sp_isps 0x73F8 #define HIVE_SIZE_sp_isps 28 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_queues_initialized #define HIVE_MEM_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_queues_initialized 0x3E40 +#define HIVE_ADDR_host_sp_queues_initialized 0x3E44 #define HIVE_SIZE_host_sp_queues_initialized 4 #else #endif #endif #define HIVE_MEM_sp_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_queues_initialized 0x3E40 +#define HIVE_ADDR_sp_host_sp_queues_initialized 0x3E44 #define HIVE_SIZE_sp_host_sp_queues_initialized 4 -/* function ia_css_queue_uninit: 54E6 */ +/* function ia_css_queue_uninit: 566C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_ispctrl_sp_isp_started #define HIVE_MEM_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x6C94 +#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x6D10 #define HIVE_SIZE_ia_css_ispctrl_sp_isp_started 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x6C94 +#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x6D10 #define HIVE_SIZE_sp_ia_css_ispctrl_sp_isp_started 4 -/* function ia_css_bufq_sp_release_dynamic_buf: 36F2 */ +/* function ia_css_bufq_sp_release_dynamic_buf: 37FF */ -/* function ia_css_dmaproxy_sp_set_height_exception: 3C19 */ +/* function ia_css_dmaproxy_sp_set_height_exception: 3D78 */ -/* function ia_css_dmaproxy_sp_init_vmem_channel: 3B9E */ +/* function ia_css_dmaproxy_sp_init_vmem_channel: 3CE9 */ -/* function csi_rx_backend_stop: C57 */ +/* function csi_rx_backend_stop: C62 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_num_ready_threads #define HIVE_MEM_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_num_ready_threads 0x5A7C +#define HIVE_ADDR_num_ready_threads 0x5AF8 #define HIVE_SIZE_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_num_ready_threads 0x5A7C +#define HIVE_ADDR_sp_num_ready_threads 0x5AF8 #define HIVE_SIZE_sp_num_ready_threads 4 -/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 3AF3 */ +/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 3C3D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_spref @@ -1764,57 +1766,57 @@ #define HIVE_ADDR_sp_vbuf_spref 0x374 #define HIVE_SIZE_sp_vbuf_spref 4 -/* function ia_css_queue_enqueue: 5430 */ +/* function ia_css_queue_enqueue: 55B6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_request #define HIVE_MEM_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_request 0x5B30 +#define HIVE_ADDR_ia_css_flash_sp_request 0x5BAC #define HIVE_SIZE_ia_css_flash_sp_request 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x5B30 +#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x5BAC #define HIVE_SIZE_sp_ia_css_flash_sp_request 4 -/* function ia_css_dmaproxy_sp_vmem_write: 3AC4 */ +/* function ia_css_dmaproxy_sp_vmem_write: 3C0E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tagger_frames #define HIVE_MEM_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_tagger_frames 0x5A84 +#define HIVE_ADDR_tagger_frames 0x5B00 #define HIVE_SIZE_tagger_frames 168 #else #endif #endif #define HIVE_MEM_sp_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tagger_frames 0x5A84 +#define HIVE_ADDR_sp_tagger_frames 0x5B00 #define HIVE_SIZE_sp_tagger_frames 168 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_if #define HIVE_MEM_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_if 0x58A4 +#define HIVE_ADDR_sem_for_reading_if 0x5920 #define HIVE_SIZE_sem_for_reading_if 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_if 0x58A4 +#define HIVE_ADDR_sp_sem_for_reading_if 0x5920 #define HIVE_SIZE_sp_sem_for_reading_if 20 -/* function sp_generate_interrupts: 9D3 */ +/* function sp_generate_interrupts: 978 */ -/* function ia_css_pipeline_sp_start: 2007 */ +/* function ia_css_pipeline_sp_start: 1FAC */ -/* function csi_rx_backend_enable: C45 */ +/* function csi_rx_backend_enable: C50 */ -/* function ia_css_sp_rawcopy_init: 5953 */ +/* function ia_css_sp_rawcopy_init: 5AD9 */ -/* function input_system_input_port_configure: 113F */ +/* function input_system_input_port_configure: 114A */ -/* function tmr_clock_read: 16EF */ +/* function tmr_clock_read: 167B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_BAMEM_BASE @@ -1831,16 +1833,16 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x6BEC +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x6C68 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x6BEC +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x6C68 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 -/* function isys2401_dma_config_legacy: DE0 */ +/* function isys2401_dma_config_legacy: DEB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ibuf_ctrl_master_ports @@ -1854,45 +1856,45 @@ #define HIVE_ADDR_sp_ibuf_ctrl_master_ports 0x208 #define HIVE_SIZE_sp_ibuf_ctrl_master_ports 12 -/* function css_get_frame_processing_time_start: 28F1 */ +/* function css_get_frame_processing_time_start: 28AC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame #define HIVE_MEM_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame 0x58B8 +#define HIVE_ADDR_sp_all_cbs_frame 0x5934 #define HIVE_SIZE_sp_all_cbs_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame 0x58B8 +#define HIVE_ADDR_sp_sp_all_cbs_frame 0x5934 #define HIVE_SIZE_sp_sp_all_cbs_frame 16 -/* function ia_css_virtual_isys_sp_isr: 6F07 */ +/* function ia_css_virtual_isys_sp_isr: 71BE */ -/* function thread_sp_queue_print: 142B */ +/* function thread_sp_queue_print: 13B7 */ -/* function sp_notify_eof: 97F */ +/* function sp_notify_eof: 924 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_str2mem #define HIVE_MEM_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_str2mem 0x58C8 +#define HIVE_ADDR_sem_for_str2mem 0x5944 #define HIVE_SIZE_sem_for_str2mem 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_str2mem 0x58C8 +#define HIVE_ADDR_sp_sem_for_str2mem 0x5944 #define HIVE_SIZE_sp_sem_for_str2mem 20 -/* function ia_css_tagger_buf_sp_is_marked_from_start: 3483 */ +/* function ia_css_tagger_buf_sp_is_marked_from_start: 3590 */ -/* function ia_css_bufq_sp_acquire_dynamic_buf: 38AA */ +/* function ia_css_bufq_sp_acquire_dynamic_buf: 39B7 */ -/* function ia_css_pipeline_sp_sfi_mode_is_enabled: 28BF */ +/* function ia_css_pipeline_sp_sfi_mode_is_enabled: 287A */ -/* function ia_css_circbuf_destroy: 16B9 */ +/* function ia_css_circbuf_destroy: 1645 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_PMEM_BASE @@ -1906,41 +1908,41 @@ #define HIVE_ADDR_sp_ISP_PMEM_BASE 0xC #define HIVE_SIZE_sp_ISP_PMEM_BASE 4 -/* function ia_css_sp_isp_param_mem_load: 5011 */ +/* function ia_css_sp_isp_param_mem_load: 51C1 */ -/* function ia_css_tagger_buf_sp_pop_from_start: 326F */ +/* function ia_css_tagger_buf_sp_pop_from_start: 337C */ -/* function __div: 681E */ +/* function __div: 6A6C */ -/* function ia_css_rmgr_sp_refcount_release_vbuf: 62FB */ +/* function ia_css_rmgr_sp_refcount_release_vbuf: 6511 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_use #define HIVE_MEM_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_use 0x5B34 +#define HIVE_ADDR_ia_css_flash_sp_in_use 0x5BB0 #define HIVE_SIZE_ia_css_flash_sp_in_use 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x5B34 +#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x5BB0 #define HIVE_SIZE_sp_ia_css_flash_sp_in_use 4 -/* function ia_css_thread_sem_sp_wait: 6AE4 */ +/* function ia_css_thread_sem_sp_wait: 6DB1 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sleep_mode #define HIVE_MEM_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sleep_mode 0x3E44 +#define HIVE_ADDR_sp_sleep_mode 0x3E48 #define HIVE_SIZE_sp_sleep_mode 4 #else #endif #endif #define HIVE_MEM_sp_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sleep_mode 0x3E44 +#define HIVE_ADDR_sp_sp_sleep_mode 0x3E48 #define HIVE_SIZE_sp_sp_sleep_mode 4 -/* function ia_css_tagger_buf_sp_push: 337E */ +/* function ia_css_tagger_buf_sp_push: 348B */ /* function mmu_invalidate_cache: D3 */ @@ -1956,24 +1958,22 @@ #define HIVE_ADDR_sp_sp_max_cb_elems 0x148 #define HIVE_SIZE_sp_sp_max_cb_elems 8 -/* function ia_css_queue_remote_init: 5508 */ +/* function ia_css_queue_remote_init: 568E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stop_req #define HIVE_MEM_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stop_req 0x575C +#define HIVE_ADDR_isp_stop_req 0x57D8 #define HIVE_SIZE_isp_stop_req 4 #else #endif #endif #define HIVE_MEM_sp_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stop_req 0x575C +#define HIVE_ADDR_sp_isp_stop_req 0x57D8 #define HIVE_SIZE_sp_isp_stop_req 4 -/* function ia_css_pipeline_sp_sfi_request_next_frame: 2781 */ +/* function ia_css_pipeline_sp_sfi_request_next_frame: 273C */ -#define HIVE_ICACHE_sp_critical_SEGMENT_START 0 -#define HIVE_ICACHE_sp_critical_NUM_SEGMENTS 1 #endif /* _sp_map_h_ */ extern void sh_css_dump_sp_dmem(void); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/system_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/system_global.h index 9f7ecac4..96823bd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/system_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_csi2p_system/system_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c index b7d90bb..18eec12 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -239,6 +239,30 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem) +{ + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() enter:\n"); + + { + unsigned offset = 0; + unsigned size = 0; + if (binary->info->mem_offsets.offsets.config) { + size = binary->info->mem_offsets.offsets.config->dmem.sc.size; + offset = binary->info->mem_offsets.offsets.config->dmem.sc.offset; + } + if (size) { + ia_css_sc_config((struct sh_css_isp_sc_isp_config *) + &binary->mem_params.params[IA_CSS_PARAM_CLASS_CONFIG][IA_CSS_ISP_DMEM].address[offset], + config_dmem, size); } + } + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_configure_sc() leave:\n"); +} + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h index ec3fb636..b41847b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,6 +22,7 @@ #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h" #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h" #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h" +#include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h" #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h" #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h" #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h" @@ -44,6 +45,7 @@ enum ia_css_configuration_ids { IA_CSS_OUTPUT0_CONFIG_ID, IA_CSS_OUTPUT1_CONFIG_ID, IA_CSS_OUTPUT_CONFIG_ID, + IA_CSS_SC_CONFIG_ID, IA_CSS_RAW_CONFIG_ID, IA_CSS_TNR_CONFIG_ID, IA_CSS_REF_CONFIG_ID, @@ -64,6 +66,7 @@ struct ia_css_config_memory_offsets { struct ia_css_isp_parameter output0; struct ia_css_isp_parameter output1; struct ia_css_isp_parameter output; + struct ia_css_isp_parameter sc; struct ia_css_isp_parameter raw; struct ia_css_isp_parameter tnr; struct ia_css_isp_parameter ref; @@ -141,6 +144,13 @@ ia_css_configure_output( /* Code generated by genparam/genconfig.c:gen_configure_function() */ void +ia_css_configure_sc( + const struct ia_css_binary *binary, + const struct ia_css_sc_configuration *config_dmem); + +/* Code generated by genparam/genconfig.c:gen_configure_function() */ + +void ia_css_configure_raw( const struct ia_css_binary *binary, const struct ia_css_raw_configuration *config_dmem); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c index b00a812..e29bdfc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -1564,6 +1564,25 @@ size); } } + { + unsigned size = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size; + + unsigned offset = stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.offset; + + if (size) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() enter:\n"); + + ia_css_xnr3_vmem_encode((struct sh_css_isp_xnr3_vmem_params *) + &stage->binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_VMEM].address[offset], + ¶ms->xnr3_config, +size); + params->isp_params_changed = true; + params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_VMEM] = true; + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_process_xnr3() leave:\n"); + } + + } } /* Code generated by genparam/gencode.c:gen_param_process_table() */ @@ -1652,8 +1671,6 @@ ia_css_set_dp_config(struct ia_css_isp_parameters *params, ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->dp_config = *config; params->config_changed[IA_CSS_DP_ID] = true; - params->config_changed[IA_CSS_DP_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_dp_config() leave: " "return_void\n"); } @@ -1690,8 +1707,6 @@ ia_css_set_wb_config(struct ia_css_isp_parameters *params, ia_css_wb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->wb_config = *config; params->config_changed[IA_CSS_WB_ID] = true; - params->config_changed[IA_CSS_WB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_wb_config() leave: " "return_void\n"); } @@ -1728,8 +1743,6 @@ ia_css_set_tnr_config(struct ia_css_isp_parameters *params, ia_css_tnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->tnr_config = *config; params->config_changed[IA_CSS_TNR_ID] = true; - params->config_changed[IA_CSS_TNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_tnr_config() leave: " "return_void\n"); } @@ -1766,8 +1779,6 @@ ia_css_set_ob_config(struct ia_css_isp_parameters *params, ia_css_ob_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ob_config = *config; params->config_changed[IA_CSS_OB_ID] = true; - params->config_changed[IA_CSS_OB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ob_config() leave: " "return_void\n"); } @@ -1804,8 +1815,6 @@ ia_css_set_de_config(struct ia_css_isp_parameters *params, ia_css_de_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->de_config = *config; params->config_changed[IA_CSS_DE_ID] = true; - params->config_changed[IA_CSS_DE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_de_config() leave: " "return_void\n"); } @@ -1842,8 +1851,6 @@ ia_css_set_anr_config(struct ia_css_isp_parameters *params, ia_css_anr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_config = *config; params->config_changed[IA_CSS_ANR_ID] = true; - params->config_changed[IA_CSS_ANR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr_config() leave: " "return_void\n"); } @@ -1880,8 +1887,6 @@ ia_css_set_anr2_config(struct ia_css_isp_parameters *params, ia_css_anr2_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->anr_thres = *config; params->config_changed[IA_CSS_ANR2_ID] = true; - params->config_changed[IA_CSS_ANR2_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_anr2_config() leave: " "return_void\n"); } @@ -1918,8 +1923,6 @@ ia_css_set_ce_config(struct ia_css_isp_parameters *params, ia_css_ce_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ce_config = *config; params->config_changed[IA_CSS_CE_ID] = true; - params->config_changed[IA_CSS_CE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ce_config() leave: " "return_void\n"); } @@ -1956,8 +1959,6 @@ ia_css_set_ecd_config(struct ia_css_isp_parameters *params, ia_css_ecd_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ecd_config = *config; params->config_changed[IA_CSS_ECD_ID] = true; - params->config_changed[IA_CSS_ECD_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ecd_config() leave: " "return_void\n"); } @@ -1994,8 +1995,6 @@ ia_css_set_ynr_config(struct ia_css_isp_parameters *params, ia_css_ynr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ynr_config = *config; params->config_changed[IA_CSS_YNR_ID] = true; - params->config_changed[IA_CSS_YNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ynr_config() leave: " "return_void\n"); } @@ -2032,8 +2031,6 @@ ia_css_set_fc_config(struct ia_css_isp_parameters *params, ia_css_fc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->fc_config = *config; params->config_changed[IA_CSS_FC_ID] = true; - params->config_changed[IA_CSS_FC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_fc_config() leave: " "return_void\n"); } @@ -2070,8 +2067,6 @@ ia_css_set_cnr_config(struct ia_css_isp_parameters *params, ia_css_cnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cnr_config = *config; params->config_changed[IA_CSS_CNR_ID] = true; - params->config_changed[IA_CSS_CNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_cnr_config() leave: " "return_void\n"); } @@ -2108,8 +2103,6 @@ ia_css_set_macc_config(struct ia_css_isp_parameters *params, ia_css_macc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->macc_config = *config; params->config_changed[IA_CSS_MACC_ID] = true; - params->config_changed[IA_CSS_MACC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_macc_config() leave: " "return_void\n"); } @@ -2146,8 +2139,6 @@ ia_css_set_ctc_config(struct ia_css_isp_parameters *params, ia_css_ctc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->ctc_config = *config; params->config_changed[IA_CSS_CTC_ID] = true; - params->config_changed[IA_CSS_CTC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_ctc_config() leave: " "return_void\n"); } @@ -2184,8 +2175,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, ia_css_aa_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->aa_config = *config; params->config_changed[IA_CSS_AA_ID] = true; - params->config_changed[IA_CSS_AA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_aa_config() leave: " "return_void\n"); } @@ -2222,8 +2211,6 @@ ia_css_set_yuv2rgb_config(struct ia_css_isp_parameters *params, ia_css_yuv2rgb_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->yuv2rgb_cc_config = *config; params->config_changed[IA_CSS_YUV2RGB_ID] = true; - params->config_changed[IA_CSS_YUV2RGB_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_yuv2rgb_config() leave: " "return_void\n"); } @@ -2260,8 +2247,6 @@ ia_css_set_rgb2yuv_config(struct ia_css_isp_parameters *params, ia_css_rgb2yuv_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->rgb2yuv_cc_config = *config; params->config_changed[IA_CSS_RGB2YUV_ID] = true; - params->config_changed[IA_CSS_RGB2YUV_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_rgb2yuv_config() leave: " "return_void\n"); } @@ -2298,8 +2283,6 @@ ia_css_set_csc_config(struct ia_css_isp_parameters *params, ia_css_csc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->cc_config = *config; params->config_changed[IA_CSS_CSC_ID] = true; - params->config_changed[IA_CSS_CSC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_csc_config() leave: " "return_void\n"); } @@ -2337,8 +2320,6 @@ ia_css_set_nr_config(struct ia_css_isp_parameters *params, params->nr_config = *config; params->config_changed[IA_CSS_BNR_ID] = true; params->config_changed[IA_CSS_NR_ID] = true; - params->config_changed[IA_CSS_NR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_nr_config() leave: " "return_void\n"); } @@ -2375,8 +2356,6 @@ ia_css_set_gc_config(struct ia_css_isp_parameters *params, ia_css_gc_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->gc_config = *config; params->config_changed[IA_CSS_GC_ID] = true; - params->config_changed[IA_CSS_GC_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_gc_config() leave: " "return_void\n"); } @@ -2416,8 +2395,6 @@ ia_css_set_sdis_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horicoef_config() leave: " "return_void\n"); } @@ -2457,8 +2434,6 @@ ia_css_set_sdis_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertcoef_config() leave: " "return_void\n"); } @@ -2498,8 +2473,6 @@ ia_css_set_sdis_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_horiproj_config() leave: " "return_void\n"); } @@ -2539,8 +2512,6 @@ ia_css_set_sdis_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis_vertproj_config() leave: " "return_void\n"); } @@ -2580,8 +2551,6 @@ ia_css_set_sdis2_horicoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORICOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horicoef_config() leave: " "return_void\n"); } @@ -2621,8 +2590,6 @@ ia_css_set_sdis2_vertcoef_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertcoef_config() leave: " "return_void\n"); } @@ -2662,8 +2629,6 @@ ia_css_set_sdis2_horiproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_horiproj_config() leave: " "return_void\n"); } @@ -2703,8 +2668,6 @@ ia_css_set_sdis2_vertproj_config(struct ia_css_isp_parameters *params, params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true; params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true; params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_sdis2_vertproj_config() leave: " "return_void\n"); } @@ -2741,8 +2704,6 @@ ia_css_set_r_gamma_config(struct ia_css_isp_parameters *params, ia_css_r_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->r_gamma_table = *config; params->config_changed[IA_CSS_R_GAMMA_ID] = true; - params->config_changed[IA_CSS_R_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_r_gamma_config() leave: " "return_void\n"); } @@ -2779,8 +2740,6 @@ ia_css_set_g_gamma_config(struct ia_css_isp_parameters *params, ia_css_g_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->g_gamma_table = *config; params->config_changed[IA_CSS_G_GAMMA_ID] = true; - params->config_changed[IA_CSS_G_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_g_gamma_config() leave: " "return_void\n"); } @@ -2817,8 +2776,6 @@ ia_css_set_b_gamma_config(struct ia_css_isp_parameters *params, ia_css_b_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->b_gamma_table = *config; params->config_changed[IA_CSS_B_GAMMA_ID] = true; - params->config_changed[IA_CSS_B_GAMMA_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_b_gamma_config() leave: " "return_void\n"); } @@ -2855,8 +2812,6 @@ ia_css_set_xnr_table_config(struct ia_css_isp_parameters *params, ia_css_xnr_table_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_table = *config; params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - params->config_changed[IA_CSS_XNR_TABLE_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_table_config() leave: " "return_void\n"); } @@ -2893,8 +2848,6 @@ ia_css_set_formats_config(struct ia_css_isp_parameters *params, ia_css_formats_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->formats_config = *config; params->config_changed[IA_CSS_FORMATS_ID] = true; - params->config_changed[IA_CSS_FORMATS_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_formats_config() leave: " "return_void\n"); } @@ -2931,8 +2884,6 @@ ia_css_set_xnr_config(struct ia_css_isp_parameters *params, ia_css_xnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr_config = *config; params->config_changed[IA_CSS_XNR_ID] = true; - params->config_changed[IA_CSS_XNR_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr_config() leave: " "return_void\n"); } @@ -2969,8 +2920,6 @@ ia_css_set_xnr3_config(struct ia_css_isp_parameters *params, ia_css_xnr3_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->xnr3_config = *config; params->config_changed[IA_CSS_XNR3_ID] = true; - params->config_changed[IA_CSS_XNR3_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_xnr3_config() leave: " "return_void\n"); } @@ -3008,8 +2957,6 @@ ia_css_set_s3a_config(struct ia_css_isp_parameters *params, params->s3a_config = *config; params->config_changed[IA_CSS_BH_ID] = true; params->config_changed[IA_CSS_S3A_ID] = true; - params->config_changed[IA_CSS_S3A_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_s3a_config() leave: " "return_void\n"); } @@ -3046,8 +2993,6 @@ ia_css_set_output_config(struct ia_css_isp_parameters *params, ia_css_output_debug_dtrace(config, IA_CSS_DEBUG_TRACE); params->output_config = *config; params->config_changed[IA_CSS_OUTPUT_ID] = true; - params->config_changed[IA_CSS_OUTPUT_ID] = true; - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "ia_css_set_output_config() leave: " "return_void\n"); } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h index 9680f4e..bf993bf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -120,6 +120,7 @@ struct ia_css_memory_offsets { struct ia_css_isp_parameter sdis_vertcoef; struct ia_css_isp_parameter sdis2_horicoef; struct ia_css_isp_parameter sdis2_vertcoef; + struct ia_css_isp_parameter xnr3; } vmem; struct { struct ia_css_isp_parameter bh; @@ -379,12 +380,14 @@ void ia_css_get_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + /* Code generated by genparam/gencode.c:gen_global_access_function() */ void ia_css_set_configs(struct ia_css_isp_parameters *params, const struct ia_css_isp_config *config) ; + #endif /* IA_CSS_INCLUDE_PARAMETER */ #endif /* _IA_CSS_ISP_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c index a445d4f..2405fc99 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h index d658a00..b358e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/bits.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/bits.h index e71e33d..5fdd8b5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/bits.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/bits.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/cell_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/cell_params.h index b5756bf..ca1ec92 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/cell_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/cell_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_common_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_common_defs.h index f3054fe..cd0530b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_common_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_common_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_defs.h index 6f5b7d3..1a0f86e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/css_receiver_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/defs.h index 47505f4..bc4491e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/dma_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/dma_v2_defs.h index d184a8b..78ce973 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/dma_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/dma_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gdc_v2_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gdc_v2_defs.h index 77722d2..b97f463 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gdc_v2_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gdc_v2_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_regs_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_regs_defs.h index 34e734f..320e48b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_regs_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_regs_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_timer_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_timer_defs.h index 3082e2f5..673b168 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_timer_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gp_timer_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gpio_block_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gpio_block_defs.h index a807d4c..349f2b7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gpio_block_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/gpio_block_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h index 2f7cb2d..95a0a28 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_defs.h index 5a2ce91..c97ea0b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h index 8d4c9d6..aaa7314 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h index b4211a0..389d924 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_types.h index 58b0e6e..7bfea9f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/hive_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/if_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/if_defs.h index 7d39e45..d91f7de 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/if_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/if_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_formatter_subsystem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_formatter_subsystem_defs.h index 16bfe1d..2a16e30 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_formatter_subsystem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_formatter_subsystem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_selector_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_selector_defs.h index 87fbf82..4d9f9c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_selector_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_selector_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_switch_2400_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_switch_2400_defs.h index 20a13c4..8bcc7a1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_switch_2400_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_switch_2400_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_ctrl_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_ctrl_defs.h index a7f0ca8..0e6423a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_ctrl_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_ctrl_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_defs.h index ae62163..e76c25a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/input_system_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/irq_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/irq_controller_defs.h index ec6dd44..c7c4401 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/irq_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/irq_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2400_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2400_support.h index e00bc84..9e6dafe 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2400_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2400_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2401_mamoiada_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2401_mamoiada_params.h index 033e23b..5162859 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2401_mamoiada_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp2401_mamoiada_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_acquisition_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_acquisition_defs.h index 5936207..fb13c64 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_acquisition_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_acquisition_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_capture_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_capture_defs.h index aa413df..5bd9496 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_capture_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/isp_capture_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/mmu_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/mmu_defs.h index c038f39..f8c2fe9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/mmu_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/mmu_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/scalar_processor_2400_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/scalar_processor_2400_params.h index 9b6c2893..c889f67 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/scalar_processor_2400_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/scalar_processor_2400_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/sp_hrt.h deleted file mode 100644 index ca0b7b7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/sp_hrt.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 _sp_hrt_h_ -#define _sp_hrt_h_ - -#define hrt_sp_dmem(cell) HRT_PROC_TYPE_PROP(cell, _dmem) - -#define hrt_sp_dmem_master_port_address(cell) hrt_mem_master_port_address(cell, hrt_sp_dmem(cell)) - -#endif /* _sp_hrt_h_ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/str2mem_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/str2mem_defs.h index 1cb6244..32667a3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/str2mem_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/str2mem_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/streaming_to_mipi_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/streaming_to_mipi_defs.h index 60143b8..fb81978 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/streaming_to_mipi_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/streaming_to_mipi_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/timed_controller_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/timed_controller_defs.h index d2b8972..0549495 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/timed_controller_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/timed_controller_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/var.h deleted file mode 100644 index 30f900d..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/var.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 _HRT_VAR_H -#define _HRT_VAR_H - -#include "version.h" -#include "system_api.h" -#include "hive_types.h" - -#define hrt_int_type_of_char char -#define hrt_int_type_of_uchar unsigned char -#define hrt_int_type_of_short short -#define hrt_int_type_of_ushort unsigned short -#define hrt_int_type_of_int int -#define hrt_int_type_of_uint unsigned int -#define hrt_int_type_of_long long -#define hrt_int_type_of_ulong unsigned long -#define hrt_int_type_of_ptr unsigned int - -#define hrt_host_type_of_char char -#define hrt_host_type_of_uchar unsigned char -#define hrt_host_type_of_short short -#define hrt_host_type_of_ushort unsigned short -#define hrt_host_type_of_int int -#define hrt_host_type_of_uint unsigned int -#define hrt_host_type_of_long long -#define hrt_host_type_of_ulong unsigned long -#define hrt_host_type_of_ptr void* - -#define HRT_TYPE_BYTES(cell, type) (HRT_TYPE_BITS(cell, type)/8) -#define HRT_HOST_TYPE(cell_type) HRTCAT(hrt_host_type_of_, cell_type) -#define HRT_INT_TYPE(type) HRTCAT(hrt_int_type_of_, type) - -#ifdef C_RUN - -#ifdef C_RUN_DYNAMIC_LINK_PROGRAMS -extern void *csim_processor_get_crun_symbol(hive_proc_id p, const char *sym); -#define _hrt_cell_get_crun_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) csim_processor_get_crun_symbol(cell,HRTSTR(sym)) -#else -#define _hrt_cell_get_crun_symbol(cell,sym) (&sym) -#define _hrt_cell_get_crun_indexed_symbol(cell,sym) (sym) -#endif // C_RUN_DYNAMIC_LINK_PROGRAMS - -#define hrt_scalar_store(cell, type, var, data) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var)) = (data)) -#define hrt_scalar_load(cell, type, var) \ - ((*(HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_symbol(cell,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - ((((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) = (data)) -#define hrt_indexed_load(cell, type, array, index) \ - (((HRT_HOST_TYPE(type)*)_hrt_cell_get_crun_indexed_symbol(cell,array))[index]) - -#else /* C_RUN */ - -#define hrt_scalar_store(cell, type, var, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_scalar_load(cell, type, var) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,var), \ - HRTCAT(HIVE_ADDR_,var))) - -#define hrt_indexed_store(cell, type, array, index, data) \ - HRTCAT(hrt_mem_store_,HRT_TYPE_BITS(cell, type))(\ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)), \ - (HRT_INT_TYPE(type))(data)) - -#define hrt_indexed_load(cell, type, array, index) \ - (HRT_HOST_TYPE(type))(HRTCAT4(_hrt_mem_load_,HRT_PROC_TYPE(cell),_,type) ( \ - cell, \ - HRTCAT(HIVE_MEM_,array), \ - (HRTCAT(HIVE_ADDR_,array))+((index)*HRT_TYPE_BYTES(cell, type)))) - -#endif /* C_RUN */ - -#endif /* _HRT_VAR_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/version.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/version.h index bbc4948..d1cf960 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/version.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/hrt/version.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/spmem_dump.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/spmem_dump.c index 4be4dc5..0089e1c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/spmem_dump.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_2401_system/spmem_dump.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -22,9 +22,9 @@ #define _hrt_cell_load_program_sp(proc) _hrt_cell_load_program_embedded(proc, sp) -/* function input_system_acquisition_stop: ADE */ +/* function input_system_acquisition_stop: AE9 */ -/* function longjmp: 684E */ +/* function longjmp: 6A5C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SRST_MASK @@ -38,64 +38,66 @@ #define HIVE_ADDR_sp_HIVE_IF_SRST_MASK 0x1C8 #define HIVE_SIZE_sp_HIVE_IF_SRST_MASK 16 -/* function tmpmem_init_dmem: 6599 */ +/* function tmpmem_init_dmem: 676F */ -/* function ia_css_isys_sp_token_map_receive_ack: 5EDD */ +/* function ia_css_isys_sp_token_map_receive_ack: 60B3 */ -/* function ia_css_dmaproxy_sp_set_addr_B: 3345 */ +/* function ia_css_dmaproxy_sp_set_addr_B: 3523 */ + +/* function ia_css_pipe_data_init_tagger_resources: A60 */ /* function debug_buffer_set_ddr_addr: DD */ -/* function receiver_port_reg_load: AC2 */ +/* function receiver_port_reg_load: ACD */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_mipi #define HIVE_MEM_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_mipi 0x631C +#define HIVE_ADDR_vbuf_mipi 0x6348 #define HIVE_SIZE_vbuf_mipi 12 #else #endif #endif #define HIVE_MEM_sp_vbuf_mipi scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_mipi 0x631C +#define HIVE_ADDR_sp_vbuf_mipi 0x6348 #define HIVE_SIZE_sp_vbuf_mipi 12 -/* function ia_css_event_sp_decode: 3536 */ +/* function ia_css_event_sp_decode: 3714 */ -/* function ia_css_queue_get_size: 48BE */ +/* function ia_css_queue_get_size: 4AED */ -/* function ia_css_queue_load: 4EFF */ +/* function ia_css_queue_load: 5104 */ -/* function setjmp: 6857 */ +/* function setjmp: 6A65 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_isys_event_queue #define HIVE_MEM_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x4684 +#define HIVE_ADDR_sem_for_sp2host_isys_event_queue 0x46B0 #define HIVE_SIZE_sem_for_sp2host_isys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_isys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x4684 +#define HIVE_ADDR_sp_sem_for_sp2host_isys_event_queue 0x46B0 #define HIVE_SIZE_sp_sem_for_sp2host_isys_event_queue 20 -/* function ia_css_dmaproxy_sp_wait_for_ack: 6E07 */ +/* function ia_css_dmaproxy_sp_wait_for_ack: 6FE6 */ -/* function ia_css_sp_rawcopy_func: 5124 */ +/* function ia_css_sp_rawcopy_func: 5329 */ -/* function ia_css_tagger_buf_sp_pop_marked: 2A10 */ +/* function ia_css_tagger_buf_sp_pop_marked: 2B9C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stage #define HIVE_MEM_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stage 0x5C00 +#define HIVE_ADDR_isp_stage 0x5C30 #define HIVE_SIZE_isp_stage 832 #else #endif #endif #define HIVE_MEM_sp_isp_stage scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stage 0x5C00 +#define HIVE_ADDR_sp_isp_stage 0x5C30 #define HIVE_SIZE_sp_isp_stage 832 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -110,32 +112,32 @@ #define HIVE_ADDR_sp_vbuf_raw 0x2F4 #define HIVE_SIZE_sp_vbuf_raw 4 -/* function ia_css_sp_bin_copy_func: 504B */ +/* function ia_css_sp_bin_copy_func: 5250 */ -/* function ia_css_queue_item_store: 4C4D */ +/* function ia_css_queue_item_store: 4E52 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4AA0 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4ACC #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_metadata_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4AA0 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 0x4ACC #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_metadata_bufs 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AB4 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AE0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_buffer_bufs 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_buffer_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AB4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 0x4AE0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_buffer_bufs 160 /* function sp_start_isp: 45D */ @@ -143,110 +145,98 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_binary_group #define HIVE_MEM_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_binary_group 0x5FF0 +#define HIVE_ADDR_sp_binary_group 0x6020 #define HIVE_SIZE_sp_binary_group 32 #else #endif #endif #define HIVE_MEM_sp_sp_binary_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_binary_group 0x5FF0 +#define HIVE_ADDR_sp_sp_binary_group 0x6020 #define HIVE_SIZE_sp_sp_binary_group 32 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sw_state #define HIVE_MEM_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sw_state 0x62AC +#define HIVE_ADDR_sp_sw_state 0x62D8 #define HIVE_SIZE_sp_sw_state 4 #else #endif #endif #define HIVE_MEM_sp_sp_sw_state scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sw_state 0x62AC +#define HIVE_ADDR_sp_sp_sw_state 0x62D8 #define HIVE_SIZE_sp_sp_sw_state 4 -/* function ia_css_thread_sp_main: D5B */ +/* function ia_css_thread_sp_main: D66 */ -/* function ia_css_ispctrl_sp_init_internal_buffers: 373C */ +/* function ia_css_ispctrl_sp_init_internal_buffers: 3928 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_psys_event_queue_handle #define HIVE_MEM_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x4B54 +#define HIVE_ADDR_sp2host_psys_event_queue_handle 0x4B80 #define HIVE_SIZE_sp2host_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x4B54 +#define HIVE_ADDR_sp_sp2host_psys_event_queue_handle 0x4B80 #define HIVE_SIZE_sp_sp2host_psys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp2host_psys_event_queue #define HIVE_MEM_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x4698 +#define HIVE_ADDR_sem_for_sp2host_psys_event_queue 0x46C4 #define HIVE_SIZE_sem_for_sp2host_psys_event_queue 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp2host_psys_event_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x4698 +#define HIVE_ADDR_sp_sem_for_sp2host_psys_event_queue 0x46C4 #define HIVE_SIZE_sp_sem_for_sp2host_psys_event_queue 20 -/* function ia_css_tagger_sp_propagate_frame: 2429 */ - -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sp_stop_copy_preview -#define HIVE_MEM_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_stop_copy_preview 0x6290 -#define HIVE_SIZE_sp_stop_copy_preview 4 -#else -#endif -#endif -#define HIVE_MEM_sp_sp_stop_copy_preview scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_stop_copy_preview 0x6290 -#define HIVE_SIZE_sp_sp_stop_copy_preview 4 +/* function ia_css_tagger_sp_propagate_frame: 2463 */ -/* function input_system_reg_load: B17 */ +/* function input_system_reg_load: B22 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_handles #define HIVE_MEM_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_vbuf_handles 0x6328 +#define HIVE_ADDR_vbuf_handles 0x6354 #define HIVE_SIZE_vbuf_handles 960 #else #endif #endif #define HIVE_MEM_sp_vbuf_handles scalar_processor_2400_dmem -#define HIVE_ADDR_sp_vbuf_handles 0x6328 +#define HIVE_ADDR_sp_vbuf_handles 0x6354 #define HIVE_SIZE_sp_vbuf_handles 960 -/* function ia_css_queue_store: 4DB3 */ +/* function ia_css_queue_store: 4FB8 */ -/* function ia_css_sp_flash_register: 2C45 */ +/* function ia_css_sp_flash_register: 2DD1 */ -/* function ia_css_sp_rawcopy_dummy_function: 566B */ +/* function ia_css_sp_rawcopy_dummy_function: 5841 */ -/* function ia_css_isys_sp_backend_create: 5B50 */ +/* function ia_css_isys_sp_backend_create: 5D26 */ -/* function ia_css_pipeline_sp_init: 184C */ +/* function ia_css_pipeline_sp_init: 1870 */ -/* function ia_css_tagger_sp_configure: 2319 */ +/* function ia_css_tagger_sp_configure: 2353 */ -/* function ia_css_ispctrl_sp_end_binary: 357F */ +/* function ia_css_ispctrl_sp_end_binary: 375D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B60 +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B8C #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B60 +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 0x4B8C #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_per_frame_ddr_ptrs 20 -/* function receiver_port_reg_store: AC9 */ +/* function receiver_port_reg_store: AD4 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_is_pending_mask @@ -263,114 +253,114 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_frame #define HIVE_MEM_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_frame 0x46AC +#define HIVE_ADDR_sp_all_cb_elems_frame 0x46D8 #define HIVE_SIZE_sp_all_cb_elems_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x46AC +#define HIVE_ADDR_sp_sp_all_cb_elems_frame 0x46D8 #define HIVE_SIZE_sp_sp_all_cb_elems_frame 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_isys_event_queue_handle #define HIVE_MEM_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x4B74 +#define HIVE_ADDR_sp2host_isys_event_queue_handle 0x4BA0 #define HIVE_SIZE_sp2host_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_sp2host_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x4B74 +#define HIVE_ADDR_sp_sp2host_isys_event_queue_handle 0x4BA0 #define HIVE_SIZE_sp_sp2host_isys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_com #define HIVE_MEM_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_com 0x4114 +#define HIVE_ADDR_host_sp_com 0x4118 #define HIVE_SIZE_host_sp_com 220 #else #endif #endif #define HIVE_MEM_sp_host_sp_com scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_com 0x4114 +#define HIVE_ADDR_sp_host_sp_com 0x4118 #define HIVE_SIZE_sp_host_sp_com 220 -/* function ia_css_queue_get_free_space: 4A12 */ +/* function ia_css_queue_get_free_space: 4C17 */ -/* function exec_image_pipe: 6C4 */ +/* function exec_image_pipe: 669 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_init_dmem_data #define HIVE_MEM_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_init_dmem_data 0x62B0 +#define HIVE_ADDR_sp_init_dmem_data 0x62DC #define HIVE_SIZE_sp_init_dmem_data 24 #else #endif #endif #define HIVE_MEM_sp_sp_init_dmem_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_init_dmem_data 0x62B0 +#define HIVE_ADDR_sp_sp_init_dmem_data 0x62DC #define HIVE_SIZE_sp_sp_init_dmem_data 24 -/* function ia_css_sp_metadata_start: 592D */ +/* function ia_css_sp_metadata_start: 5B03 */ -/* function ia_css_bufq_sp_init_buffer_queues: 2CB4 */ +/* function ia_css_bufq_sp_init_buffer_queues: 2E40 */ -/* function ia_css_pipeline_sp_stop: 182F */ +/* function ia_css_pipeline_sp_stop: 1853 */ -/* function ia_css_tagger_sp_connect_pipes: 2803 */ +/* function ia_css_tagger_sp_connect_pipes: 283D */ -/* function sp_isys_copy_wait: 70D */ +/* function sp_isys_copy_wait: 6B2 */ /* function is_isp_debug_buffer_full: 337 */ -/* function ia_css_dmaproxy_sp_configure_channel_from_info: 32C8 */ +/* function ia_css_dmaproxy_sp_configure_channel_from_info: 3493 */ -/* function encode_and_post_timer_event: A30 */ +/* function encode_and_post_timer_event: 9D5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_per_frame_data #define HIVE_MEM_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_per_frame_data 0x41F0 +#define HIVE_ADDR_sp_per_frame_data 0x41F4 #define HIVE_SIZE_sp_per_frame_data 4 #else #endif #endif #define HIVE_MEM_sp_sp_per_frame_data scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_per_frame_data 0x41F0 +#define HIVE_ADDR_sp_sp_per_frame_data 0x41F4 #define HIVE_SIZE_sp_sp_per_frame_data 4 -/* function ia_css_rmgr_sp_vbuf_dequeue: 62ED */ +/* function ia_css_rmgr_sp_vbuf_dequeue: 64C3 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_psys_event_queue_handle #define HIVE_MEM_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x4B80 +#define HIVE_ADDR_host2sp_psys_event_queue_handle 0x4BAC #define HIVE_SIZE_host2sp_psys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_psys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x4B80 +#define HIVE_ADDR_sp_host2sp_psys_event_queue_handle 0x4BAC #define HIVE_SIZE_sp_host2sp_psys_event_queue_handle 12 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_xmem_bin_addr #define HIVE_MEM_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_xmem_bin_addr 0x41F4 +#define HIVE_ADDR_xmem_bin_addr 0x41F8 #define HIVE_SIZE_xmem_bin_addr 4 #else #endif #endif #define HIVE_MEM_sp_xmem_bin_addr scalar_processor_2400_dmem -#define HIVE_ADDR_sp_xmem_bin_addr 0x41F4 +#define HIVE_ADDR_sp_xmem_bin_addr 0x41F8 #define HIVE_SIZE_sp_xmem_bin_addr 4 -/* function tmr_clock_init: 13FB */ +/* function tmr_clock_init: 1406 */ -/* function ia_css_pipeline_sp_run: 141C */ +/* function ia_css_pipeline_sp_run: 1427 */ -/* function memcpy: 68F7 */ +/* function memcpy: 6B05 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_GP_DEVICE_BASE @@ -396,49 +386,49 @@ #define HIVE_ADDR_sp_ia_css_thread_sp_ready_queue 0x1E0 #define HIVE_SIZE_sp_ia_css_thread_sp_ready_queue 12 -/* function input_system_reg_store: B1E */ +/* function input_system_reg_store: B29 */ -/* function ia_css_isys_sp_frontend_start: 5D66 */ +/* function ia_css_isys_sp_frontend_start: 5F3C */ -/* function ia_css_uds_sp_scale_params: 6600 */ +/* function ia_css_uds_sp_scale_params: 680E */ -/* function ia_css_circbuf_increase_size: E40 */ +/* function ia_css_circbuf_increase_size: E4B */ -/* function __divu: 6875 */ +/* function __divu: 6A83 */ -/* function ia_css_thread_sp_get_state: C83 */ +/* function ia_css_thread_sp_get_state: C8E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_stop #define HIVE_MEM_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_stop 0x46BC +#define HIVE_ADDR_sem_for_cont_capt_stop 0x46E8 #define HIVE_SIZE_sem_for_cont_capt_stop 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_stop scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x46BC +#define HIVE_ADDR_sp_sem_for_cont_capt_stop 0x46E8 #define HIVE_SIZE_sp_sem_for_cont_capt_stop 20 -/* function thread_fiber_sp_main: E39 */ +/* function thread_fiber_sp_main: E44 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_pipe_thread #define HIVE_MEM_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_pipe_thread 0x4800 +#define HIVE_ADDR_sp_isp_pipe_thread 0x482C #define HIVE_SIZE_sp_isp_pipe_thread 340 #else #endif #endif #define HIVE_MEM_sp_sp_isp_pipe_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x4800 +#define HIVE_ADDR_sp_sp_isp_pipe_thread 0x482C #define HIVE_SIZE_sp_sp_isp_pipe_thread 340 -/* function ia_css_parambuf_sp_handle_parameter_sets: 128A */ +/* function ia_css_parambuf_sp_handle_parameter_sets: 1295 */ -/* function ia_css_spctrl_sp_set_state: 595C */ +/* function ia_css_spctrl_sp_set_state: 5B32 */ -/* function ia_css_thread_sem_sp_signal: 6AF7 */ +/* function ia_css_thread_sem_sp_signal: 6D05 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_IRQ_BASE @@ -464,13 +454,25 @@ #define HIVE_ADDR_sp_TIMED_CTRL_BASE 0x40 #define HIVE_SIZE_sp_TIMED_CTRL_BASE 4 -/* function ia_css_isys_sp_isr: 6FDC */ +/* function ia_css_isys_sp_isr: 71D4 */ -/* function ia_css_isys_sp_generate_exp_id: 60FE */ +/* function ia_css_isys_sp_generate_exp_id: 62D4 */ -/* function ia_css_rmgr_sp_init: 61E8 */ +/* function ia_css_rmgr_sp_init: 63BE */ -/* function ia_css_thread_sem_sp_init: 6BC8 */ +/* function ia_css_thread_sem_sp_init: 6DD6 */ + +#ifndef HIVE_MULTIPLE_PROGRAMS +#ifndef HIVE_MEM_sem_for_reading_cb_frame +#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sem_for_reading_cb_frame 0x46FC +#define HIVE_SIZE_sem_for_reading_cb_frame 40 +#else +#endif +#endif +#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem +#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x46FC +#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_is_isp_requested @@ -484,27 +486,15 @@ #define HIVE_ADDR_sp_is_isp_requested 0x308 #define HIVE_SIZE_sp_is_isp_requested 4 -#ifndef HIVE_MULTIPLE_PROGRAMS -#ifndef HIVE_MEM_sem_for_reading_cb_frame -#define HIVE_MEM_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_frame 0x46D0 -#define HIVE_SIZE_sem_for_reading_cb_frame 40 -#else -#endif -#endif -#define HIVE_MEM_sp_sem_for_reading_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_frame 0x46D0 -#define HIVE_SIZE_sp_sem_for_reading_cb_frame 40 - -/* function ia_css_dmaproxy_sp_execute: 3230 */ +/* function ia_css_dmaproxy_sp_execute: 33F9 */ -/* function ia_css_queue_is_empty: 48F9 */ +/* function ia_css_queue_is_empty: 7133 */ -/* function ia_css_pipeline_sp_has_stopped: 1825 */ +/* function ia_css_pipeline_sp_has_stopped: 1849 */ -/* function ia_css_circbuf_extract: F44 */ +/* function ia_css_circbuf_extract: F4F */ -/* function ia_css_tagger_buf_sp_is_locked_from_start: 2B26 */ +/* function ia_css_tagger_buf_sp_is_locked_from_start: 2CB2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_sp_thread @@ -518,13 +508,13 @@ #define HIVE_ADDR_sp_current_sp_thread 0x1DC #define HIVE_SIZE_sp_current_sp_thread 4 -/* function ia_css_spctrl_sp_get_spid: 5963 */ +/* function ia_css_spctrl_sp_get_spid: 5B39 */ -/* function ia_css_bufq_sp_reset_buffers: 2D3B */ +/* function ia_css_bufq_sp_reset_buffers: 2EC7 */ -/* function ia_css_dmaproxy_sp_read_byte_addr: 6E35 */ +/* function ia_css_dmaproxy_sp_read_byte_addr: 7014 */ -/* function ia_css_rmgr_sp_uninit: 61E1 */ +/* function ia_css_rmgr_sp_uninit: 63B7 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_stack @@ -538,22 +528,22 @@ #define HIVE_ADDR_sp_sp_threads_stack 0x164 #define HIVE_SIZE_sp_sp_threads_stack 28 -/* function ia_css_circbuf_peek: F26 */ +/* function ia_css_circbuf_peek: F31 */ -/* function ia_css_parambuf_sp_wait_for_in_param: 1053 */ +/* function ia_css_parambuf_sp_wait_for_in_param: 105E */ -/* function ia_css_isys_sp_token_map_get_exp_id: 5FC6 */ +/* function ia_css_isys_sp_token_map_get_exp_id: 619C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cb_elems_param #define HIVE_MEM_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cb_elems_param 0x46F8 +#define HIVE_ADDR_sp_all_cb_elems_param 0x4724 #define HIVE_SIZE_sp_all_cb_elems_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cb_elems_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x46F8 +#define HIVE_ADDR_sp_sp_all_cb_elems_param 0x4724 #define HIVE_SIZE_sp_sp_all_cb_elems_param 16 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -571,105 +561,105 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame_desc #define HIVE_MEM_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame_desc 0x4708 +#define HIVE_ADDR_sp_all_cbs_frame_desc 0x4734 #define HIVE_SIZE_sp_all_cbs_frame_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x4708 +#define HIVE_ADDR_sp_sp_all_cbs_frame_desc 0x4734 #define HIVE_SIZE_sp_sp_all_cbs_frame_desc 8 -/* function sp_isys_copy_func_v2: 706 */ +/* function sp_isys_copy_func_v2: 6AB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_cb_param #define HIVE_MEM_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_cb_param 0x4710 +#define HIVE_ADDR_sem_for_reading_cb_param 0x473C #define HIVE_SIZE_sem_for_reading_cb_param 40 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x4710 +#define HIVE_ADDR_sp_sem_for_reading_cb_param 0x473C #define HIVE_SIZE_sp_sem_for_reading_cb_param 40 -/* function ia_css_queue_get_used_space: 49C6 */ +/* function ia_css_queue_get_used_space: 4BCB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_cont_capt_start #define HIVE_MEM_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_cont_capt_start 0x4738 +#define HIVE_ADDR_sem_for_cont_capt_start 0x4764 #define HIVE_SIZE_sem_for_cont_capt_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_cont_capt_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x4738 +#define HIVE_ADDR_sp_sem_for_cont_capt_start 0x4764 #define HIVE_SIZE_sp_sem_for_cont_capt_start 20 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tmp_heap #define HIVE_MEM_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_tmp_heap 0x6010 +#define HIVE_ADDR_tmp_heap 0x6040 #define HIVE_SIZE_tmp_heap 640 #else #endif #endif #define HIVE_MEM_sp_tmp_heap scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tmp_heap 0x6010 +#define HIVE_ADDR_sp_tmp_heap 0x6040 #define HIVE_SIZE_sp_tmp_heap 640 -/* function ia_css_rmgr_sp_get_num_vbuf: 64F1 */ +/* function ia_css_rmgr_sp_get_num_vbuf: 66C7 */ -/* function ia_css_ispctrl_sp_output_compute_dma_info: 3F62 */ +/* function ia_css_ispctrl_sp_output_compute_dma_info: 414C */ -/* function ia_css_tagger_sp_lock_exp_id: 20E6 */ +/* function ia_css_tagger_sp_lock_exp_id: 2120 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4B8C +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4BB8 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_s3a_bufs 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_s3a_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4B8C +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 0x4BB8 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_s3a_bufs 60 -/* function ia_css_queue_is_full: 4A5D */ +/* function ia_css_queue_is_full: 4C62 */ /* function debug_buffer_init_isp: E4 */ -/* function ia_css_isys_sp_frontend_uninit: 5D20 */ +/* function ia_css_isys_sp_frontend_uninit: 5EF6 */ -/* function ia_css_tagger_sp_exp_id_is_locked: 201C */ +/* function ia_css_tagger_sp_exp_id_is_locked: 2056 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem #define HIVE_MEM_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x66E8 +#define HIVE_ADDR_ia_css_rmgr_sp_mipi_frame_sem 0x6714 #define HIVE_SIZE_ia_css_rmgr_sp_mipi_frame_sem 60 #else #endif #endif #define HIVE_MEM_sp_ia_css_rmgr_sp_mipi_frame_sem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x66E8 +#define HIVE_ADDR_sp_ia_css_rmgr_sp_mipi_frame_sem 0x6714 #define HIVE_SIZE_sp_ia_css_rmgr_sp_mipi_frame_sem 60 -/* function ia_css_rmgr_sp_refcount_dump: 62C8 */ +/* function ia_css_rmgr_sp_refcount_dump: 649E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id #define HIVE_MEM_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BC8 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BF4 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BC8 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 0x4BF4 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_isp_parameters_id 20 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -684,65 +674,65 @@ #define HIVE_ADDR_sp_sp_pipe_threads 0x150 #define HIVE_SIZE_sp_sp_pipe_threads 20 -/* function sp_event_proxy_func: 71B */ +/* function sp_event_proxy_func: 6C0 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_isys_event_queue_handle #define HIVE_MEM_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x4BDC +#define HIVE_ADDR_host2sp_isys_event_queue_handle 0x4C08 #define HIVE_SIZE_host2sp_isys_event_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_isys_event_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x4BDC +#define HIVE_ADDR_sp_host2sp_isys_event_queue_handle 0x4C08 #define HIVE_SIZE_sp_host2sp_isys_event_queue_handle 12 -/* function ia_css_thread_sp_yield: 6A70 */ +/* function ia_css_thread_sp_yield: 6C7E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param_desc #define HIVE_MEM_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param_desc 0x474C +#define HIVE_ADDR_sp_all_cbs_param_desc 0x4778 #define HIVE_SIZE_sp_all_cbs_param_desc 8 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param_desc scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x474C +#define HIVE_ADDR_sp_sp_all_cbs_param_desc 0x4778 #define HIVE_SIZE_sp_sp_all_cbs_param_desc 8 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb #define HIVE_MEM_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x5BF4 +#define HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb 0x5C20 #define HIVE_SIZE_ia_css_dmaproxy_sp_invalidate_tlb 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_sp_invalidate_tlb scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x5BF4 +#define HIVE_ADDR_sp_ia_css_dmaproxy_sp_invalidate_tlb 0x5C20 #define HIVE_SIZE_sp_ia_css_dmaproxy_sp_invalidate_tlb 4 -/* function ia_css_thread_sp_fork: D10 */ +/* function ia_css_thread_sp_fork: D1B */ -/* function ia_css_tagger_sp_destroy: 280D */ +/* function ia_css_tagger_sp_destroy: 2847 */ -/* function ia_css_dmaproxy_sp_vmem_read: 31D0 */ +/* function ia_css_dmaproxy_sp_vmem_read: 3399 */ -/* function ia_css_ifmtr_sp_init: 614F */ +/* function ia_css_ifmtr_sp_init: 6325 */ -/* function initialize_sp_group: 6D4 */ +/* function initialize_sp_group: 679 */ -/* function ia_css_tagger_buf_sp_peek: 2932 */ +/* function ia_css_tagger_buf_sp_peek: 2ABE */ -/* function ia_css_thread_sp_init: D3C */ +/* function ia_css_thread_sp_init: D47 */ -/* function ia_css_isys_sp_reset_exp_id: 60F6 */ +/* function ia_css_isys_sp_reset_exp_id: 62CC */ -/* function qos_scheduler_update_fps: 65F0 */ +/* function qos_scheduler_update_fps: 67FE */ -/* function ia_css_ispctrl_sp_set_stream_base_addr: 4637 */ +/* function ia_css_ispctrl_sp_set_stream_base_addr: 4839 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_DMEM_BASE @@ -768,7 +758,9 @@ #define HIVE_ADDR_sp_SP_DMEM_BASE 0x4 #define HIVE_SIZE_sp_SP_DMEM_BASE 4 -/* function ia_css_dmaproxy_sp_read: 3246 */ +/* function __ia_css_queue_is_empty_text: 4B28 */ + +/* function ia_css_dmaproxy_sp_read: 340F */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_raw_copy_line_count @@ -785,27 +777,27 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_tag_cmd_queue_handle #define HIVE_MEM_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x4BE8 +#define HIVE_ADDR_host2sp_tag_cmd_queue_handle 0x4C14 #define HIVE_SIZE_host2sp_tag_cmd_queue_handle 12 #else #endif #endif #define HIVE_MEM_sp_host2sp_tag_cmd_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x4BE8 +#define HIVE_ADDR_sp_host2sp_tag_cmd_queue_handle 0x4C14 #define HIVE_SIZE_sp_host2sp_tag_cmd_queue_handle 12 -/* function ia_css_queue_peek: 493C */ +/* function ia_css_queue_peek: 4B41 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_frame_cnt #define HIVE_MEM_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x4A94 +#define HIVE_ADDR_ia_css_flash_sp_frame_cnt 0x4AC0 #define HIVE_SIZE_ia_css_flash_sp_frame_cnt 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_frame_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x4A94 +#define HIVE_ADDR_sp_ia_css_flash_sp_frame_cnt 0x4AC0 #define HIVE_SIZE_sp_ia_css_flash_sp_frame_cnt 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -823,26 +815,26 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_thread #define HIVE_MEM_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_isp_thread 0x5F40 +#define HIVE_ADDR_isp_thread 0x5F70 #define HIVE_SIZE_isp_thread 4 #else #endif #endif #define HIVE_MEM_sp_isp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_thread 0x5F40 +#define HIVE_ADDR_sp_isp_thread 0x5F70 #define HIVE_SIZE_sp_isp_thread 4 -/* function encode_and_post_sp_event_non_blocking: A78 */ +/* function encode_and_post_sp_event_non_blocking: A1D */ -/* function ia_css_isys_sp_frontend_destroy: 5DF8 */ +/* function ia_css_isys_sp_frontend_destroy: 5FCE */ /* function is_ddr_debug_buffer_full: 2CC */ -/* function ia_css_isys_sp_frontend_stop: 5D38 */ +/* function ia_css_isys_sp_frontend_stop: 5F0E */ -/* function ia_css_isys_sp_token_map_init: 6094 */ +/* function ia_css_isys_sp_token_map_init: 626A */ -/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 2982 */ +/* function ia_css_tagger_buf_sp_get_oldest_marked_offset: 2B0E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_threads_fiber @@ -856,98 +848,98 @@ #define HIVE_ADDR_sp_sp_threads_fiber 0x19C #define HIVE_SIZE_sp_sp_threads_fiber 28 -/* function encode_and_post_sp_event: A01 */ +/* function encode_and_post_sp_event: 9A6 */ /* function debug_enqueue_ddr: EE */ -/* function ia_css_rmgr_sp_refcount_init_vbuf: 6283 */ +/* function ia_css_rmgr_sp_refcount_init_vbuf: 6459 */ -/* function dmaproxy_sp_read_write: 6EE4 */ +/* function dmaproxy_sp_read_write: 70B2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer #define HIVE_MEM_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5BF8 +#define HIVE_ADDR_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5C24 #define HIVE_SIZE_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_dmaproxy_isp_dma_cmd_buffer scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5BF8 +#define HIVE_ADDR_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 0x5C24 #define HIVE_SIZE_sp_ia_css_dmaproxy_isp_dma_cmd_buffer 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host2sp_buffer_queue_handle #define HIVE_MEM_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_host2sp_buffer_queue_handle 0x4BF4 +#define HIVE_ADDR_host2sp_buffer_queue_handle 0x4C20 #define HIVE_SIZE_host2sp_buffer_queue_handle 480 #else #endif #endif #define HIVE_MEM_sp_host2sp_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x4BF4 +#define HIVE_ADDR_sp_host2sp_buffer_queue_handle 0x4C20 #define HIVE_SIZE_sp_host2sp_buffer_queue_handle 480 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_service #define HIVE_MEM_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_service 0x3178 +#define HIVE_ADDR_ia_css_flash_sp_in_service 0x317C #define HIVE_SIZE_ia_css_flash_sp_in_service 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_service scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x3178 +#define HIVE_ADDR_sp_ia_css_flash_sp_in_service 0x317C #define HIVE_SIZE_sp_ia_css_flash_sp_in_service 4 -/* function ia_css_dmaproxy_sp_process: 6BF0 */ +/* function ia_css_dmaproxy_sp_process: 6DFE */ -/* function ia_css_tagger_buf_sp_mark_from_end: 2C0A */ +/* function ia_css_tagger_buf_sp_mark_from_end: 2D96 */ -/* function ia_css_isys_sp_backend_rcv_acquire_ack: 5A05 */ +/* function ia_css_isys_sp_backend_rcv_acquire_ack: 5BDB */ -/* function ia_css_isys_sp_backend_pre_acquire_request: 5A1B */ +/* function ia_css_isys_sp_backend_pre_acquire_request: 5BF1 */ -/* function ia_css_ispctrl_sp_init_cs: 366C */ +/* function ia_css_ispctrl_sp_init_cs: 3858 */ -/* function ia_css_spctrl_sp_init: 5971 */ +/* function ia_css_spctrl_sp_init: 5B47 */ -/* function sp_event_proxy_init: 730 */ +/* function sp_event_proxy_init: 6D5 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick #define HIVE_MEM_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4DD4 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4E00 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4DD4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 0x4E00 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_previous_clock_tick 40 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_output #define HIVE_MEM_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_output 0x41F8 +#define HIVE_ADDR_sp_output 0x41FC #define HIVE_SIZE_sp_output 16 #else #endif #endif #define HIVE_MEM_sp_sp_output scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_output 0x41F8 +#define HIVE_ADDR_sp_sp_output 0x41FC #define HIVE_SIZE_sp_sp_output 16 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4DFC +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4E28 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4DFC +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 0x4E28 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_host2sp_buf_queues 800 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -974,52 +966,52 @@ #define HIVE_ADDR_sp_INPUT_FORMATTER_BASE 0x4C #define HIVE_SIZE_sp_INPUT_FORMATTER_BASE 16 -/* function sp_dma_proxy_reset_channels: 34A0 */ +/* function sp_dma_proxy_reset_channels: 367E */ -/* function ia_css_isys_sp_backend_acquire: 5B26 */ +/* function ia_css_isys_sp_backend_acquire: 5CFC */ -/* function ia_css_tagger_sp_update_size: 2901 */ +/* function ia_css_tagger_sp_update_size: 2A8D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_host_sp_queue #define HIVE_MEM_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x511C +#define HIVE_ADDR_ia_css_bufq_host_sp_queue 0x5148 #define HIVE_SIZE_ia_css_bufq_host_sp_queue 2008 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_host_sp_queue scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x511C +#define HIVE_ADDR_sp_ia_css_bufq_host_sp_queue 0x5148 #define HIVE_SIZE_sp_ia_css_bufq_host_sp_queue 2008 -/* function thread_fiber_sp_create: DA8 */ +/* function thread_fiber_sp_create: DB3 */ -/* function ia_css_dmaproxy_sp_set_increments: 3332 */ +/* function ia_css_dmaproxy_sp_set_increments: 3510 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_frame #define HIVE_MEM_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_frame 0x4754 +#define HIVE_ADDR_sem_for_writing_cb_frame 0x4780 #define HIVE_SIZE_sem_for_writing_cb_frame 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x4754 +#define HIVE_ADDR_sp_sem_for_writing_cb_frame 0x4780 #define HIVE_SIZE_sp_sem_for_writing_cb_frame 20 -/* function receiver_reg_store: AD7 */ +/* function receiver_reg_store: AE2 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_writing_cb_param #define HIVE_MEM_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_writing_cb_param 0x4768 +#define HIVE_ADDR_sem_for_writing_cb_param 0x4794 #define HIVE_SIZE_sem_for_writing_cb_param 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_writing_cb_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x4768 +#define HIVE_ADDR_sp_sem_for_writing_cb_param 0x4794 #define HIVE_SIZE_sp_sem_for_writing_cb_param 20 /* function sp_start_isp_entry: 453 */ @@ -1030,51 +1022,51 @@ #endif #define HIVE_ADDR_sp_sp_start_isp_entry 0x453 -/* function ia_css_tagger_buf_sp_unmark_all: 2B8E */ +/* function ia_css_tagger_buf_sp_unmark_all: 2D1A */ -/* function ia_css_tagger_buf_sp_unmark_from_start: 2BCF */ +/* function ia_css_tagger_buf_sp_unmark_from_start: 2D5B */ -/* function ia_css_dmaproxy_sp_channel_acquire: 34CC */ +/* function ia_css_dmaproxy_sp_channel_acquire: 36AA */ -/* function ia_css_rmgr_sp_add_num_vbuf: 64CD */ +/* function ia_css_rmgr_sp_add_num_vbuf: 66A3 */ -/* function ia_css_isys_sp_token_map_create: 60DD */ +/* function ia_css_isys_sp_token_map_create: 62B3 */ -/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 319C */ +/* function __ia_css_dmaproxy_sp_wait_for_ack_text: 3365 */ -/* function ia_css_tagger_sp_acquire_buf_elem: 1FF4 */ +/* function ia_css_tagger_sp_acquire_buf_elem: 202E */ -/* function ia_css_bufq_sp_is_dynamic_buffer: 3085 */ +/* function ia_css_bufq_sp_is_dynamic_buffer: 3211 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_group #define HIVE_MEM_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_group 0x4208 -#define HIVE_SIZE_sp_group 1144 +#define HIVE_ADDR_sp_group 0x420C +#define HIVE_SIZE_sp_group 1184 #else #endif #endif #define HIVE_MEM_sp_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_group 0x4208 -#define HIVE_SIZE_sp_sp_group 1144 +#define HIVE_ADDR_sp_sp_group 0x420C +#define HIVE_SIZE_sp_sp_group 1184 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_event_proxy_thread #define HIVE_MEM_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_event_proxy_thread 0x4954 +#define HIVE_ADDR_sp_event_proxy_thread 0x4980 #define HIVE_SIZE_sp_event_proxy_thread 68 #else #endif #endif #define HIVE_MEM_sp_sp_event_proxy_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_event_proxy_thread 0x4954 +#define HIVE_ADDR_sp_sp_event_proxy_thread 0x4980 #define HIVE_SIZE_sp_sp_event_proxy_thread 68 -/* function ia_css_thread_sp_kill: CD6 */ +/* function ia_css_thread_sp_kill: CE1 */ -/* function ia_css_tagger_sp_create: 28BB */ +/* function ia_css_tagger_sp_create: 2A3B */ -/* function tmpmem_acquire_dmem: 657A */ +/* function tmpmem_acquire_dmem: 6750 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_MMU_BASE @@ -1088,41 +1080,41 @@ #define HIVE_ADDR_sp_MMU_BASE 0x24 #define HIVE_SIZE_sp_MMU_BASE 8 -/* function ia_css_dmaproxy_sp_channel_release: 34B8 */ +/* function ia_css_dmaproxy_sp_channel_release: 3696 */ -/* function ia_css_dmaproxy_sp_is_idle: 3498 */ +/* function ia_css_dmaproxy_sp_is_idle: 3676 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_qos_start #define HIVE_MEM_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_qos_start 0x477C +#define HIVE_ADDR_sem_for_qos_start 0x47A8 #define HIVE_SIZE_sem_for_qos_start 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_qos_start scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_qos_start 0x477C +#define HIVE_ADDR_sp_sem_for_qos_start 0x47A8 #define HIVE_SIZE_sp_sem_for_qos_start 20 -/* function isp_hmem_load: B55 */ +/* function isp_hmem_load: B60 */ -/* function ia_css_tagger_sp_release_buf_elem: 1FD0 */ +/* function ia_css_tagger_sp_release_buf_elem: 200A */ -/* function ia_css_eventq_sp_send: 350E */ +/* function ia_css_eventq_sp_send: 36EC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_isys_sp_error_cnt #define HIVE_MEM_ia_css_isys_sp_error_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_isys_sp_error_cnt 0x62D4 +#define HIVE_ADDR_ia_css_isys_sp_error_cnt 0x6300 #define HIVE_SIZE_ia_css_isys_sp_error_cnt 16 #else #endif #endif #define HIVE_MEM_sp_ia_css_isys_sp_error_cnt scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_isys_sp_error_cnt 0x62D4 +#define HIVE_ADDR_sp_ia_css_isys_sp_error_cnt 0x6300 #define HIVE_SIZE_sp_ia_css_isys_sp_error_cnt 16 -/* function ia_css_tagger_buf_sp_unlock_from_start: 2ABE */ +/* function ia_css_tagger_buf_sp_unlock_from_start: 2C4A */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_debug_buffer_ddr_address @@ -1136,34 +1128,38 @@ #define HIVE_ADDR_sp_debug_buffer_ddr_address 0xBC #define HIVE_SIZE_sp_debug_buffer_ddr_address 4 -/* function sp_isys_copy_request: 714 */ +/* function sp_isys_copy_request: 6B9 */ -/* function ia_css_rmgr_sp_refcount_retain_vbuf: 635D */ +/* function ia_css_rmgr_sp_refcount_retain_vbuf: 6533 */ -/* function ia_css_thread_sp_set_priority: CCE */ +/* function ia_css_thread_sp_set_priority: CD9 */ -/* function sizeof_hmem: BFC */ +/* function sizeof_hmem: C07 */ -/* function tmpmem_release_dmem: 6569 */ +/* function tmpmem_release_dmem: 673F */ /* function cnd_input_system_cfg: 392 */ -/* function __ia_css_sp_rawcopy_func_critical: 6F65 */ +/* function __ia_css_sp_rawcopy_func_critical: 715D */ + +/* function __ia_css_dmaproxy_sp_process_text: 3309 */ -/* function ia_css_dmaproxy_sp_set_width_exception: 331D */ +/* function ia_css_dmaproxy_sp_set_width_exception: 34FB */ -/* function sp_event_assert: 8B1 */ +/* function sp_event_assert: 856 */ -/* function ia_css_flash_sp_init_internal_params: 2CA9 */ +/* function ia_css_flash_sp_init_internal_params: 2E35 */ -/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 29C4 */ +/* function ia_css_tagger_buf_sp_pop_unmarked_and_unlocked: 2B50 */ -/* function __modu: 68BB */ +/* function __modu: 6AC9 */ -/* function ia_css_dmaproxy_sp_init_isp_vector: 31A2 */ +/* function ia_css_dmaproxy_sp_init_isp_vector: 336B */ /* function isp_vamem_store: 0 */ +/* function ia_css_tagger_sp_set_copy_pipe: 2A32 */ + #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_GDC_BASE #define HIVE_MEM_GDC_BASE scalar_processor_2400_dmem @@ -1176,22 +1172,22 @@ #define HIVE_ADDR_sp_GDC_BASE 0x44 #define HIVE_SIZE_sp_GDC_BASE 8 -/* function ia_css_queue_local_init: 4C27 */ +/* function ia_css_queue_local_init: 4E2C */ -/* function sp_event_proxy_callout_func: 6988 */ +/* function sp_event_proxy_callout_func: 6B96 */ -/* function qos_scheduler_schedule_stage: 65C1 */ +/* function qos_scheduler_schedule_stage: 67AA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_thread_sp_num_ready_threads #define HIVE_MEM_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x49E0 +#define HIVE_ADDR_ia_css_thread_sp_num_ready_threads 0x4A0C #define HIVE_SIZE_ia_css_thread_sp_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_thread_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x49E0 +#define HIVE_ADDR_sp_ia_css_thread_sp_num_ready_threads 0x4A0C #define HIVE_SIZE_sp_ia_css_thread_sp_num_ready_threads 4 #ifndef HIVE_MULTIPLE_PROGRAMS @@ -1206,29 +1202,31 @@ #define HIVE_ADDR_sp_sp_threads_stack_size 0x180 #define HIVE_SIZE_sp_sp_threads_stack_size 28 -/* function ia_css_ispctrl_sp_isp_done_row_striping: 3F48 */ +/* function ia_css_ispctrl_sp_isp_done_row_striping: 4132 */ + +/* function __ia_css_isys_sp_isr_text: 5FF8 */ -/* function __ia_css_isys_sp_isr_text: 5E22 */ +/* function ia_css_queue_dequeue: 4CAA */ -/* function ia_css_queue_dequeue: 4AA5 */ +/* function is_qos_standalone_mode: 6785 */ -/* function ia_css_dmaproxy_sp_configure_channel: 6E4C */ +/* function ia_css_dmaproxy_sp_configure_channel: 702B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_current_thread_fiber_sp #define HIVE_MEM_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_current_thread_fiber_sp 0x49E8 +#define HIVE_ADDR_current_thread_fiber_sp 0x4A14 #define HIVE_SIZE_current_thread_fiber_sp 4 #else #endif #endif #define HIVE_MEM_sp_current_thread_fiber_sp scalar_processor_2400_dmem -#define HIVE_ADDR_sp_current_thread_fiber_sp 0x49E8 +#define HIVE_ADDR_sp_current_thread_fiber_sp 0x4A14 #define HIVE_SIZE_sp_current_thread_fiber_sp 4 -/* function ia_css_circbuf_pop: FD8 */ +/* function ia_css_circbuf_pop: FE3 */ -/* function memset: 693A */ +/* function memset: 6B48 */ /* function irq_raise_set_token: B6 */ @@ -1244,83 +1242,85 @@ #define HIVE_ADDR_sp_GPIO_BASE 0x3C #define HIVE_SIZE_sp_GPIO_BASE 4 -/* function ia_css_pipeline_acc_stage_enable: 17F0 */ +/* function ia_css_pipeline_acc_stage_enable: 1802 */ -/* function ia_css_tagger_sp_unlock_exp_id: 2041 */ +/* function ia_css_tagger_sp_unlock_exp_id: 207B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_ph #define HIVE_MEM_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_isp_ph 0x62E4 +#define HIVE_ADDR_isp_ph 0x6310 #define HIVE_SIZE_isp_ph 28 #else #endif #endif #define HIVE_MEM_sp_isp_ph scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_ph 0x62E4 +#define HIVE_ADDR_sp_isp_ph 0x6310 #define HIVE_SIZE_sp_isp_ph 28 -/* function ia_css_isys_sp_token_map_flush: 6022 */ +/* function ia_css_isys_sp_token_map_flush: 61F8 */ -/* function ia_css_ispctrl_sp_init_ds: 37CB */ +/* function ia_css_ispctrl_sp_init_ds: 39B7 */ -/* function get_xmem_base_addr_raw: 3B78 */ +/* function get_xmem_base_addr_raw: 3D62 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_param #define HIVE_MEM_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_param 0x4790 +#define HIVE_ADDR_sp_all_cbs_param 0x47BC #define HIVE_SIZE_sp_all_cbs_param 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_param scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_param 0x4790 +#define HIVE_ADDR_sp_sp_all_cbs_param 0x47BC #define HIVE_SIZE_sp_sp_all_cbs_param 16 -/* function ia_css_circbuf_create: 1026 */ +/* function ia_css_circbuf_create: 1031 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_sp_group #define HIVE_MEM_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_sp_group 0x47A0 +#define HIVE_ADDR_sem_for_sp_group 0x47CC #define HIVE_SIZE_sem_for_sp_group 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_sp_group scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_sp_group 0x47A0 +#define HIVE_ADDR_sp_sem_for_sp_group 0x47CC #define HIVE_SIZE_sp_sem_for_sp_group 20 -/* function ia_css_framebuf_sp_wait_for_in_frame: 64F8 */ +/* function __ia_css_dmaproxy_sp_configure_channel_text: 34DA */ -/* function ia_css_sp_rawcopy_tag_frame: 5588 */ +/* function ia_css_framebuf_sp_wait_for_in_frame: 66CE */ -/* function isp_hmem_clear: B25 */ +/* function ia_css_sp_rawcopy_tag_frame: 5770 */ -/* function ia_css_framebuf_sp_release_in_frame: 653B */ +/* function isp_hmem_clear: B30 */ -/* function ia_css_isys_sp_backend_snd_acquire_request: 5A78 */ +/* function ia_css_framebuf_sp_release_in_frame: 6711 */ -/* function ia_css_isys_sp_token_map_is_full: 5EA9 */ +/* function ia_css_isys_sp_backend_snd_acquire_request: 5C4E */ -/* function input_system_acquisition_run: AF9 */ +/* function ia_css_isys_sp_token_map_is_full: 607F */ -/* function ia_css_ispctrl_sp_start_binary: 364A */ +/* function input_system_acquisition_run: B04 */ + +/* function ia_css_ispctrl_sp_start_binary: 3836 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs #define HIVE_MEM_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x58F4 +#define HIVE_ADDR_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x5920 #define HIVE_SIZE_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x58F4 +#define HIVE_ADDR_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 0x5920 #define HIVE_SIZE_sp_ia_css_bufq_sp_h_pipe_private_ddr_ptrs 20 -/* function ia_css_eventq_sp_recv: 34E0 */ +/* function ia_css_eventq_sp_recv: 36BE */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_pool @@ -1334,9 +1334,11 @@ #define HIVE_ADDR_sp_isp_pool 0x2E8 #define HIVE_SIZE_sp_isp_pool 4 -/* function ia_css_rmgr_sp_rel_gen: 622A */ +/* function ia_css_rmgr_sp_rel_gen: 6400 */ + +/* function ia_css_tagger_sp_unblock_clients: 2903 */ -/* function css_get_frame_processing_time_end: 1FC0 */ +/* function css_get_frame_processing_time_end: 1FFA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_event_any_pending_mask @@ -1350,15 +1352,15 @@ #define HIVE_ADDR_sp_event_any_pending_mask 0x300 #define HIVE_SIZE_sp_event_any_pending_mask 8 -/* function ia_css_isys_sp_backend_push: 5A2F */ +/* function ia_css_isys_sp_backend_push: 5C05 */ /* function sh_css_decode_tag_descr: 352 */ /* function debug_enqueue_isp: 27B */ -/* function qos_scheduler_update_stage_budget: 65AF */ +/* function qos_scheduler_update_stage_budget: 678D */ -/* function ia_css_spctrl_sp_uninit: 596A */ +/* function ia_css_spctrl_sp_uninit: 5B40 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SWITCH_CODE @@ -1375,34 +1377,34 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs #define HIVE_MEM_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x5908 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_dis_bufs 0x5934 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_dis_bufs 140 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_dis_bufs scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x5908 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_dis_bufs 0x5934 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_dis_bufs 140 -/* function ia_css_tagger_buf_sp_lock_from_start: 2AF2 */ +/* function ia_css_tagger_buf_sp_lock_from_start: 2C7E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_isp_idle #define HIVE_MEM_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_isp_idle 0x47B4 +#define HIVE_ADDR_sem_for_isp_idle 0x47E0 #define HIVE_SIZE_sem_for_isp_idle 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_isp_idle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_isp_idle 0x47B4 +#define HIVE_ADDR_sp_sem_for_isp_idle 0x47E0 #define HIVE_SIZE_sp_sem_for_isp_idle 20 -/* function ia_css_dmaproxy_sp_write_byte_addr: 31FF */ +/* function ia_css_dmaproxy_sp_write_byte_addr: 33C8 */ -/* function ia_css_dmaproxy_sp_init: 3176 */ +/* function ia_css_dmaproxy_sp_init: 333F */ -/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 2D7B */ +/* function ia_css_bufq_sp_release_dynamic_buf_clock_tick: 2F07 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_VAMEM_BASE @@ -1419,46 +1421,46 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_rawcopy_sp_tagger #define HIVE_MEM_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x6294 +#define HIVE_ADDR_ia_css_rawcopy_sp_tagger 0x62C0 #define HIVE_SIZE_ia_css_rawcopy_sp_tagger 24 #else #endif #endif #define HIVE_MEM_sp_ia_css_rawcopy_sp_tagger scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x6294 +#define HIVE_ADDR_sp_ia_css_rawcopy_sp_tagger 0x62C0 #define HIVE_SIZE_sp_ia_css_rawcopy_sp_tagger 24 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids #define HIVE_MEM_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x5994 +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_exp_ids 0x59C0 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_exp_ids 70 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_exp_ids scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x5994 +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_exp_ids 0x59C0 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_exp_ids 70 -/* function ia_css_queue_item_load: 4D19 */ +/* function ia_css_queue_item_load: 4F1E */ -/* function ia_css_spctrl_sp_get_state: 5955 */ +/* function ia_css_spctrl_sp_get_state: 5B2B */ -/* function ia_css_isys_sp_token_map_uninit: 603F */ +/* function ia_css_isys_sp_token_map_uninit: 6215 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_callout_sp_thread #define HIVE_MEM_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_callout_sp_thread 0x49DC +#define HIVE_ADDR_callout_sp_thread 0x4A08 #define HIVE_SIZE_callout_sp_thread 4 #else #endif #endif #define HIVE_MEM_sp_callout_sp_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_callout_sp_thread 0x49DC +#define HIVE_ADDR_sp_callout_sp_thread 0x4A08 #define HIVE_SIZE_sp_callout_sp_thread 4 -/* function thread_fiber_sp_init: E2F */ +/* function thread_fiber_sp_init: E3A */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_SP_PMEM_BASE @@ -1472,53 +1474,53 @@ #define HIVE_ADDR_sp_SP_PMEM_BASE 0x0 #define HIVE_SIZE_sp_SP_PMEM_BASE 4 -/* function ia_css_isys_sp_token_map_snd_acquire_req: 5FAF */ +/* function ia_css_isys_sp_token_map_snd_acquire_req: 6185 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_input_stream_format #define HIVE_MEM_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_input_stream_format 0x40F8 +#define HIVE_ADDR_sp_isp_input_stream_format 0x40FC #define HIVE_SIZE_sp_isp_input_stream_format 20 #else #endif #endif #define HIVE_MEM_sp_sp_isp_input_stream_format scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x40F8 +#define HIVE_ADDR_sp_sp_isp_input_stream_format 0x40FC #define HIVE_SIZE_sp_sp_isp_input_stream_format 20 -/* function __mod: 68A7 */ +/* function __mod: 6AB5 */ -/* function ia_css_dmaproxy_sp_init_dmem_channel: 3260 */ +/* function ia_css_dmaproxy_sp_init_dmem_channel: 3429 */ -/* function ia_css_thread_sp_join: CFF */ +/* function ia_css_thread_sp_join: D0A */ -/* function ia_css_dmaproxy_sp_add_command: 6F4F */ +/* function ia_css_dmaproxy_sp_add_command: 711D */ -/* function ia_css_sp_metadata_thread_func: 5809 */ +/* function ia_css_sp_metadata_thread_func: 59DF */ -/* function __sp_event_proxy_func_critical: 6975 */ +/* function __sp_event_proxy_func_critical: 6B83 */ -/* function ia_css_sp_metadata_wait: 591C */ +/* function ia_css_sp_metadata_wait: 5AF2 */ -/* function ia_css_circbuf_peek_from_start: F08 */ +/* function ia_css_circbuf_peek_from_start: F13 */ -/* function ia_css_event_sp_encode: 356B */ +/* function ia_css_event_sp_encode: 3749 */ -/* function ia_css_thread_sp_run: D72 */ +/* function ia_css_thread_sp_run: D7D */ -/* function sp_isys_copy_func: 6F6 */ +/* function sp_isys_copy_func: 69B */ -/* function ia_css_isys_sp_backend_flush: 5A98 */ +/* function ia_css_isys_sp_backend_flush: 5C6E */ -/* function ia_css_isys_sp_backend_frame_exists: 59B4 */ +/* function ia_css_isys_sp_backend_frame_exists: 5B8A */ -/* function ia_css_sp_isp_param_init_isp_memories: 47A2 */ +/* function ia_css_sp_isp_param_init_isp_memories: 49D1 */ -/* function register_isr: 8A9 */ +/* function register_isr: 84E */ /* function irq_raise: C8 */ -/* function ia_css_dmaproxy_sp_mmu_invalidate: 313D */ +/* function ia_css_dmaproxy_sp_mmu_invalidate: 32CF */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_HIVE_IF_SRST_ADDRESS @@ -1532,27 +1534,27 @@ #define HIVE_ADDR_sp_HIVE_IF_SRST_ADDRESS 0x1B8 #define HIVE_SIZE_sp_HIVE_IF_SRST_ADDRESS 16 -/* function pipeline_sp_initialize_stage: 1924 */ +/* function pipeline_sp_initialize_stage: 1948 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_isys_sp_frontend_states #define HIVE_MEM_ia_css_isys_sp_frontend_states scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_isys_sp_frontend_states 0x62C8 +#define HIVE_ADDR_ia_css_isys_sp_frontend_states 0x62F4 #define HIVE_SIZE_ia_css_isys_sp_frontend_states 12 #else #endif #endif #define HIVE_MEM_sp_ia_css_isys_sp_frontend_states scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_isys_sp_frontend_states 0x62C8 +#define HIVE_ADDR_sp_ia_css_isys_sp_frontend_states 0x62F4 #define HIVE_SIZE_sp_ia_css_isys_sp_frontend_states 12 -/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 6E1E */ +/* function ia_css_dmaproxy_sp_read_byte_addr_mmio: 6FFD */ -/* function ia_css_ispctrl_sp_done_ds: 37B2 */ +/* function ia_css_ispctrl_sp_done_ds: 399E */ -/* function ia_css_sp_isp_param_get_mem_inits: 477D */ +/* function ia_css_sp_isp_param_get_mem_inits: 49AC */ -/* function ia_css_parambuf_sp_init_buffer_queues: 13D0 */ +/* function ia_css_parambuf_sp_init_buffer_queues: 13DB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_pfp_spref @@ -1566,7 +1568,7 @@ #define HIVE_ADDR_sp_vbuf_pfp_spref 0x2F0 #define HIVE_SIZE_sp_vbuf_pfp_spref 4 -/* function input_system_cfg: ABB */ +/* function input_system_cfg: AC6 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_HMEM_BASE @@ -1583,134 +1585,134 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_pipe_private_frames #define HIVE_MEM_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x59DC +#define HIVE_ADDR_ia_css_bufq_sp_pipe_private_frames 0x5A08 #define HIVE_SIZE_ia_css_bufq_sp_pipe_private_frames 280 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_pipe_private_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x59DC +#define HIVE_ADDR_sp_ia_css_bufq_sp_pipe_private_frames 0x5A08 #define HIVE_SIZE_sp_ia_css_bufq_sp_pipe_private_frames 280 -/* function qos_scheduler_init_stage_budget: 65E8 */ +/* function qos_scheduler_init_stage_budget: 67EB */ -/* function ia_css_isys_sp_backend_release: 5B0D */ +/* function ia_css_isys_sp_backend_release: 5CE3 */ -/* function ia_css_isys_sp_backend_destroy: 5B37 */ +/* function ia_css_isys_sp_backend_destroy: 5D0D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp2host_buffer_queue_handle #define HIVE_MEM_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp2host_buffer_queue_handle 0x5AF4 +#define HIVE_ADDR_sp2host_buffer_queue_handle 0x5B20 #define HIVE_SIZE_sp2host_buffer_queue_handle 96 #else #endif #endif #define HIVE_MEM_sp_sp2host_buffer_queue_handle scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x5AF4 +#define HIVE_ADDR_sp_sp2host_buffer_queue_handle 0x5B20 #define HIVE_SIZE_sp_sp2host_buffer_queue_handle 96 -/* function ia_css_isys_sp_token_map_check_mipi_frame_size: 5F73 */ +/* function ia_css_isys_sp_token_map_check_mipi_frame_size: 6149 */ -/* function ia_css_ispctrl_sp_init_isp_vars: 449C */ +/* function ia_css_ispctrl_sp_init_isp_vars: 469E */ -/* function ia_css_isys_sp_frontend_has_empty_mipi_buffer_cb: 5B89 */ +/* function ia_css_isys_sp_frontend_has_empty_mipi_buffer_cb: 5D5F */ -/* function sp_warning: 8DC */ +/* function sp_warning: 881 */ -/* function ia_css_rmgr_sp_vbuf_enqueue: 631D */ +/* function ia_css_rmgr_sp_vbuf_enqueue: 64F3 */ -/* function ia_css_tagger_sp_tag_exp_id: 215B */ +/* function ia_css_tagger_sp_tag_exp_id: 2195 */ -/* function ia_css_dmaproxy_sp_write: 3216 */ +/* function ia_css_dmaproxy_sp_write: 33DF */ -/* function ia_css_parambuf_sp_release_in_param: 1250 */ +/* function ia_css_parambuf_sp_release_in_param: 125B */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_irq_sw_interrupt_token #define HIVE_MEM_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_irq_sw_interrupt_token 0x40F4 +#define HIVE_ADDR_irq_sw_interrupt_token 0x40F8 #define HIVE_SIZE_irq_sw_interrupt_token 4 #else #endif #endif #define HIVE_MEM_sp_irq_sw_interrupt_token scalar_processor_2400_dmem -#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x40F4 +#define HIVE_ADDR_sp_irq_sw_interrupt_token 0x40F8 #define HIVE_SIZE_sp_irq_sw_interrupt_token 4 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_isp_addresses #define HIVE_MEM_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_addresses 0x5F44 +#define HIVE_ADDR_sp_isp_addresses 0x5F74 #define HIVE_SIZE_sp_isp_addresses 172 #else #endif #endif #define HIVE_MEM_sp_sp_isp_addresses scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_isp_addresses 0x5F44 +#define HIVE_ADDR_sp_sp_isp_addresses 0x5F74 #define HIVE_SIZE_sp_sp_isp_addresses 172 -/* function ia_css_rmgr_sp_acq_gen: 6242 */ +/* function ia_css_rmgr_sp_acq_gen: 6418 */ -/* function receiver_reg_load: AD0 */ +/* function receiver_reg_load: ADB */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isps #define HIVE_MEM_isps scalar_processor_2400_dmem -#define HIVE_ADDR_isps 0x6300 +#define HIVE_ADDR_isps 0x632C #define HIVE_SIZE_isps 28 #else #endif #endif #define HIVE_MEM_sp_isps scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isps 0x6300 +#define HIVE_ADDR_sp_isps 0x632C #define HIVE_SIZE_sp_isps 28 #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_host_sp_queues_initialized #define HIVE_MEM_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_host_sp_queues_initialized 0x410C +#define HIVE_ADDR_host_sp_queues_initialized 0x4110 #define HIVE_SIZE_host_sp_queues_initialized 4 #else #endif #endif #define HIVE_MEM_sp_host_sp_queues_initialized scalar_processor_2400_dmem -#define HIVE_ADDR_sp_host_sp_queues_initialized 0x410C +#define HIVE_ADDR_sp_host_sp_queues_initialized 0x4110 #define HIVE_SIZE_sp_host_sp_queues_initialized 4 -/* function ia_css_queue_uninit: 4BE5 */ +/* function ia_css_queue_uninit: 4DEA */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_ispctrl_sp_isp_started #define HIVE_MEM_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x5BFC +#define HIVE_ADDR_ia_css_ispctrl_sp_isp_started 0x5C28 #define HIVE_SIZE_ia_css_ispctrl_sp_isp_started 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_ispctrl_sp_isp_started scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x5BFC +#define HIVE_ADDR_sp_ia_css_ispctrl_sp_isp_started 0x5C28 #define HIVE_SIZE_sp_ia_css_ispctrl_sp_isp_started 4 -/* function ia_css_bufq_sp_release_dynamic_buf: 2DE7 */ +/* function ia_css_bufq_sp_release_dynamic_buf: 2F73 */ -/* function ia_css_dmaproxy_sp_set_height_exception: 330E */ +/* function ia_css_dmaproxy_sp_set_height_exception: 34EC */ -/* function ia_css_dmaproxy_sp_init_vmem_channel: 3293 */ +/* function ia_css_dmaproxy_sp_init_vmem_channel: 345D */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_num_ready_threads #define HIVE_MEM_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_num_ready_threads 0x49E4 +#define HIVE_ADDR_num_ready_threads 0x4A10 #define HIVE_SIZE_num_ready_threads 4 #else #endif #endif #define HIVE_MEM_sp_num_ready_threads scalar_processor_2400_dmem -#define HIVE_ADDR_sp_num_ready_threads 0x49E4 +#define HIVE_ADDR_sp_num_ready_threads 0x4A10 #define HIVE_SIZE_sp_num_ready_threads 4 -/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 31E8 */ +/* function ia_css_dmaproxy_sp_write_byte_addr_mmio: 33B1 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_vbuf_spref @@ -1727,64 +1729,64 @@ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_metadata_thread #define HIVE_MEM_sp_metadata_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_metadata_thread 0x4998 +#define HIVE_ADDR_sp_metadata_thread 0x49C4 #define HIVE_SIZE_sp_metadata_thread 68 #else #endif #endif #define HIVE_MEM_sp_sp_metadata_thread scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_metadata_thread 0x4998 +#define HIVE_ADDR_sp_sp_metadata_thread 0x49C4 #define HIVE_SIZE_sp_sp_metadata_thread 68 -/* function ia_css_queue_enqueue: 4B2F */ +/* function ia_css_queue_enqueue: 4D34 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_request #define HIVE_MEM_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_request 0x4A98 +#define HIVE_ADDR_ia_css_flash_sp_request 0x4AC4 #define HIVE_SIZE_ia_css_flash_sp_request 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_request scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x4A98 +#define HIVE_ADDR_sp_ia_css_flash_sp_request 0x4AC4 #define HIVE_SIZE_sp_ia_css_flash_sp_request 4 -/* function ia_css_dmaproxy_sp_vmem_write: 31B9 */ +/* function ia_css_dmaproxy_sp_vmem_write: 3382 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_tagger_frames #define HIVE_MEM_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_tagger_frames 0x49EC +#define HIVE_ADDR_tagger_frames 0x4A18 #define HIVE_SIZE_tagger_frames 168 #else #endif #endif #define HIVE_MEM_sp_tagger_frames scalar_processor_2400_dmem -#define HIVE_ADDR_sp_tagger_frames 0x49EC +#define HIVE_ADDR_sp_tagger_frames 0x4A18 #define HIVE_SIZE_sp_tagger_frames 168 -/* function ia_css_isys_sp_token_map_snd_capture_req: 5FD1 */ +/* function ia_css_isys_sp_token_map_snd_capture_req: 61A7 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_reading_if #define HIVE_MEM_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_reading_if 0x47C8 +#define HIVE_ADDR_sem_for_reading_if 0x47F4 #define HIVE_SIZE_sem_for_reading_if 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_reading_if scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_reading_if 0x47C8 +#define HIVE_ADDR_sp_sem_for_reading_if 0x47F4 #define HIVE_SIZE_sp_sem_for_reading_if 20 -/* function sp_generate_interrupts: 95B */ +/* function sp_generate_interrupts: 900 */ -/* function ia_css_pipeline_sp_start: 1837 */ +/* function ia_css_pipeline_sp_start: 185B */ -/* function ia_css_sp_rawcopy_init: 510C */ +/* function ia_css_sp_rawcopy_init: 5311 */ -/* function tmr_clock_read: 13F1 */ +/* function tmr_clock_read: 13FC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_BAMEM_BASE @@ -1798,55 +1800,55 @@ #define HIVE_ADDR_sp_ISP_BAMEM_BASE 0x2F8 #define HIVE_SIZE_sp_ISP_BAMEM_BASE 4 -/* function ia_css_isys_sp_frontend_rcv_capture_ack: 5C38 */ +/* function ia_css_isys_sp_frontend_rcv_capture_ack: 5E0E */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues #define HIVE_MEM_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B54 +#define HIVE_ADDR_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B80 #define HIVE_SIZE_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 #else #endif #endif #define HIVE_MEM_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B54 +#define HIVE_ADDR_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 0x5B80 #define HIVE_SIZE_sp_ia_css_bufq_sp_sems_for_sp2host_buf_queues 160 -/* function css_get_frame_processing_time_start: 1FC8 */ +/* function css_get_frame_processing_time_start: 2002 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_all_cbs_frame #define HIVE_MEM_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_all_cbs_frame 0x47DC +#define HIVE_ADDR_sp_all_cbs_frame 0x4808 #define HIVE_SIZE_sp_all_cbs_frame 16 #else #endif #endif #define HIVE_MEM_sp_sp_all_cbs_frame scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_all_cbs_frame 0x47DC +#define HIVE_ADDR_sp_sp_all_cbs_frame 0x4808 #define HIVE_SIZE_sp_sp_all_cbs_frame 16 -/* function thread_sp_queue_print: D8F */ +/* function thread_sp_queue_print: D9A */ -/* function sp_notify_eof: 907 */ +/* function sp_notify_eof: 8AC */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sem_for_str2mem #define HIVE_MEM_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sem_for_str2mem 0x47EC +#define HIVE_ADDR_sem_for_str2mem 0x4818 #define HIVE_SIZE_sem_for_str2mem 20 #else #endif #endif #define HIVE_MEM_sp_sem_for_str2mem scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sem_for_str2mem 0x47EC +#define HIVE_ADDR_sp_sem_for_str2mem 0x4818 #define HIVE_SIZE_sp_sem_for_str2mem 20 -/* function ia_css_tagger_buf_sp_is_marked_from_start: 2B5A */ +/* function ia_css_tagger_buf_sp_is_marked_from_start: 2CE6 */ -/* function ia_css_bufq_sp_acquire_dynamic_buf: 2F9F */ +/* function ia_css_bufq_sp_acquire_dynamic_buf: 312B */ -/* function ia_css_circbuf_destroy: 101D */ +/* function ia_css_circbuf_destroy: 1028 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ISP_PMEM_BASE @@ -1860,43 +1862,43 @@ #define HIVE_ADDR_sp_ISP_PMEM_BASE 0xC #define HIVE_SIZE_sp_ISP_PMEM_BASE 4 -/* function ia_css_sp_isp_param_mem_load: 4710 */ +/* function ia_css_sp_isp_param_mem_load: 493F */ -/* function ia_css_tagger_buf_sp_pop_from_start: 2946 */ +/* function ia_css_tagger_buf_sp_pop_from_start: 2AD2 */ -/* function __div: 685F */ +/* function __div: 6A6D */ -/* function ia_css_isys_sp_frontend_create: 5E09 */ +/* function ia_css_isys_sp_frontend_create: 5FDF */ -/* function ia_css_rmgr_sp_refcount_release_vbuf: 633C */ +/* function ia_css_rmgr_sp_refcount_release_vbuf: 6512 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_ia_css_flash_sp_in_use #define HIVE_MEM_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_ia_css_flash_sp_in_use 0x4A9C +#define HIVE_ADDR_ia_css_flash_sp_in_use 0x4AC8 #define HIVE_SIZE_ia_css_flash_sp_in_use 4 #else #endif #endif #define HIVE_MEM_sp_ia_css_flash_sp_in_use scalar_processor_2400_dmem -#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x4A9C +#define HIVE_ADDR_sp_ia_css_flash_sp_in_use 0x4AC8 #define HIVE_SIZE_sp_ia_css_flash_sp_in_use 4 -/* function ia_css_thread_sem_sp_wait: 6B42 */ +/* function ia_css_thread_sem_sp_wait: 6D50 */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_sp_sleep_mode #define HIVE_MEM_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sleep_mode 0x4110 +#define HIVE_ADDR_sp_sleep_mode 0x4114 #define HIVE_SIZE_sp_sleep_mode 4 #else #endif #endif #define HIVE_MEM_sp_sp_sleep_mode scalar_processor_2400_dmem -#define HIVE_ADDR_sp_sp_sleep_mode 0x4110 +#define HIVE_ADDR_sp_sp_sleep_mode 0x4114 #define HIVE_SIZE_sp_sp_sleep_mode 4 -/* function ia_css_tagger_buf_sp_push: 2A55 */ +/* function ia_css_tagger_buf_sp_push: 2BE1 */ /* function mmu_invalidate_cache: D3 */ @@ -1912,22 +1914,20 @@ #define HIVE_ADDR_sp_sp_max_cb_elems 0x148 #define HIVE_SIZE_sp_sp_max_cb_elems 8 -/* function ia_css_queue_remote_init: 4C07 */ +/* function ia_css_queue_remote_init: 4E0C */ #ifndef HIVE_MULTIPLE_PROGRAMS #ifndef HIVE_MEM_isp_stop_req #define HIVE_MEM_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_isp_stop_req 0x4680 +#define HIVE_ADDR_isp_stop_req 0x46AC #define HIVE_SIZE_isp_stop_req 4 #else #endif #endif #define HIVE_MEM_sp_isp_stop_req scalar_processor_2400_dmem -#define HIVE_ADDR_sp_isp_stop_req 0x4680 +#define HIVE_ADDR_sp_isp_stop_req 0x46AC #define HIVE_SIZE_sp_isp_stop_req 4 -#define HIVE_ICACHE_sp_critical_SEGMENT_START 0 -#define HIVE_ICACHE_sp_critical_NUM_SEGMENTS 1 #endif /* _sp_map_h_ */ extern void sh_css_dump_sp_dmem(void); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_api_version.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_api_version.h index 88d89ec..cbad49c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_api_version.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_api_version.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -35,7 +35,7 @@ The version string has four dot-separated numbers, read left to right: */ -#define CSS_API_VERSION_STRING "2.1.15.3" +#define CSS_API_VERSION_STRING "2.1.20.4" /* Change log @@ -144,38 +144,42 @@ v2.1.5.1, exposure IDs per stream - added MIN/MAX exposure ID macros - made exposure ID sequence per-stream instead of global (across all streams) +v2.1.5.1, Add parameters to mmgr routines via a macro. +- Replaced mmgr funtions with macros to add caller func name + line #. +- This is done to help debug memory access issues, allocation issues, etc. + v2.1.6.0, Interface for vertical output flip - add new interface to enable vertical output flipping - rename ia_css_output_config.enable_mirror -v2.1.6.1, Effective res on pipe +v2.1.6.1 (1 changes parallel), Effective res on pipe - Added input_effective_res to struct ia_css_pipe_config in ia_css_pipe_public.h. -v2.1.6.2, CSS-API version file generated from individual changes +v2.1.6.2 (1 changes parallel), CSS-API version file generated from individual changes - Avoid merge-conflicts by generating version file from individual CSS-API changes. - Parallel CSS-API changes can map to the same version number after this change. - Version numbers for a change could increase due to parallel changes being merged. - The version number would not decrease for a change. -v2.1.6.5 (2 changes parallel), Add SP FW error event +v2.1.6.5 (3 changes parallel), Add SP FW error event - Added FW error event. This gets raised when the SP FW runs into an - error situation from which it cannot recover. -v2.1.6.5 (2 changes parallel), expose bnr FF enable bits in bnr public API +v2.1.6.5 (3 changes parallel), expose bnr FF enable bits in bnr public API - Added ff enable bits to bnr_public_config_dn_detect_ctrl_config_t struct -v2.1.6.5 (2 changes parallel), ISP configuration per pipe +v2.1.6.5 (3 changes parallel), ISP configuration per pipe - Added ISP configuration per pipe support: p_isp_config field in - struct ia_css_pipe_config and ia_css_pipe_set_isp_config_on_pipe - and ia_css_pipe_set_isp_config functions -v2.1.7.0, removed css_version.h +v2.1.7.0 (1 changes parallel), removed css_version.h - Removed css_version.h that was used for versioning in manual (non-CI) releases. -v2.1.7.1, Add helpers (get and set) for ISP cfg per pipe +v2.1.7.1 (1 changes parallel), Add helpers (get and set) for ISP cfg per pipe - Add helpers (get and set) for ISP configuration per pipe -v2.1.7.2, Add feature to lock all RAW buffers +v2.1.7.2 (1 changes parallel), Add feature to lock all RAW buffers - This API change adds a boolean flag (lock_all) in the stream_config struct. - If this flag is set to true, then all frames will be locked if locking is - enabled. By default this flag is set to false. @@ -183,7 +187,7 @@ v2.1.7.2, Add feature to lock all RAW buffers - will be locked. If continuous viewfinder is disabled, the flag should be set - to true. -v2.1.8.0 (2 changes parallel), Various changes to support ACC configuration per pipe +v2.1.8.0 (3 changes parallel), Various changes to support ACC configuration per pipe - Add ia_css_pipe_get_isp_config() - Remove ia_css_pipe_set_isp_config_on_pipe (duplicated - by ia_css_pipe_set_isp_config) @@ -192,147 +196,224 @@ v2.1.8.0 (2 changes parallel), Various changes to support ACC configuration per - Remove ia_css_pipe_isp_config_set() - Remove ia_css_pipe_isp_config_get() -v2.1.8.2 (2 changes parallel), Added member num_invalid_frames to ia_css_pipe_info structure. +v2.1.8.2 (3 changes parallel), Added member num_invalid_frames to ia_css_pipe_info structure. - Added member num_invalid_frames to ia_css_pipe_info structure. - This helps the driver make sure that the first valid output - frame goes into the first user-supplied output buffer. -v2.1.8.4 (2 changes parallel), ISYS EOF timestamp for output buffers +v2.1.8.4 (3 changes parallel), ISYS EOF timestamp for output buffers - driver gets EOF timer to every out frame . ia_css_buffer modified to accomodate same. -v2.1.8.4 (4 changes parallel), display_config +v2.1.8.4 (5 changes parallel), display_config - Added formats- and output config parameters for configuration of the (optional) display output. -v2.1.8.4 (2 changes parallel), Adding zoom region parameters to CSS API +v2.1.8.4 (3 changes parallel), Adding zoom region parameters to CSS API - Adding ia_css_point and ia_css_region structures to css-api. - Adding zoom_region(type ia_css_region) parameter to ia_css_dz_config structure. - By using this user can do the zoom based on zoom region and - the center of the zoom region is not restricted at the center of the input frame. -v2.1.8.6 (1 changes parallel), Add new ia_css_fw_warning type +v2.1.8.6 (2 changes parallel), Add new ia_css_fw_warning type - Add IA_CSS_FW_WARNING_TAG_EXP_ID_FAILED enum to ia_css_fw_warning type - Extend sp_warning() with exp_id parameter -v2.1.8.6 (1 changes parallel), Add includes in GC, GC2 kernel interface files +v2.1.8.6 (2 changes parallel), Add includes in GC, GC2 kernel interface files - add ia_css_ctc_types.h includes in ia_css_gc_types.h and ia_css_gc2_types.h. Needed to get ia_css_vamem_type. -v2.1.9.0 (1 changes parallel), Introduce sp assert event. +v2.1.9.0 (2 changes parallel), Introduce sp assert event. - Add IA_CSS_EVENT_TYPE_FW_ASSERT. The FW sends the event in case an assert goes off. -v2.1.9.1 (1 changes parallel), Exclude driver part from ia_css_buffer.h as it is also used by SP +v2.1.9.1 (2 changes parallel), Exclude driver part from ia_css_buffer.h as it is also used by SP - Excluded driver part of the interface from SP/ISP code - Driver I/F is not affected -v2.1.9.2, added IA_CSS_EVENT_TYPE_TIMER +v2.1.9.2 (1 changes parallel), added IA_CSS_EVENT_TYPE_TIMER - Added a new event called IA_CSS_EVENT_TYPE_TIMER -v2.1.10.0 (4 changes parallel), Add a flag "enable_dpc" to "struct ia_css_pipe_config" +v2.1.10.0 (5 changes parallel), Add a flag "enable_dpc" to "struct ia_css_pipe_config" - Add a flag "enable_dpc" to "struct ia_css_pipe_config" -v2.1.10.6 (6 changes parallel), change the pipe version type from integer to enum +v2.1.10.7 (8 changes parallel), change the pipe version type from integer to enum - add new enum to enumerate ISP pipe version - change the pipe version type in pipe_config from integer to enum -v2.1.13.0 (8 changes parallel), Stop Support for Skycam B0 +v2.1.14.0 (11 changes parallel), Stop Support for Skycam B0 - Remove a few pre-processor defines for Skycam B0/C0 as support -v2.1.14.0 (24 changes parallel), change the pipe version type from integer to enum +v2.1.15.0 (27 changes parallel), change the pipe version type from integer to enum - remove the temporary workaround for backward compatability -v2.1.14.0 (13 changes parallel), expose_gamma_enable_option +v2.1.15.0 (16 changes parallel), expose_gamma_enable_option - added enable param to gamma_corr_public_config - added documentation to rgbpp_public.h -v2.1.14.0 (12 changes parallel), Remove deprecated FW_ERROR event. +v2.1.15.0 (15 changes parallel), Remove deprecated FW_ERROR event. - Remove code for deprecated FW_ERROR event. -v2.1.14.3 (5 changes parallel), fix IEFD's puclic API types +v2.1.15.4 (7 changes parallel), fix IEFD's puclic API types - fix IEFD public API members types: rad_cu6_x1,rad_cu_unsharp_x1 & unsharp_amount -v2.1.14.3 (5 changes parallel), Add IA_CSS_FW_WARNING_FRAME_PARAM_MISMATCH +v2.1.15.4 (7 changes parallel), Add IA_CSS_FW_WARNING_FRAME_PARAM_MISMATCH - Add IA_CSS_FW_WARNING_FRAME_PARAM_MISMATCH enum to ia_css_fw_warning type -v2.1.14.4 (5 changes parallel), new API getter functions for gdc in buffer information +v2.1.15.7 (10 changes parallel), add_flag_to_disable_continous_viewfinder +- add a new flag in stream_config to disable continuous viewfinder +- in ZSL use case. + +v2.1.16.0 (7 changes parallel), revert ia_css_skc_dvs_statistics field size change +- Reverted field size change, change was not ready for driver yet. + +v2.1.17.0 (6 changes parallel), change CSS API to fix the shading correction off-center issue +- update the ia_css_shading_info structure in ia_css_types.h + +v2.1.17.0 (31 changes parallel), add_flag_to_disable_continous_viewfinder_part2 +- remove the old interfaces + +v2.1.17.3 (7 changes parallel), Added public interface for setting the scaler LUT. +- Added the public struct to output system and modified the global config struct. + +v2.1.17.4 (6 changes parallel), Add parameters for new TNR3 component +- Add new parameters for new TNR3 component + +v2.1.17.5 (8 changes parallel), Update skycam DPC_MAX_NUMBER_OF_DP +- Automated tooling requires an API change request +- This change changes the implementation of #define DPC_MAX_NUMBER_OF_DP +- it now returns a different number + +v2.1.17.5 (7 changes parallel), Return an error when both DPC and BDS are enabled in a pipe config +- Return an error when both DPC and BDS are enabled in a pipe config + +v2.1.17.5 (8 changes parallel), new API getter functions for gdc in buffer information - ia_css_pipe_get_dvs_filter() added - ia_css_pipe_get_gdc_in_buffer_info() added -v2.1.14.5 (8 changes parallel), Update CNR2 ineffective values +v2.1.17.6 (11 changes parallel), Update CNR2 ineffective values - Fixed Incorrect ineffective values listed in ia_css_cnr_config - Correct Ineffective value is 8191 -v2.1.14.5 (8 changes parallel), af_roi_api +v2.1.17.6 (11 changes parallel), af_roi_api - added a new function to set AF ROI ia_css_set_af_roi - added a new struct ia_css_s3a_roi_offset -v2.1.14.5 (8 changes parallel), remove x_y_end_from_ae_and_awb +v2.1.17.6 (11 changes parallel), Enlarge AF AWB_FR stats buffers +- Enlarge AF and AWB_FR stats buffers to support max grid width per stripe as oppose to per frame + +v2.1.17.6 (11 changes parallel), remove x_y_end_from_ae_and_awb - added a flag to prepare removal of x_end and y_end from ae grid public config - added a flag to prepare removal of x_end and y_end from awb grid public config -v2.1.14.5 (4 changes parallel), Added public interface for setting the scaler LUT. -- Added the public struct to output system and modified the global config struct. +v2.1.17.7 (4 changes parallel) +- added input_yuv , input_raw to ia_css_binary_info.enable +- struct, these attributes were always there but not saved +- in the binary_info struct -v2.1.14.6 (8 changes parallel), add_flag_to_disable_continous_viewfinder -- add a new flag in stream_config to disable continuous viewfinder -- in ZSL use case. +v2.1.17.8 (5 changes parallel), cleanup_awb_ae_rgb_integration_flags +- this change only cleans up an approved api CR see wikis below -v2.1.14.6 (8 changes parallel), Enlarge AF AWB_FR stats buffers -- Enlarge AF and AWB_FR stats buffers to support max grid width per stripe as oppose to per frame +v2.1.17.9 (5 changes parallel), output_system_input_resolution +- adedd gdc_output_system_in_resolution to pipe config struct + +v2.1.17.9 (4 changes parallel), Per pipe DPC configuration is added to ia_css_isp_parameters +- Per pipe DPC configuration is added to ia_css_isp_parameters -v2.1.14.8 (6 changes parallel), pipe config option for vf output bci mode downscaling +v2.1.17.9 (9 changes parallel), pipe config option for vf output bci mode downscaling - vf downscaling using yuv_scale binary. -v2.1.14.10 (7 changes parallel), Add scale mode GDC V2 LUT to CSS API +v2.1.17.11 (10 changes parallel), Add scale mode GDC V2 LUT to CSS API - Allow client to set global LUT for gdc v2 (First step in this change. See wiki page for more details) -v2.1.14.10 (8 changes parallel), Include added to type-support.h. +v2.1.17.11 (11 changes parallel), Include added to type-support.h. - Include of hive/cell_support.h was added to type-support.h, in order to - have access to define HAVE_STDINT. -v2.1.14.11 (7 changes parallel), Pipe configuration to enable BLI mode downscaling for +v2.1.17.12 (10 changes parallel), Pipe configuration to enable BLI mode downscaling for - BLI mode downscaling for capture post-processing -v2.1.14.14 (9 changes parallel), Fix copyright headers (no functional change) +v2.1.17.14 (7 changes parallel), Add copyright headers to css files +- Add copyright headers to css API files + +v2.1.17.14 (7 changes parallel), add copyright header to include files +- add copyright header to include files + +v2.1.17.14 (7 changes parallel), add copyright header to isp files +- add copyright header to isp files + +v2.1.17.14 (7 changes parallel), add copyright header to refactored code +- add copyright header to refactored code +- (base, camera, runtime directories) + +v2.1.17.15 (12 changes parallel), Fix copyright headers (no functional change) - No functional change; only fixes copyright headers -v2.1.14.14 (6 changes parallel), Remove continuous mode special case handling in ia_css_pipe_set_isp_config +v2.1.17.15 (9 changes parallel), Remove continuous mode special case handling in ia_css_pipe_set_isp_config - For continuous mode isp_config was being send to all pipes, - even though API ia_css_pipe_set_isp_config is for single pipe - Removed incorrect case -v2.1.14.14 (6 changes parallel), DVS statistics grid produced by accelerator +v2.1.17.15 (4 changes parallel), Added documentation to formats_config header file +- Added description of ranges for full-range flag + +v2.1.17.15 (9 changes parallel), DVS statistics grid produced by accelerator - Add DVS statistics produced by accelerator grid to pipe info - Add ia_css_pipe_has_dvs_stats function -v2.1.14.15 (7 changes parallel), cont_remove_x_y_end_from_ae_and_awb +v2.1.17.16 (4 changes parallel), Provide the CSS interface to select the luma only binaries +- Add a flag "enable_luma_only" to "struct ia_css_pipe_config" + +v2.1.17.16 (10 changes parallel), cont_remove_x_y_end_from_ae_and_awb - this patch doesn't introduce any new api change, it only fixes a recent - api merged change (#31938) , in order to have success CI i had to upload an api change request -v2.1.14.17 (6 changes parallel), Add XNR3 blending strength to kernel interface -- Added a blending strength field to the XNR3 kernel interface to add -- support for blending. +v2.1.17.16 (9 changes parallel), GAC state dump for debug +- added ia_css_dump_gac_state function + +v2.1.17.17 (22 changes parallel), output_format_nv12_16 +- added new output fromat nv12_16 + +v2.1.17.17 (3 changes parallel), Remove author details from SKC src code +- remove author details from skc src code -v2.1.14.18 (22 changes parallel), eliminate two_pixels_per_clock field +v2.1.17.18 (25 changes parallel), eliminate two_pixels_per_clock field - remove obsolete field two_pixels_per_clock -v2.1.14.19 (3 changes parallel), Fix copyright headers (no functional change) +v2.1.17.19 (6 changes parallel), Fix copyright headers (no functional change) - No functional change; only fixes copyright headers -v2.1.14.21 (3 changes parallel), ia_css_skc_dvs_statistics field size change +v2.1.17.19 (10 changes parallel), Add XNR3 blending strength to kernel interface +- Added a blending strength field to the XNR3 kernel interface to add +- support for blending. + +v2.1.17.20 (23 changes parallel), Add N_CSS_PRBS_IDS and N_CSS_TPG_IDS +- Add N_CSS_PRBS_IDS to reflect the number of ia_css_prbs_id enum +- Add N_CSS_TPG_IDS to reflect the number of ia_css_tpg_id enum + +v2.1.17.22 (7 changes parallel), ia_css_skc_dvs_statistics field size change - ia_css_skc_dvs_statistics field size change -v2.1.15.0 (3 changes parallel), revert ia_css_skc_dvs_statistics field size change -- Reverted field size change, change was not ready for driver yet. +v2.1.19.0 (5 changes parallel) +- Added code to calculate input_res using the Windows specification of binning -v2.1.15.2 (3 changes parallel), Return an error when both DPC and BDS are enabled in a pipe config -- Return an error when both DPC and BDS are enabled in a pipe config +v2.1.20.0 (6 changes parallel), Add interface to select TNR enabled binaries +- Add a bool "enable_tnr" to "struct ia_css_pipe_config" -v2.1.15.3 (2 changes parallel), Update skycam DPC_MAX_NUMBER_OF_DP -- Automated tooling requires an API change request -- This change changes the implementation of #define DPC_MAX_NUMBER_OF_DP -- it now returns a different number +v2.1.20.0 (5 changes parallel), OSYS & GDC Debug dump function addition +- add GDC state dump function +- add OSYS state dump function -v2.1.15.3 (18 changes parallel), output_format_nv12_16 -- added new output fromat nv12_16 +v2.1.20.3 (6 changes parallel), Add ref_buf_select parameter for TNR3 to kernel interface +- Added a ref_buf_select parameter to the TNR3 kernel interface to add +- support for multiple reference buffers. + +v2.1.20.3 (5 changes parallel), DVS MAX grid dimensions to cover maximal resolution +- rename DVS_TABLE_HEIGHT/WIDTH to MAX_DVS_COORDS_TABLE_HEIGHT/WIDTH +- modify value of the above macros to cover max resolution + +v2.1.20.4 (53 changes parallel), add input feeder calculations getter +- add input_feeder_config public struct +- add get_input_feeder_config getter + +v2.1.20.4 (3 changes parallel), Enable runtime updating mapped args for QoS extension pipe +- added ia_css_pipe_update_qos_ext_mapped_arg() */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_trace.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_trace.h index a8be878..1c172b0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_trace.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/css_trace.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __CSS_TRACE_H_ #define __CSS_TRACE_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/debug_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/debug_global.h index 076c4ba..4989f4a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/debug_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/debug_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEBUG_GLOBAL_H_INCLUDED__ #define __DEBUG_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/dma_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/dma_global.h index dff6110..0ec2897 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/dma_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/dma_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DMA_GLOBAL_H_INCLUDED__ #define __DMA_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/event_fifo_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/event_fifo_global.h index 4df7a40..ff60ae0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/event_fifo_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/event_fifo_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __EVENT_FIFO_GLOBAL_H #define __EVENT_FIFO_GLOBAL_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/fifo_monitor_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/fifo_monitor_global.h index f43bf0a..a0468d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/fifo_monitor_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/fifo_monitor_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __FIFO_MONITOR_GLOBAL_H_INCLUDED__ #define __FIFO_MONITOR_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gdc_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gdc_global.h index 4505775..e6b5557 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gdc_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gdc_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GDC_GLOBAL_H_INCLUDED__ #define __GDC_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_device_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_device_global.h index 30ad770..7ba331e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_device_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_device_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_DEVICE_GLOBAL_H_INCLUDED__ #define __GP_DEVICE_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_timer_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_timer_global.h index ee636ad..c604b87 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_timer_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gp_timer_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_TIMER_GLOBAL_H_INCLUDED__ #define __GP_TIMER_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gpio_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gpio_global.h index e3d4aa6..53ecc39 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gpio_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/gpio_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GPIO_GLOBAL_H_INCLUDED__ #define __GPIO_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/hmem_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/hmem_global.h index 7e05d7d..c6772e0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/hmem_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/hmem_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __HMEM_GLOBAL_H_INCLUDED__ #define __HMEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug.c index 663cb1161..b861682 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "debug.h" #ifndef __INLINE_DEBUG__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_local.h index 4e124fc..f0bed53 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEBUG_LOCAL_H_INCLUDED__ #define __DEBUG_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_private.h index d8c4e2d..b0b4219 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/debug_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEBUG_PRIVATE_H_INCLUDED__ #define __DEBUG_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma.c index 4f7cf62..61d2656 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include /* NULL */ #include "dma.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_local.h index 70d30ad..dcf10a4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DMA_LOCAL_H_INCLUDED__ #define __DMA_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_private.h index f80340e..f73cdba 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/dma_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DMA_PRIVATE_H_INCLUDED__ #define __DMA_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo.c index 5097ca4..93a49cb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #include "event_fifo.h" #ifndef __INLINE_EVENT__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_local.h index 49da700..d88cdcc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _EVENT_FIFO_LOCAL_H #define _EVENT_FIFO_LOCAL_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_private.h index 7d789f8..03628a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/event_fifo_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __EVENT_FIFO_PRIVATE_H #define __EVENT_FIFO_PRIVATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor.c index cf9faec..34109ad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "fifo_monitor.h" #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_local.h index bc0c7c0..f54d526 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __FIFO_MONITOR_LOCAL_H_INCLUDED__ #define __FIFO_MONITOR_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_private.h index a24ce74..3cc6b01 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/fifo_monitor_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __FIFO_MONITOR_PRIVATE_H_INCLUDED__ #define __FIFO_MONITOR_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc.c index 7567351..c3e150d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + /* The name "gdc.h is already taken" */ #include "gdc_device.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_local.h index 47c5004..00cea55 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GDC_LOCAL_H_INCLUDED__ #define __GDC_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_private.h index bed0104..18bc5c3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gdc_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GDC_PRIVATE_H_INCLUDED__ #define __GDC_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device.c index be27326..ce5de7a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "assert_support.h" #include "gp_device.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_local.h index f8159ea..325617e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_DEVICE_LOCAL_H_INCLUDED__ #define __GP_DEVICE_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_private.h index 49b13aa..ff3a7ef 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_device_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_DEVICE_PRIVATE_H_INCLUDED__ #define __GP_DEVICE_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer.c index b1ef2af..1f4f55e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include /*uint32_t */ #include "gp_timer.h" /*system_local.h, gp_timer_public.h*/ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_local.h index 434aed8..4374e84 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_TIMER_LOCAL_H_INCLUDED__ #define __GP_TIMER_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_private.h index 5d4fe2c6..a77a587 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gp_timer_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_TIMER_PRIVATE_H_INCLUDED__ #define __GP_TIMER_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_local.h index ee2f436..36bdb2b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GPIO_LOCAL_H_INCLUDED__ #define __GPIO_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_private.h index e1b51a1..85a3f52 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/gpio_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GPIO_PRIVATE_H_INCLUDED__ #define __GPIO_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h index 16b3340..5a1c01d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _hive_isp_css_ddr_hrt_modified_h_ #define _hive_isp_css_ddr_hrt_modified_h_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_hrt_modified.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_hrt_modified.h index 2afd4a2..4d0a476 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_hrt_modified.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hive_isp_css_hrt_modified.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _hive_isp_css_hrt_h #define _hive_isp_css_hrt_h diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem.c index 2937e79..6eff36a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #include "hmem.h" #ifndef __INLINE_HMEM__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_local.h index 9251ed7..812366f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __HMEM_LOCAL_H_INCLUDED__ #define __HMEM_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_private.h index faa33e1..23fdcaa 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/hmem_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __HMEM_PRIVATE_H_INCLUDED__ #define __HMEM_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter.c index b1a70f2..de9c5ec 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_local.h index ad863f7..4b0d4f8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_FORMATTER_LOCAL_H_INCLUDED__ #define __INPUT_FORMATTER_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_private.h index 29bce24..8fe6009 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_formatter_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_FORMATTER_PRIVATE_H_INCLUDED__ #define __INPUT_FORMATTER_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system.c index 6049fd6..124035d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_local.h index 5103d6b..fc4c3d4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_SYSTEM_LOCAL_H_INCLUDED__ #define __INPUT_SYSTEM_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_private.h index 49b4e0b..9336d97 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/input_system_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_SYSTEM_PRIVATE_H_INCLUDED__ #define __INPUT_SYSTEM_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq.c index 9295b91..f2a28ce 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "assert_support.h" #include "irq.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_local.h index b22ba95..5afab1f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IRQ_LOCAL_H_INCLUDED__ #define __IRQ_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_private.h index 6a4184e..fabf085 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/irq_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IRQ_PRIVATE_H_INCLUDED__ #define __IRQ_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp.c index e9f547a..e2b9a61 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include "isp.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_local.h index 816632a..fd48b77 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_LOCAL_H_INCLUDED__ #define __ISP_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_private.h index b33f94a..581adfc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/isp_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_PRIVATE_H_INCLUDED__ #define __ISP_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu.c index 8ca84ff..2647c08 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -14,6 +14,7 @@ + /* The name "mmu.h is already taken" */ #include "mmu_device.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_local.h index f46c3bf..6504551 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MMU_LOCAL_H_INCLUDED__ #define __MMU_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_private.h index 92b63d8..d7b15a1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/mmu_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MMU_PRIVATE_H_INCLUDED__ #define __MMU_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp.c index 1455ba9..668e21d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "sp.h" #ifndef __INLINE_SP__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_local.h index f6ce83f..eed76e6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SP_LOCAL_H_INCLUDED__ #define __SP_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_private.h index a192635..134d292 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/sp_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SP_PRIVATE_H_INCLUDED__ #define __SP_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/system_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/system_local.h index baaef3d..156ee16 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/system_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/system_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SYSTEM_LOCAL_H_INCLUDED__ #define __SYSTEM_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl.c index 30f75cf..458766a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "timed_ctrl.h" #ifndef __INLINE_TIMED_CTRL__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_local.h index 6b559fb..b831966 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TIMED_CTRL_LOCAL_H_INCLUDED__ #define __TIMED_CTRL_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_private.h index 57af3a06..028f6bd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/timed_ctrl_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TIMED_CTRL_PRIVATE_H_INCLUDED__ #define __TIMED_CTRL_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_local.h index 0b8cfb7..00b462c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VAMEM_LOCAL_H_INCLUDED__ #define __VAMEM_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_private.h index e7d9ad36..c82a71b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vamem_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VAMEM_PRIVATE_H_INCLUDED__ #define __VAMEM_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem.c index 1a440c6..74383f5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "isp.h" #include "vmem.h" #include "vmem_local.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_local.h index c0193cd..40820f1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VMEM_LOCAL_H_INCLUDED__ #define __VMEM_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_private.h index 1a79d04..00a08c5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/host/vmem_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VMEM_PRIVATE_H_INCLUDED__ #define __VMEM_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_formatter_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_formatter_global.h index 5654d91..090588e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_formatter_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_formatter_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_FORMATTER_GLOBAL_H_INCLUDED__ #define __INPUT_FORMATTER_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_system_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_system_global.h index 9ba3652..bcb1475 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_system_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/input_system_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ #define __INPUT_SYSTEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/irq_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/irq_global.h index 64554d8..f0015da 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/irq_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/irq_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IRQ_GLOBAL_H_INCLUDED__ #define __IRQ_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/isp_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/isp_global.h index e46dac1..aa46add 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/isp_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/isp_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_GLOBAL_H_INCLUDED__ #define __ISP_GLOBAL_H_INCLUDED__ @@ -35,6 +36,12 @@ #define ISP_NWAY_LOG2 6 #define ISP_VEC_NELEMS_LOG2 ISP_NWAY_LOG2 +#ifdef PIPE_GENERATION +#define PIPEMEM(x) MEM(x) +#else +#define PIPEMEM(x) +#endif + /* The number of data bytes in a vector disregarding the reduced precision */ #define ISP_VEC_BYTES (ISP_VEC_NELEMS*sizeof(uint16_t)) @@ -90,4 +97,15 @@ #define ISP_VAMEM3_SINK_REG 0x08 #define ISP_HMEM_SINK_REG 0x08 +#define ISP_BAMEM_ALIGN_ELEM ISP_VMEM_ALIGN_ELEM +#define BAMEM VMEM + +#define XNR3_DOWN_BAMEM_BASE_ADDRESS (0x16880) +#define XNR3_UP_BAMEM_BASE_ADDRESS (0x12880) + +#define bmem_ldrow(fu, pid, offset, data) bmem_ldrow_s(fu, pid, offset, data) +#define bmem_strow(fu, pid, offset, data) bmem_strow_s(fu, pid, offset, data) +#define bmem_ldblk(fu, pid, offset, data) bmem_ldblk_s(fu, pid, offset, data) +#define bmem_stblk(fu, pid, offset, data) bmem_stblk_s(fu, pid, offset, data) + #endif /* __ISP_GLOBAL_H_INCLUDED__ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/mmu_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/mmu_global.h index 83ca418..0ef1fdd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/mmu_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/mmu_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MMU_GLOBAL_H_INCLUDED__ #define __MMU_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/resource_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/resource_global.h index 01c915c..ca28f3b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/resource_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/resource_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __RESOURCE_GLOBAL_H_INCLUDED__ #define __RESOURCE_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/sp_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/sp_global.h index 6ec4e59..5739f9f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/sp_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/sp_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SP_GLOBAL_H_INCLUDED__ #define __SP_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/system_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/system_global.h index b8b6f3b..59d87fc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/system_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/system_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SYSTEM_GLOBAL_H_INCLUDED__ #define __SYSTEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/timed_ctrl_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/timed_ctrl_global.h index c3e8a01..a699999 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/timed_ctrl_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/timed_ctrl_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TIMED_CTRL_GLOBAL_H_INCLUDED__ #define __TIMED_CTRL_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vamem_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vamem_global.h index 58713c6..c531399 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vamem_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vamem_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VAMEM_GLOBAL_H_INCLUDED__ #define __VAMEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vmem_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vmem_global.h index 5223a6e..476a306 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vmem_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/vmem_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VMEM_GLOBAL_H_INCLUDED__ #define __VMEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/xmem_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/xmem_global.h index 1d3a43a..44bd55b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/xmem_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_common/xmem_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __XMEM_GLOBAL_H_INCLUDED__ #define __XMEM_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/assert_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/assert_support.h index 95f3892..98be81d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/assert_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/assert_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ASSERT_SUPPORT_H_INCLUDED__ #define __ASSERT_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bamem.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bamem.h index d71e08f..56ccbc9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bamem.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bamem.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __BAMEM_H_INCLUDED__ #define __BAMEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bbb_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bbb_config.h index 18bc5ef..9ac09ef 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bbb_config.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bbb_config.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __BBB_CONFIG_H_INCLUDED__ #define __BBB_CONFIG_H_INCLUDED__ /* This header contains BBB defines common to ISP and host */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bitop_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bitop_support.h index 1b271c3..b46dfbd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bitop_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/bitop_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __BITOP_SUPPORT_H_INCLUDED__ #define __BITOP_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/cpu_mem_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/cpu_mem_support.h index 6d014fa..1f4d2be 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/cpu_mem_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/cpu_mem_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __CPU_MEM_SUPPORT_H_INCLUDED__ #define __CPU_MEM_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/csi_rx.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/csi_rx.h index 0398f58..df20c67 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/csi_rx.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/csi_rx.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __CSI_RX_H_INCLUDED__ #define __CSI_RX_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/debug.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/debug.h index 7d80117..b49003c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/debug.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/debug.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEBUG_H_INCLUDED__ #define __DEBUG_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/device_access/device_access.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/device_access/device_access.h index 915ece9..fec65fc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/device_access/device_access.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/device_access/device_access.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEVICE_ACCESS_H_INCLUDED__ #define __DEVICE_ACCESS_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/dma.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/dma.h index b266191..e48a0c7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/dma.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/dma.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DMA_H_INCLUDED__ #define __DMA_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/error_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/error_support.h index 46af7ec..6bfcec1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/error_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/error_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ERROR_SUPPORT_H_INCLUDED__ #define __ERROR_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/event_fifo.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/event_fifo.h index 78827c5..62a7204 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/event_fifo.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/event_fifo.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __EVENT_FIFO_H #define __EVENT_FIFO_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/fifo_monitor.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/fifo_monitor.h index 3bdd260..67f82e5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/fifo_monitor.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/fifo_monitor.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __FIFO_MONITOR_H_INCLUDED__ #define __FIFO_MONITOR_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gdc_device.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gdc_device.h index 016132b..0791c2b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gdc_device.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gdc_device.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GDC_DEVICE_H_INCLUDED__ #define __GDC_DEVICE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_device.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_device.h index 766d253..94ac837 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_device.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_device.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_DEVICE_H_INCLUDED__ #define __GP_DEVICE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_timer.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_timer.h index ca70f56..4b1cdeb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_timer.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gp_timer.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_TIMER_H_INCLUDED__ #define __GP_TIMER_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gpio.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gpio.h index dec21bc..da2a41d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gpio.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/gpio.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GPIO_H_INCLUDED__ #define __GPIO_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/hmem.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/hmem.h index 671dd5b..0475a01 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/hmem.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/hmem.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __HMEM_H_INCLUDED__ #define __HMEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/csi_rx_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/csi_rx_public.h index 3962409..8947685 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/csi_rx_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/csi_rx_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __CSI_RX_PUBLIC_H_INCLUDED__ #define __CSI_RX_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/debug_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/debug_public.h index 90b4ba7..413ef04 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/debug_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/debug_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DEBUG_PUBLIC_H_INCLUDED__ #define __DEBUG_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/dma_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/dma_public.h index 1d5e38f..7614397 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/dma_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/dma_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __DMA_PUBLIC_H_INCLUDED__ #define __DMA_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/event_fifo_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/event_fifo_public.h index d95bc70..3696b0c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/event_fifo_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/event_fifo_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __EVENT_FIFO_PUBLIC_H #define __EVENT_FIFO_PUBLIC_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/fifo_monitor_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/fifo_monitor_public.h index 329f5d5..fe96f3d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/fifo_monitor_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/fifo_monitor_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __FIFO_MONITOR_PUBLIC_H_INCLUDED__ #define __FIFO_MONITOR_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gdc_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gdc_public.h index d27f87a..6d0eb55 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gdc_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gdc_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GDC_PUBLIC_H_INCLUDED__ #define __GDC_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_device_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_device_public.h index acbce0f..1bc7b02 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_device_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_device_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_DEVICE_PUBLIC_H_INCLUDED__ #define __GP_DEVICE_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_timer_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_timer_public.h index 8c01108..43113f4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_timer_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gp_timer_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GP_TIMER_PUBLIC_H_INCLUDED__ #define __GP_TIMER_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gpio_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gpio_public.h index 82eaa0d..7afa700 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gpio_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/gpio_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __GPIO_PUBLIC_H_INCLUDED__ #define __GPIO_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/hmem_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/hmem_public.h index 9b8e7c9..bd2b879 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/hmem_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/hmem_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __HMEM_PUBLIC_H_INCLUDED__ #define __HMEM_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ibuf_ctrl_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ibuf_ctrl_public.h index 1ac0e64..1435fab 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ibuf_ctrl_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ibuf_ctrl_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IBUF_CTRL_PUBLIC_H_INCLUDED__ #define __IBUF_CTRL_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_formatter_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_formatter_public.h index 2db7089..1e2d96f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_formatter_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_formatter_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_FORMATTER_PUBLIC_H_INCLUDED__ #define __INPUT_FORMATTER_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_system_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_system_public.h index 1596757..53d1e0a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_system_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/input_system_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_SYSTEM_PUBLIC_H_INCLUDED__ #define __INPUT_SYSTEM_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/irq_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/irq_public.h index 9aeaf8f..d2e6df1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/irq_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/irq_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IRQ_PUBLIC_H_INCLUDED__ #define __IRQ_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2400_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2400_config.h index ab33917..43e8b55 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2400_config.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2400_config.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP2400_CONFIG_H_INCLUDED__ #define __ISP2400_CONFIG_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2500_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2500_config.h index 4fae856..7156176 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2500_config.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2500_config.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP2500_CONFIG_H_INCLUDED__ #define __ISP2500_CONFIG_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2600_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2600_config.h deleted file mode 100644 index 6086be8..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2600_config.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 __ISP2600_CONFIG_H_INCLUDED__ -#define __ISP2600_CONFIG_H_INCLUDED__ - - -#define NUM_BITS 16 - - -#define NUM_SLICE_ELEMS 8 -#define ROUNDMODE ROUND_NEAREST_EVEN -#define MAX_SHIFT_1W (NUM_BITS-1) /* Max number of bits a 1w input can be shifted */ -#define MAX_SHIFT_2W (2*NUM_BITS-1) /* Max number of bits a 2w input can be shifted */ -#define ISP_NWAY 32 /* Number of elements in a vector in ISP 2600 */ - -#define HAS_div_unit -#define HAS_1w_sqrt_u_unit -#define HAS_2w_sqrt_u_unit - -#define HAS_vec_sub - -#endif /* __ISP2600_CONFIG_H_INCLUDED__ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2601_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2601_config.h deleted file mode 100644 index 6e9c276..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp2601_config.h +++ /dev/null @@ -1,68 +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 __ISP2601_CONFIG_H_INCLUDED__ -#define __ISP2601_CONFIG_H_INCLUDED__ - -#define NUM_BITS 16 -#define ISP_VEC_ELEMBITS NUM_BITS -#define ISP_NWAY 32 -#define NUM_SLICE_ELEMS 4 -#define ROUNDMODE ROUND_NEAREST_EVEN -#define MAX_SHIFT_1W (NUM_BITS-1) /* Max number of bits a 1w input can be shifted */ -#define MAX_SHIFT_2W (2*NUM_BITS-1) /* Max number of bits a 2w input can be shifted */ - -#define HAS_div_unit -#define HAS_bfa_unit -#define HAS_1w_sqrt_u_unit -#define HAS_2w_sqrt_u_unit - -#define HAS_vec_sub - -/* Bit widths and element widths defined in HW implementation of BFA */ -#define BFA_THRESHOLD_BIT_CNT (8) -#define BFA_THRESHOLD_MASK ((1<> |_b| if _b is negative + * + * If _b > 0, this function will shift _a with _b bits to the left, + * saturating at MIN_RANGE/MAX_RANGE in case of overflow. + * if _b < 0, this function will shift _a with _b bits to the right. + * It asserts -MAX_SHIFT_1W <= _b <= MAX_SHIFT_1W. + * If _b = 0, it returns _a. + */ +STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_ashift_sat( + const tvector1w _a, + const tvector1w _b); + +/** @brief bidirectional non-saturating arithmetic shift + * + * @param[in] _a input + * @param[in] _b shift amount + * + * @return _a << |_b| if _b is positive + * _a >> |_b| if _b is negative + * + * If _b > 0, this function will shift _a with _b bits to the left, + * no saturation is performed in case of overflow. + * if _b < 0, this function will shift _a with _b bits to the right. + * It asserts -MAX_SHIFT_1W <= _b <= MAX_SHIFT_1W. + * If _b = 0, it returns _a. + */ +STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_ashift( + const tvector1w _a, + const tvector1w _b); + + +/** @brief bidirectional logical shift + * + * @param[in] _a input + * @param[in] _b shift amount + * + * @return _a << |_b| if _b is positive + * _a >> |_b| if _b is negative + * + * This function will shift _a with _b bits to the left if _b is positive. + * This function will shift _a with _b bits to the right if _b is negative. + * It asserts -MAX_SHIFT_1W <= _b <= MAX_SHIFT_1W. + * It inserts zeros on the left or right depending on the shift direction: + * right or left. + * The operation count for this function assumes that + * the shift amount is a cloned scalar input. + */ +STORAGE_CLASS_ISP_OP1W_FUNC_H tvector1w OP_1w_lshift( + const tvector1w _a, + const tvector1w _b); + /* Cast */ /** @brief Cast from int to 1w diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op1w_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op1w_types.h index 012fe2d..805d7c7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op1w_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op1w_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_OP1W_TYPES_H_INCLUDED__ #define __ISP_OP1W_TYPES_H_INCLUDED__ @@ -42,6 +43,7 @@ typedef mpudata_t tvector1w_unsigned; typedef mpsdata_t tscalar1w_weight; typedef mpsdata_t tvector1w_signed_positive; typedef mpsdata_t tvector1w_weight; +typedef bool tscalar_bool; typedef struct { tvector1w d; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w.h index 1cfe6d7..2038206 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_OP2W_H_INCLUDED__ #define __ISP_OP2W_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w_types.h index 7e86083..a60e4d4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op2w_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_OP2W_TYPES_H_INCLUDED__ #define __ISP_OP2W_TYPES_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op_count.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op_count.h index 529bf073..ded2fcf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op_count.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_op_count.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_OP_COUNT_H_INCLUDED__ #define __ISP_OP_COUNT_H_INCLUDED__ @@ -37,6 +38,7 @@ typedef enum { bbb_func_OP_1w_subhalfrnd, bbb_func_OP_1w_abs, bbb_func_OP_1w_subabssat, + bbb_func_OP_1w_subsat_u, bbb_func_OP_1w_muld, bbb_func_OP_1w_mul, bbb_func_OP_1w_qmul, @@ -53,6 +55,8 @@ typedef enum { bbb_func_OP_1w_aslsat, bbb_func_OP_1w_lsl, bbb_func_OP_1w_lsr, + bbb_func_OP_1w_ashift, + bbb_func_OP_1w_lshift, bbb_func_OP_int_cast_to_1w , bbb_func_OP_1w_cast_to_int , bbb_func_OP_1w_cast_to_2w , @@ -109,6 +113,9 @@ typedef enum { bbb_func_OP_2w_min, bbb_func_OP_2w_max, bbb_func_OP_1w_mul_realigning, + bbb_func_OP_1w_imax32, + bbb_func_OP_1w_imaxidx32, + bbb_func_OP_1w_cond_add, bbb_func_num_functions } bbb_functions_t; @@ -125,6 +132,7 @@ typedef enum { core_func_OP_subasr1, core_func_OP_abs, core_func_OP_subabssat, + core_func_OP_subsat_u, core_func_OP_muld, core_func_OP_mul, core_func_OP_qrmul, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_public.h index 808ec050..6b6aead 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isp_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_PUBLIC_H_INCLUDED__ #define __ISP_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_dma_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_dma_public.h index 4b16038..0c3fe71 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_dma_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_dma_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_DMA_PUBLIC_H_INCLUDED__ #define __ISYS_DMA_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_irq_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_irq_public.h index c3e6f76..3402a07 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_irq_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_irq_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_IRQ_PUBLIC_H__ #define __ISYS_IRQ_PUBLIC_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_public.h index 097dde8..f291ee8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_PUBLIC_H_INCLUDED__ #define __ISYS_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_stream2mmio_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_stream2mmio_public.h index 5624cfc..99e55fc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_stream2mmio_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/isys_stream2mmio_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_STREAM2MMIO_PUBLIC_H_INCLUDED__ #define __ISYS_STREAM2MMIO_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/mmu_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/mmu_public.h index 4258fa8..107b432 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/mmu_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/mmu_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MMU_PUBLIC_H_INCLUDED__ #define __MMU_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/osys_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/osys_public.h index 8695e3c..75ad813 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/osys_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/osys_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __OSYS_PUBLIC_H_INCLUDED__ #define __OSYS_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pipeline_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pipeline_public.h index 32cea58..b597297 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pipeline_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pipeline_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __PIPELINE_PUBLIC_H_INCLUDED__ #define __PIPELINE_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pixelgen_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pixelgen_public.h index c0f3f3e..144e70a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pixelgen_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/pixelgen_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __PIXELGEN_PUBLIC_H_INCLUDED__ #define __PIXELGEN_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func.h index 605d309..8bb0cac 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _REF_VECTOR_FUNC_H_INCLUDED_ #define _REF_VECTOR_FUNC_H_INCLUDED_ @@ -308,6 +309,32 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H tvector1w fir1x3m_6dB_nrm_calc_coeff ( STORAGE_CLASS_REF_VECTOR_FUNC_H tvector1w fir1x3m_9dB_nrm ( const s_1w_1x3_matrix m); +/** @brief symmetric 3 tap FIR acts as LPF or BSF + * + * @param[in] m 1x3 matrix with pixels + * @param[in] k filter coefficient shift + * @param[in] bsf_flag 1 for BSF and 0 for LPF + * + * @return filtered output + * + * This function performs variable coefficient symmetric 3 tap filter which can + * be either used as Low Pass Filter or Band Stop Filter. + * Symmetric 3tap tap filter with DC gain 1 has filter coefficients [a, 1-2a, a] + * For LPF 'a' can be approximated as (1 - 2^(-k))/4, k = 0, 1, 2, ... + * and filter output can be approximated as: + * out_LPF = ((v00 + v02) - ((v00 + v02) >> k) + (2 * (v01 + (v01 >> k)))) >> 2 + * For BSF 'a' can be approximated as (1 + 2^(-k))/4, k = 0, 1, 2, ... + * and filter output can be approximated as: + * out_BSF = ((v00 + v02) + ((v00 + v02) >> k) + (2 * (v01 - (v01 >> k)))) >> 2 + * For a given filter coefficient shift 'k' and bsf_flag this function + * behaves either as LPF or BSF. + * All computation is done using 1w arithmetic and implementation does not use + * any multiplication. + */ +STORAGE_CLASS_REF_VECTOR_FUNC_H tvector1w +sym_fir1x3m_lpf_bsf(s_1w_1x3_matrix m, + tscalar1w k, + tscalar_bool bsf_flag); /** @brief Normalised 2D FIR with coefficients [1;2;1] * [1,2,1] * @@ -926,7 +953,7 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H int generic_block_matching_algorithm( int search_block_sz, tscalar1w_4bit_bma_shift shift); -/** @brief OP_1w_asp_bma_16_1_32way +/** @brief OP_1w_asp_bma_16_1_32way_nomask * * @param[in] search_area input search window of 16x16 pixels * @param[in] input_block input reference block of 8x8 pixels, where N<=M @@ -943,12 +970,12 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H int generic_block_matching_algorithm( * */ -STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_1 OP_1w_asp_bma_16_1_32way( +STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_1 OP_1w_asp_bma_16_1_32way_nomask( bma_16x16_search_window search_area, ref_block_8x8 input_block, tscalar1w_4bit_bma_shift shift); -/** @brief OP_1w_asp_bma_16_2_32way +/** @brief OP_1w_asp_bma_16_2_32way_nomask * * @param[in] search_area input search window of 16x16 pixels * @param[in] input_block input reference block of 8x8 pixels, where N<=M @@ -963,11 +990,11 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_1 OP_1w_asp_bma_16_1_32way( * */ -STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_2 OP_1w_asp_bma_16_2_32way( +STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_2 OP_1w_asp_bma_16_2_32way_nomask( bma_16x16_search_window search_area, ref_block_8x8 input_block, tscalar1w_4bit_bma_shift shift); -/** @brief OP_1w_asp_bma_14_1_32way +/** @brief OP_1w_asp_bma_14_1_32way_nomask * * @param[in] search_area input search block of 16x16 pixels with search window of 14x14 pixels * @param[in] input_block input reference block of 8x8 pixels, where N<=M @@ -984,12 +1011,12 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_16_2 OP_1w_asp_bma_16_2_32way( * */ -STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_14_1 OP_1w_asp_bma_14_1_32way( +STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_14_1 OP_1w_asp_bma_14_1_32way_nomask( bma_16x16_search_window search_area, ref_block_8x8 input_block, tscalar1w_4bit_bma_shift shift); -/** @brief OP_1w_asp_bma_14_2_32way +/** @brief OP_1w_asp_bma_14_2_32way_nomask * * @param[in] search_area input search block of 16x16 pixels with search window of 14x14 pixels * @param[in] input_block input reference block of 8x8 pixels, where N<=M @@ -1004,11 +1031,27 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_14_1 OP_1w_asp_bma_14_1_32way( * */ -STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_14_2 OP_1w_asp_bma_14_2_32way( +STORAGE_CLASS_REF_VECTOR_FUNC_H bma_output_14_2 OP_1w_asp_bma_14_2_32way_nomask( bma_16x16_search_window search_area, ref_block_8x8 input_block, tscalar1w_4bit_bma_shift shift); +/** @brief multiplex addition and passing + * + * @param[in] _a first pixel + * @param[in] _b second pixel + * @param[in] _c condition flag + * + * @return (_a + _b) if condition flag is true + * _a if condition flag is false + * + * This function does multiplex addition depending on the input condition flag + */ +STORAGE_CLASS_REF_VECTOR_FUNC_H tvector1w OP_1w_cond_add( + tvector1w _a, + tvector1w _b, + tflags _c); + #ifdef HAS_bfa_unit /** @brief OP_1w_single_bfa_7x7 * @@ -1106,6 +1149,29 @@ STORAGE_CLASS_REF_VECTOR_FUNC_H void bbb_bfa_gen_range_weight_lut( tvector1w out[BFA_RW_LUT_SIZE]); #endif +/** @brief OP_1w_imax32 + * + * @param[in] src - structure that holds an array of 32 elements. + * + * @return maximum element among input array. + * + *This function gets maximum element from an array of 32 elements. + */ +STORAGE_CLASS_REF_VECTOR_FUNC_H int OP_1w_imax32( + imax32_ref_in_vector src); + +/** @brief OP_1w_imaxidx32 + * + * @param[in] src - structure that holds a vector of elements. + * + * @return index of first element with maximum value among array. + * + * This function gets index of first element with maximum value + * from 32 elements. + */ +STORAGE_CLASS_REF_VECTOR_FUNC_H int OP_1w_imaxidx32( + imax32_ref_in_vector src); + #ifndef INLINE_VECTOR_FUNC #define STORAGE_CLASS_REF_VECTOR_FUNC_C #define STORAGE_CLASS_REF_VECTOR_DATA_C const diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func_types.h index e4e19f9..a79c609 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/ref_vector_func_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __REF_VECTOR_FUNC_TYPES_H_INCLUDED__ #define __REF_VECTOR_FUNC_TYPES_H_INCLUDED__ @@ -33,6 +34,7 @@ #define SLOPE_A_RESOLUTION 10 #define CONFIG_UNIT_LUT_SIZE_32 32 /*XCU works for ISP_NWAY = 32 */ #define LXCU_LUT_SIZE 16 +#define IMAX32_ELEM_SIZE 32 #define ONE_IN_Q14 (1<<(NUM_BITS-2)) #define Q29_TO_Q15_SHIFT_VAL (NUM_BITS-2) @@ -160,7 +162,7 @@ typedef struct { 0, 0, 0, 0, 0, \ 0, 0, 0, 0, 0, \ 0, 0, 0, 0, 0 }) - + typedef struct { tvector1w v00; tvector1w v01; @@ -332,6 +334,10 @@ typedef struct { } xcu_ref_init_vectors; typedef struct { + tvector1w elem[IMAX32_ELEM_SIZE]; +} imax32_ref_in_vector; + +typedef struct { tscalar1w search[BMA_SEARCH_BLOCK_SZ_16][BMA_SEARCH_BLOCK_SZ_16]; } bma_16x16_search_window; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/sp_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/sp_public.h index 974ce6a..cfa79a9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/sp_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/sp_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SP_PUBLIC_H_INCLUDED__ #define __SP_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/tag_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/tag_public.h index 22ef747..45cb97f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/tag_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/tag_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TAG_PUBLIC_H_INCLUDED__ #define __TAG_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/timed_ctrl_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/timed_ctrl_public.h index 4b24046..3f2e69a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/timed_ctrl_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/timed_ctrl_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TIMED_CTRL_PUBLIC_H_INCLUDED__ #define __TIMED_CTRL_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vamem_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vamem_public.h index cee15d0..5fd273d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vamem_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vamem_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VAMEM_PUBLIC_H_INCLUDED__ #define __VAMEM_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vmem_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vmem_public.h index e9801c0..4084130 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vmem_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/host/vmem_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VMEM_PUBLIC_H_INCLUDED__ #define __VMEM_PUBLIC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/ibuf_ctrl.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/ibuf_ctrl.h index f5de0df..44991c4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/ibuf_ctrl.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/ibuf_ctrl.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IBUF_CTRL_H_INCLUDED__ #define __IBUF_CTRL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_formatter.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_formatter.h index 041c8b6..4cb2fc2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_formatter.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_formatter.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_FORMATTER_H_INCLUDED__ #define __INPUT_FORMATTER_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_system.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_system.h index 1828673..0a3c209 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_system.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/input_system.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __INPUT_SYSTEM_H_INCLUDED__ #define __INPUT_SYSTEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/irq.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/irq.h index 1dc4438..2425f57 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/irq.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/irq.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IRQ_H_INCLUDED__ #define __IRQ_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isp.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isp.h index 49190d0..48736dd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isp.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isp.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISP_H_INCLUDED__ #define __ISP_H_INCLUDED__ @@ -31,7 +32,9 @@ #include "storage_class.h" +#ifndef PIPE_GENERATION #include "system_local.h" +#endif #include "isp_local.h" #ifndef __INLINE_ISP__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_dma.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_dma.h index 9a608f0..b6472a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_dma.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_dma.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_DMA_H_INCLUDED__ #define __ISYS_DMA_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_irq.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_irq.h index cf858bc..bb7dfb29 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_irq.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_irq.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ISYS_IRQ_H__ #define __IA_CSS_ISYS_IRQ_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_stream2mmio.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_stream2mmio.h index 3e8cfe5..bbdb364 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_stream2mmio.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/isys_stream2mmio.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_STREAM2MMIO_H_INCLUDED__ #define __ISYS_STREAM2MMIO_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/math_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/math_support.h index 5f85dc3..99b1a66 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/math_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/math_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MATH_SUPPORT_H #define __MATH_SUPPORT_H @@ -47,6 +48,9 @@ /* force a value to a lower even value */ #define EVEN_FLOOR(x) ((x) & ~1) +/* If the number is odd, find the next even number */ +#define EVEN_CEIL(x) ((IS_ODD(x)) ? ((x) + 1) : (x)) + /* A => B */ #define IMPLIES(a, b) (!(a) || (b)) @@ -56,11 +60,14 @@ otherwise use min and max */ #define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#define ROUND_DIV(a, b) ((b) ? ((a) + ((b) >> 1)) / (b) : 0) #define CEIL_DIV(a, b) ((b) ? ((a) + (b) - 1) / (b) : 0) #define CEIL_MUL(a, b) (CEIL_DIV(a, b) * (b)) #define CEIL_MUL2(a, b) (((a) + (b) - 1) & ~((b) - 1)) #define CEIL_SHIFT(a, b) (((a) + (1 << (b)) - 1)>>(b)) #define CEIL_SHIFT_MUL(a, b) (CEIL_SHIFT(a, b) << (b)) +#define ROUND_HALF_DOWN_DIV(a, b) ((b) ? ((a) + (b / 2) - 1) / (b) : 0) +#define ROUND_HALF_DOWN_MUL(a, b) (ROUND_HALF_DOWN_DIV(a, b) * (b)) /*To Find next power of 2 number from x */ @@ -145,6 +152,15 @@ STORAGE_CLASS_INLINE unsigned int ceil_shift_mul(unsigned int a, unsigned int b) return CEIL_SHIFT_MUL(a, b); } +STORAGE_CLASS_INLINE unsigned int round_half_down_div(unsigned int a, unsigned int b) +{ + return ROUND_HALF_DOWN_DIV(a, b); +} + +STORAGE_CLASS_INLINE unsigned int round_half_down_mul(unsigned int a, unsigned int b) +{ + return ROUND_HALF_DOWN_MUL(a, b); +} /** @brief Next Power of Two * diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/memory_access/memory_access.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/memory_access/memory_access.h index d7333b7..c23d3ec 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/memory_access/memory_access.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/memory_access/memory_access.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MEMORY_ACCESS_H_INCLUDED__ #define __MEMORY_ACCESS_H_INCLUDED__ @@ -45,6 +46,7 @@ */ #include +#include "platform_support.h" /* for __func__ */ /* * User provided file that defines the (sub)system address types: @@ -111,7 +113,7 @@ extern sys_address mmgr_get_base_address(void); \param base_addr[in] The index where page table 0 is located \Note: The base_index is the MSB section of an absolute system address, - the in-page address bits are discared. The base address is not + the in-page address bits are discared. The base address is not relative to the DDR base address \return none, @@ -130,21 +132,32 @@ extern hrt_data mmgr_get_base_index(void); /*! Return the address of an allocation in memory \param size[in] Size in bytes of the allocation + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return vaddress */ -extern hrt_vaddress mmgr_malloc( - const size_t size); +#define mmgr_malloc(__size) mmgr_malloc_ex(__size, __func__, __LINE__) +extern hrt_vaddress mmgr_malloc_ex( + const size_t size, + const char *caller_func, + int caller_line); /*! Return the address of a zero initialised allocation in memory - \param size[in] Size in bytes of the allocation + \param N[in] Horizontal dimension of array + \param size[in] Vertical dimension of array Total size is N*size + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return vaddress */ -extern hrt_vaddress mmgr_calloc( +#define mmgr_calloc(__N, __size) mmgr_calloc_ex(__N, __size, __func__, __LINE__) +extern hrt_vaddress mmgr_calloc_ex( const size_t N, - const size_t size); + const size_t size, + const char *caller_func, + int caller_line); /*! Return the address of a reallocated allocation in memory @@ -152,8 +165,8 @@ extern hrt_vaddress mmgr_calloc( \param size[in] Size in bytes of the allocation \Note - All limitations and particularities of the C stdlib - realloc function apply + All limitations and particularities of the C stdlib + realloc function apply \return vaddress */ @@ -165,31 +178,40 @@ extern hrt_vaddress mmgr_realloc( /*! Free the memory allocation identified by the address \param vaddr[in] Address of the allocation + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return vaddress */ -extern void mmgr_free( - hrt_vaddress vaddr); +#define mmgr_free(__vaddr) mmgr_free_ex(__vaddr, __func__, __LINE__) +extern void mmgr_free_ex( + hrt_vaddress vaddr, + const char *caller_func, + int caller_line); /*! Return the address of an allocation in memory \param size[in] Size in bytes of the allocation \param attribute[in] Bit vector specifying the properties - of the allocation including zero - initialisation + of the allocation including zero initialisation + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return vaddress */ -extern hrt_vaddress mmgr_alloc_attr( +#define mmgr_alloc_attr(__size, __attribute) mmgr_alloc_attr_ex(__size, __attribute, __func__, __LINE__) +extern hrt_vaddress mmgr_alloc_attr_ex( const size_t size, - const uint16_t attribute); + const uint16_t attribute, + const char *caller_func, + int caller_line); /*! Return the address of a reallocated allocation in memory \param vaddr[in] Address of an allocation \param size[in] Size in bytes of the allocation \param attribute[in] Bit vector specifying the properties - of the allocation +of the allocation \Note All limitations and particularities of the C stdlib @@ -206,20 +228,20 @@ extern hrt_vaddress mmgr_realloc_attr( /*! Return the address of a mapped existing allocation in memory \param ptr[in] Pointer to an allocation in a different - virtual memory page table, but the same - physical memory + virtual memory page table, but the same + physical memory \param size[in] Size of the memory of the pointer - \param attribute[in] Bit vector specifying the properties - of the allocation + \param attribute[in] Bit vector specifying the properties + of the allocation \param context Pointer of a context provided by - client/driver for additonal parameters - needed by the implementation + client/driver for additonal parameters + needed by the implementation \Note This interface is tentative, limited to the desired function the actual interface may require furhter parameters \return vaddress - */ +*/ extern hrt_vaddress mmgr_mmap( const void *ptr, const size_t size, @@ -230,12 +252,17 @@ extern hrt_vaddress mmgr_mmap( \param vaddr[in] Address of an allocation \param size[in] Size in bytes of the area to be cleared + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return none */ -extern void mmgr_clear( +#define mmgr_clear(__vaddr, __size) mmgr_clear_ex(__vaddr, __size, __func__, __LINE__) +extern void mmgr_clear_ex( hrt_vaddress vaddr, - const size_t size); + const size_t size, + const char *caller_func, + int caller_line); /*! Set an allocation in memory to a value @@ -256,25 +283,35 @@ extern void mmgr_set( \param vaddr[in] Address of an allocation \param data[out] pointer to the destination array \param size[in] number of bytes to read + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return none */ -extern void mmgr_load( +#define mmgr_load(__vaddr, __data, __size) mmgr_load_ex(__vaddr, __data, __size, __func__, __LINE__) +extern void mmgr_load_ex( const hrt_vaddress vaddr, void *data, - const size_t size); + const size_t size, + const char *caller_func, + int caller_line); /*! Write an array of bytes to device registers or memory in the device \param vaddr[in] Address of an allocation \param data[in] pointer to the source array \param size[in] number of bytes to write + \param caller_func[in] Caller function name + \param caller_line[in] Caller function line number \return none */ -extern void mmgr_store( +#define mmgr_store(__vaddr, __data, __size) mmgr_store_ex(__vaddr, __data, __size, __func__, __LINE__) +extern void mmgr_store_ex( const hrt_vaddress vaddr, const void *data, - const size_t size); + const size_t size, + const char *caller_func, + int caller_line); #endif /* __MEMORY_ACCESS_H_INCLUDED__ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/misc_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/misc_support.h index 38db1ec..89e9a9b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/misc_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/misc_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MISC_SUPPORT_H_INCLUDED__ #define __MISC_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mmu_device.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mmu_device.h index 1b2017b..48de106 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mmu_device.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mmu_device.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MMU_DEVICE_H_INCLUDED__ #define __MMU_DEVICE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mpmath.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mpmath.h index 57ba67f..76f810e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mpmath.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/mpmath.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __MPMATH_H_INCLUDED__ #define __MPMATH_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/osys.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/osys.h index 6e48ea9..2360320 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/osys.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/osys.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __OSYS_H_INCLUDED__ #define __OSYS_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/pixelgen.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/pixelgen.h index 67f7f3a..99d6b0a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/pixelgen.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/pixelgen.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __PIXELGEN_H_INCLUDED__ #define __PIXELGEN_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/platform_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/platform_support.h index 56fc05a..3136c43 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/platform_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/platform_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __PLATFORM_SUPPORT_H_INCLUDED__ #define __PLATFORM_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/print_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/print_support.h index cfbc222..30f0da5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/print_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/print_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __PRINT_SUPPORT_H_INCLUDED__ #define __PRINT_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/queue.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/queue.h index a3d874b..bbb62d9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/queue.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/queue.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __QUEUE_H_INCLUDED__ #define __QUEUE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/resource.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/resource.h index 82c55ac..fe0bb40 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/resource.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/resource.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __RESOURCE_H_INCLUDED__ #define __RESOURCE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/socket.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/socket.h index c34c2e7..c97c061 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/socket.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/socket.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SOCKET_H_INCLUDED__ #define __SOCKET_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/sp.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/sp.h index 150fc2f..0ee6057 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/sp.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/sp.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SP_H_INCLUDED__ #define __SP_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/storage_class.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/storage_class.h index 3812c80..7130ed7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/storage_class.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/storage_class.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __STORAGE_CLASS_H_INCLUDED__ #define __STORAGE_CLASS_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/stream_buffer.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/stream_buffer.h index 8e41f60..4c5f704 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/stream_buffer.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/stream_buffer.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __STREAM_BUFFER_H_INCLUDED__ #define __STREAM_BUFFER_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/string_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/string_support.h index 5686316..5fc6143 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/string_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/string_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __STRING_SUPPORT_H_INCLUDED__ #define __STRING_SUPPORT_H_INCLUDED__ #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/system_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/system_types.h index 33c049f..04a7aa0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/system_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/system_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SYSTEM_TYPES_H_INCLUDED__ #define __SYSTEM_TYPES_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/tag.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/tag.h index 7385fd1..197a4f0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/tag.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/tag.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TAG_H_INCLUDED__ #define __TAG_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/timed_ctrl.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/timed_ctrl.h index ed13451..7a681ef 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/timed_ctrl.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/timed_ctrl.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TIMED_CTRL_H_INCLUDED__ #define __TIMED_CTRL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/type_support.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/type_support.h index 1f991bb..e1ed501 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/type_support.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/type_support.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TYPE_SUPPORT_H_INCLUDED__ #define __TYPE_SUPPORT_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vamem.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vamem.h index acf932e..3f34453 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vamem.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vamem.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VAMEM_H_INCLUDED__ #define __VAMEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_func.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_func.h index 5d3be31..c620317 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_func.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_func.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VECTOR_FUNC_H_INCLUDED__ #define __VECTOR_FUNC_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_ops.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_ops.h index 261f873..fc2c6a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_ops.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vector_ops.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VECTOR_OPS_H_INCLUDED__ #define __VECTOR_OPS_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vmem.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vmem.h index 79a3675..c9d2465 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vmem.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/vmem.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VMEM_H_INCLUDED__ #define __VMEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/xmem.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/xmem.h index 9169e04..843b074 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/xmem.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_include/xmem.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __XMEM_H_INCLUDED__ #define __XMEM_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_local.h index 9f40603..ede8620 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __QUEUE_LOCAL_H_INCLUDED__ #define __QUEUE_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_private.h index 2b39695..411bda54 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/queue_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __QUEUE_PRIVATE_H_INCLUDED__ #define __QUEUE_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag.c index 9aa8c16..a3ebdd2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "tag.h" #include /* NULL */ #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_local.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_local.h index 01a8977..bca7e7c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_local.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_local.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TAG_LOCAL_H_INCLUDED__ #define __TAG_LOCAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_private.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_private.h index 0570a95..281322d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_private.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/host/tag_private.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TAG_PRIVATE_H_INCLUDED__ #define __TAG_PRIVATE_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/queue_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/queue_global.h index 61330da..c0b84f6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/queue_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/queue_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __QUEUE_GLOBAL_H_INCLUDED__ #define __QUEUE_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/socket_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/socket_global.h index 2b7025e..5bfc0ae 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/socket_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/socket_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SOCKET_GLOBAL_H_INCLUDED__ #define __SOCKET_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/stream_buffer_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/stream_buffer_global.h index b9664b9..afa05d8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/stream_buffer_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/stream_buffer_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __STREAM_BUFFER_GLOBAL_H_INCLUDED__ #define __STREAM_BUFFER_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/sw_event_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/sw_event_global.h index c0d2efa..93690a8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/sw_event_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/sw_event_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SW_EVENT_GLOBAL_H_INCLUDED__ #define __SW_EVENT_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/tag_global.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/tag_global.h index fda4577..06850d0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/tag_global.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/hive_isp_css_shared/tag_global.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __TAG_GLOBAL_H_INCLUDED__ #define __TAG_GLOBAL_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css.h index f67626f..6503db0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef _IA_CSS_H_ #define _IA_CSS_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_3a.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_3a.h index de59e32..9a678cc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_3a.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_3a.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_3A_H #define __IA_CSS_3A_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_acc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_acc_types.h index 2f49a1b..9b96dc2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_acc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_acc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_ACC_TYPES_H #define _IA_CSS_ACC_TYPES_H @@ -257,6 +258,9 @@ struct ia_css_binary_info { uint8_t routing_rgb_to_yuvp1;/**< connect RGB with YUVP1 ACCs*/ uint8_t routing_yuvp1_to_yuvp2;/**< connect YUVP1 with YUVP2 ACCs*/ #endif + uint8_t luma_only; + uint8_t input_yuv; + uint8_t input_raw; uint8_t reduced_pipe; uint8_t vf_veceven; uint8_t dis; @@ -353,7 +357,6 @@ struct ia_css_sp_info { uint32_t host_sp_queues_initialized; /**< Polled from the SP */ uint32_t sleep_mode; /**< different mode to halt SP */ uint32_t invalidate_tlb; /**< inform SP to invalidate mmu TLB */ - uint32_t stop_copy_preview; /**< suspend copy and preview pipe when capture */ uint32_t debug_buffer_ddr_address; /**< inform SP the address of DDR debug queue */ uint32_t perf_counter_input_system_error; /**< input system perf diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_buffer.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_buffer.h index f0db4eb..afa6cbb5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_buffer.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_buffer.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BUFFER_H #define __IA_CSS_BUFFER_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_control.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_control.h index a15d3e3..bebaac0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_control.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_control.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CONTROL_H #define __IA_CSS_CONTROL_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.c index 21b8423..f04cb77 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_device_access.h" #include /* for uint*, size_t */ #include /* for hrt_address */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.h index 8e45180..0e8aee2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_device_access.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_DEVICE_ACCESS_H #define _IA_CSS_DEVICE_ACCESS_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_dvs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_dvs.h index 9c0e404..fc97000 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_dvs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_dvs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DVS_H #define __IA_CSS_DVS_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_env.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_env.h index 24cd450..cfb4a8e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_env.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_env.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ENV_H #define __IA_CSS_ENV_H @@ -81,6 +82,18 @@ struct ia_css_css_mem_env { ia_css_ptr (*mmap)(const void *ptr, const size_t size, uint16_t attribute, void *context); /**< Map an pre-allocated memory region to an address. */ + + /* a set of matching functions with additional debug params */ + ia_css_ptr(*alloc_ex)(size_t bytes, uint32_t attributes, const char *caller_func, int caller_line); + /**< same as alloc above, only with additional debug parameters */ + void (*free_ex)(ia_css_ptr ptr, const char *caller_func, int caller_line); + /**< same as free above, only with additional debug parameters */ + int (*load_ex)(ia_css_ptr ptr, void *data, size_t bytes, const char *caller_func, int caller_line); + /**< same as load above, only with additional debug parameters */ + int (*store_ex)(ia_css_ptr ptr, const void *data, size_t bytes, const char *caller_func, int caller_line); + /**< same as store above, only with additional debug parameters */ + int (*set_ex)(ia_css_ptr ptr, int c, size_t bytes, const char *caller_func, int caller_line); + /**< same as set above, only with additional debug parameters */ }; /** Environment with function pointers to access the CSS hardware. This includes diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_err.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_err.h index 572e4e5..2c02ab9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_err.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_err.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ERR_H #define __IA_CSS_ERR_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_event_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_event_public.h index fb02799..ed5159c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_event_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_event_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EVENT_PUBLIC_H #define __IA_CSS_EVENT_PUBLIC_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_firmware.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_firmware.h index 06d375a..e7bbc35 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_firmware.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_firmware.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FIRMWARE_H #define __IA_CSS_FIRMWARE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frac.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frac.h index da9c601..6daeeea 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frac.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frac.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_FRAC_H #define _IA_CSS_FRAC_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_format.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_format.h index d534fbd..f45cbe3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_format.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_format.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FRAME_FORMAT_H #define __IA_CSS_FRAME_FORMAT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_public.h index 92f2389..5006e51 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_frame_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FRAME_PUBLIC_H #define __IA_CSS_FRAME_PUBLIC_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_host_data.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_host_data.h index 4557e66..59c7657 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_host_data.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_host_data.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef __SH_CSS_HOST_DATA_H #define __SH_CSS_HOST_DATA_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_input_port.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_input_port.h index 8a17c33..2cd526f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_input_port.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_input_port.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_INPUT_PORT_H #define __IA_CSS_INPUT_PORT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_irq.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_irq.h index 416ca4d..9297410 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_irq.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_irq.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IRQ_H #define __IA_CSS_IRQ_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_lace_stat.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_lace_stat.h index 3431b7a..528a7bc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_lace_stat.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_lace_stat.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_LACE_STAT_H #define __IA_CSS_LACE_STAT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.c index 845122a..9605036 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_memory_access.h" #include #include @@ -33,12 +34,12 @@ ia_css_memory_access_init(const struct ia_css_css_mem_env *env) } hrt_vaddress -mmgr_malloc(const size_t size) +mmgr_malloc_ex(const size_t size, const char *caller_func, int caller_line) { - return mmgr_alloc_attr(size, 0); + return mmgr_alloc_attr_ex(size, 0, caller_func, caller_line); } -hrt_vaddress mmgr_alloc_attr(const size_t size, const uint16_t attrs) +hrt_vaddress mmgr_alloc_attr_ex(const size_t size, const uint16_t attrs, const char *caller_func, int caller_line) { uint32_t my_attrs = 0; uint16_t masked_attrs = attrs & MMGR_ATTRIBUTE_MASK; @@ -53,38 +54,85 @@ hrt_vaddress mmgr_alloc_attr(const size_t size, const uint16_t attrs) if (masked_attrs & MMGR_ATTRIBUTE_PAGEALIGN) my_attrs |= IA_CSS_MEM_ATTR_PAGEALIGN; +#if defined(IS_ISP_2500_SYSTEM) +#if defined(_MSC_VER) +/* + SKC has snooping enabled by default on the ISP side, + so there should be no risk in enabing caching on all buffers. + Support for non-cached/non-snooped transactions will be added later. +*/ + my_attrs |= IA_CSS_MEM_ATTR_CACHED; +#endif /* MSC_VER */ +#endif /* 2500 */ + +#if defined(HAS_MMGR_DEBUG) + ptr = my_env.alloc_ex(size, my_attrs, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; ptr = my_env.alloc(size, my_attrs); +#endif return ptr; } hrt_vaddress -mmgr_calloc(const size_t N, const size_t size) +mmgr_calloc_ex(const size_t N, const size_t size, const char *caller_func, int caller_line) { +#if defined(HAS_MMGR_DEBUG) + return mmgr_alloc_attr_ex(size * N, MMGR_ATTRIBUTE_CLEARED, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; return mmgr_alloc_attr(size * N, MMGR_ATTRIBUTE_CLEARED); +#endif } void -mmgr_free(hrt_vaddress vaddr) +mmgr_free_ex(hrt_vaddress vaddr, const char *caller_func, int caller_line) { +#if defined(HAS_MMGR_DEBUG) + my_env.free_ex(vaddr, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; my_env.free(vaddr); +#endif } void -mmgr_clear(hrt_vaddress vaddr, const size_t size) +mmgr_clear_ex(hrt_vaddress vaddr, const size_t size, const char *caller_func, int caller_line) { +#if defined(HAS_MMGR_DEBUG) + my_env.set_ex(vaddr, 0, size, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; my_env.set(vaddr, 0, size); +#endif } void -mmgr_load(const hrt_vaddress vaddr, void *data, const size_t size) +mmgr_load_ex(const hrt_vaddress vaddr, void *data, const size_t size, const char *caller_func, int caller_line) { +#if defined(HAS_MMGR_DEBUG) + my_env.load_ex(vaddr, data, size, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; my_env.load(vaddr, data, size); +#endif } void -mmgr_store(const hrt_vaddress vaddr, const void *data, const size_t size) +mmgr_store_ex(const hrt_vaddress vaddr, const void *data, const size_t size, const char *caller_func, int caller_line) { +#if defined(HAS_MMGR_DEBUG) + my_env.store_ex(vaddr, data, size, caller_func, caller_line); +#else + (void)caller_func; + (void)caller_line; my_env.store(vaddr, data, size); +#endif } hrt_vaddress diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.h index 1d6db0b..9a3689c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_memory_access.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_MEMORY_ACCESS_H_ #define _IA_CSS_MEMORY_ACCESS_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_metadata.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_metadata.h index c40c5a1..13da2f7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_metadata.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_metadata.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_METADATA_H #define __IA_CSS_METADATA_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mipi.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mipi.h index fd2c01b..ad22805 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mipi.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mipi.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MIPI_H #define __IA_CSS_MIPI_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mmu.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mmu.h index 48f8855..deef14a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mmu.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_mmu.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MMU_H #define __IA_CSS_MMU_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_morph.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_morph.h index 969840d..55fca9f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_morph.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_morph.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MORPH_H #define __IA_CSS_MORPH_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe.h index a05fd0d..901fb11 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPE_H__ #define __IA_CSS_PIPE_H__ @@ -29,6 +30,8 @@ struct ia_css_preview_settings { struct ia_css_binary copy_binary; struct ia_css_binary preview_binary; struct ia_css_binary vf_pp_binary; + struct ia_css_frame *delay_frames[MAX_NUM_DELAY_FRAMES]; /* Needed for SkyCam DVS */ + struct ia_css_frame *tnr_frames[NUM_TNR_FRAMES]; /* Needed for SkyCam TNR */ struct ia_css_pipe *copy_pipe; struct ia_css_pipe *capture_pipe; struct ia_css_pipe *acc_pipe; @@ -39,6 +42,8 @@ struct ia_css_preview_settings { IA_CSS_BINARY_DEFAULT_SETTINGS, /* copy_binary */\ IA_CSS_BINARY_DEFAULT_SETTINGS, /* preview_binary */\ IA_CSS_BINARY_DEFAULT_SETTINGS, /* vf_pp_binary */\ + { NULL }, /* dvs_frames */ \ + { NULL }, /* tnr_frames */ \ NULL, /* copy_pipe */\ NULL, /* capture_pipe */\ NULL, /* acc_pipe */\ @@ -86,7 +91,7 @@ struct ia_css_video_settings { struct ia_css_binary vf_pp_binary; struct ia_css_binary *yuv_scaler_binary; struct ia_css_frame *delay_frames[MAX_NUM_VIDEO_DELAY_FRAMES]; - struct ia_css_frame *tnr_frames[NUM_VIDEO_TNR_FRAMES]; + struct ia_css_frame *tnr_frames[NUM_TNR_FRAMES]; struct ia_css_frame *vf_pp_in_frame; struct ia_css_pipe *copy_pipe; struct ia_css_pipe *capture_pipe; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe_public.h index 254e83d..2aecfcc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_pipe_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPE_PUBLIC_H #define __IA_CSS_PIPE_PUBLIC_H @@ -24,6 +25,7 @@ #include #include #include +#include enum { IA_CSS_PIPE_OUTPUT_STAGE_0 = 0, @@ -62,6 +64,8 @@ enum ia_css_pipe_version { /** * Pipe configuration structure. + * Resolution properties are filled by Driver, kernel configurations are + * set by AIC */ struct ia_css_pipe_config { enum ia_css_pipe_mode mode; @@ -73,9 +77,14 @@ struct ia_css_pipe_config { struct ia_css_resolution bayer_ds_out_res; /**< bayer down scaling */ struct ia_css_resolution capt_pp_in_res; - /**< bayer down scaling */ + /**< capture post processing input resolution */ struct ia_css_resolution vf_pp_in_res; - /**< bayer down scaling */ + /**< view finder post processing input resolution */ + struct ia_css_resolution output_system_in_res; + /**< For IPU3 only: use output_system_in_res to specify what input resolution + will OSYS receive, this resolution is equal to the output resolution of GDC + if not determined CSS will set output_system_in_res with main osys output pin resolution + All other IPUs may ignore this property */ struct ia_css_resolution dvs_crop_out_res; /**< dvs crop, video only, not in use yet. Use dvs_envelope below. */ struct ia_css_frame_info output_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE]; @@ -108,15 +117,36 @@ struct ia_css_pipe_config { /**< Enabling BCI mode will cause yuv_scale binary to be picked up instead of vf_pp. This only applies to viewfinder post processing stages. */ + bool enable_luma_only; + /**< Enabling of monochrome mode for a pipeline. If enabled only luma processing + will be done. */ + bool enable_tnr; + /**< Enabling of TNR (temporal noise reduction). This is only applicable to video + pipes. Non video-pipes should always set this parameter to false. */ struct ia_css_isp_config *p_isp_config; /**< Pointer to ISP configuration */ struct ia_css_resolution gdc_in_buffer_res; /**< GDC in buffer resolution. */ struct ia_css_point gdc_in_buffer_offset; /**< GDC in buffer offset - indicates the pixel coordinates of the first valid pixel inside the buffer */ + struct ia_css_coordinate internal_frame_origin_bqs_on_sctbl; + /**< Origin of internal frame positioned on shading table at shading correction in ISP. + NOTE: Shading table is larger than or equal to internal frame. + Shading table has shading gains and internal frame has bayer data. + The origin of internal frame is used in shading correction in ISP + to retrieve shading gains which correspond to bayer data. */ }; /** + * Default origin of internal frame positioned on shading table. + */ +#define IA_CSS_PIPE_DEFAULT_INTERNAL_FRAME_ORIGIN_BQS_ON_SCTBL \ +{ \ + 0, /* x [bqs] */ \ + 0 /* y [bqs] */ \ +} + +/** * Default settings for newly created pipe configurations. */ #define DEFAULT_PIPE_CONFIG \ @@ -127,6 +157,7 @@ struct ia_css_pipe_config { { 0, 0 }, /* bayer_ds_out_res */ \ { 0, 0 }, /* vf_pp_in_res */ \ { 0, 0 }, /* capt_pp_in_res */ \ + { 0, 0 }, /* output_system_in_res */ \ { 0, 0 }, /* dvs_crop_out_res */ \ {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* output_info */ \ {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* vf_output_info */ \ @@ -140,9 +171,12 @@ struct ia_css_pipe_config { false, /* enable_dz */ \ false, /* enable_dpc */ \ false, /* enable_vfpp_bci */ \ + false, /* enable_luma_only */ \ + false, /* enable_tnr */ \ NULL, /* p_isp_config */\ { 0, 0 }, /* gdc_in_buffer_res */ \ - { 0, 0 } /* gdc_in_buffer_offset */ \ + { 0, 0 }, /* gdc_in_buffer_offset */ \ + IA_CSS_PIPE_DEFAULT_INTERNAL_FRAME_ORIGIN_BQS_ON_SCTBL /* internal_frame_origin_bqs_on_sctbl */ \ } /** Pipe info, this struct describes properties of a pipe after it's stream has @@ -465,6 +499,27 @@ ia_css_pipe_get_qos_ext_state (struct ia_css_pipe *pipe, uint32_t fw_handle, bool * enable); +/** @brief Update mapped CSS and ISP arguments for QoS pipe during SP runtime. + * @param[in] pipe Pipe handle. + * @param[in] fw_handle Extension firmware Handle (ia_css_fw_info.handle). + * @param[in] css_seg Parameter memory descriptors for CSS segments. + * @param[in] isp_seg Parameter memory descriptors for ISP segments. + * + * @return + * IA_CSS_SUCCESS : Success + * IA_CSS_ERR_INVALID_ARGUMENTS : Invalid Parameters + * IA_CSS_ERR_RESOURCE_NOT_AVAILABLE : Inactive QOS Pipe + * (No active stream with this pipe) + * + * \deprecated{This interface is used to temporarily support a late-developed, + * specific use-case on a specific IPU2 platform. It will not be supported or + * maintained on IPU3 or further.} + */ +enum ia_css_err +ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe, uint32_t fw_handle, + struct ia_css_isp_param_css_segments *css_seg, + struct ia_css_isp_param_isp_segments *isp_seg); + /** @brief Get selected configuration settings * @param[in] pipe The pipe. * @param[out] config Configuration settings. diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_prbs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_prbs.h index 7c3cacf..d0c68ad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_prbs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_prbs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PRBS_H #define __IA_CSS_PRBS_H @@ -28,6 +29,14 @@ enum ia_css_prbs_id { }; /** + * Maximum number of PRBS IDs. + * + * Make sure the value of this define gets changed to reflect the correct + * number of ia_css_prbs_id enum if you add/delete an item in the enum. + */ +#define N_CSS_PRBS_IDS (IA_CSS_PRBS_ID2+1) + +/** * PRBS configuration structure. * * Seed the for the Pseudo Random Bit Sequence. diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_properties.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_properties.h index 19af402..6756e98 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_properties.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_properties.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PROPERTIES_H #define __IA_CSS_PROPERTIES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_shading.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_shading.h index cb0f249..b030813 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_shading.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_shading.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SHADING_H #define __IA_CSS_SHADING_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream.h index 23c91ce..a27cdbd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_STREAM_H_ #define _IA_CSS_STREAM_H_ @@ -42,7 +43,6 @@ struct ia_css_stream { bool cont_capt; bool disable_cont_vf; - bool stop_copy_preview; bool started; }; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_format.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_format.h index ae608a9..0ae05f5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_format.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_format.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_STREAM_FORMAT_H #define __IA_CSS_STREAM_FORMAT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_public.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_public.h index 357395c..76974e6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_public.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_stream_public.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_STREAM_PUBLIC_H #define __IA_CSS_STREAM_PUBLIC_H @@ -101,6 +102,13 @@ struct ia_css_stream_config { struct ia_css_stream_isys_stream_config isys_config[IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH]; struct ia_css_stream_input_config input_config; + /* Currently, Android and Windows platforms interpret the binning_factor parameter + * differently. In Android, the binning factor is expressed in the form + * 2^N * 2^N, whereas in Windows platform, the binning factor is N*N + * To use the Windows method of specification, the caller has to define + * macro USE_WINDOWS_BINNING_FACTOR. This is for backward compatibility only + * and will be deprecated. In the future,all platforms will use the N*N method + */ unsigned int sensor_binning_factor; /**< Binning factor used by sensor to produce image data. This is used for shading correction. */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_timer.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_timer.h index 0eb3409..988f262 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_timer.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_timer.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TIMER_H #define __IA_CSS_TIMER_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_tpg.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_tpg.h index cef4995..9e34f6c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_tpg.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_tpg.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TPG_H #define __IA_CSS_TPG_H @@ -27,6 +28,14 @@ enum ia_css_tpg_id { IA_CSS_TPG_ID2 }; +/** + * Maximum number of TPG IDs. + * + * Make sure the value of this define gets changed to reflect the correct + * number of ia_css_tpg_id enum if you add/delete an item in the enum. + */ +#define N_CSS_TPG_IDS (IA_CSS_TPG_ID2+1) + /** Enumerate the TPG modes. */ enum ia_css_tpg_mode { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_types.h index c2dae0a..d379b32 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_types.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef _IA_CSS_TYPES_H #define _IA_CSS_TYPES_H @@ -56,6 +57,7 @@ #include "isp/kernels/wb/wb_1.0/ia_css_wb_types.h" #include "isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h" #include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h" +#include "isp/kernels/tnr/tnr3/ia_css_tnr3_types.h" #include "isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h" #include "isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h" #include "isp/kernels/output/output_1.0/ia_css_output_types.h" @@ -88,8 +90,15 @@ typedef uint32_t ia_css_ptr; /** Generic resolution structure. */ struct ia_css_resolution { - unsigned int width; /**< Width */ - unsigned int height; /**< Height */ + uint32_t width; /**< Width */ + uint32_t height; /**< Height */ +}; + +/** Generic coordinate structure. + */ +struct ia_css_coordinate { + int32_t x; /**< Value of a coordinate on the horizontal axis */ + int32_t y; /**< Value of a coordinate on the vertical axis */ }; /** Vector with signed values. This is used to indicate motion for @@ -124,7 +133,8 @@ struct ia_css_isp_data { /** Shading Correction types. */ enum ia_css_shading_correction_type { - IA_CSS_SHADING_CORRECTION_TYPE_1 /**< Shading Correction 1.0 (pipe 1.0 on ISP2300, pipe 2.2 on ISP2400) */ + IA_CSS_SHADING_CORRECTION_NONE, /**< Shading Correction is not processed in the pipe. */ + IA_CSS_SHADING_CORRECTION_TYPE_1 /**< Shading Correction 1.0 (pipe 1.0 on ISP2300, pipe 2.2 on ISP2400/2401) */ /**< More shading correction types can be added in the future. */ }; @@ -135,69 +145,163 @@ struct ia_css_shading_info { union { /** Shading Correction information of each Shading Correction types. */ - /** Shading Correction information of Shading Correction Type 1. + /** Shading Correction information of IA_CSS_SHADING_CORRECTION_TYPE_1. * * This structure contains the information necessary to generate - * the shading table required in the isp. - * This structure is filled in the css, - * and the driver needs to get it to generate the shading table. + * the shading table directly required from ISP. + * This structure is filled in CSS, and the driver needs to get it to generate the shading table. + * + * The shading correction is applied to the bayer area which contains sensor data and padding data. + * The shading table should cover this bayer area. + * + * The shading table size directly required from ISP is expressed by these parameters. + * 1. uint32_t num_hor_grids; + * 2. uint32_t num_ver_grids; + * 3. uint32_t bqs_per_grid_cell; + * + * In some isp binaries, the bayer scaling is applied before the shading correction is applied. + * Then, this scaling factor should be considered in generating the shading table. + * The scaling factor is expressed by these parameters. + * 4. uint32_t bayer_scale_hor_ratio_in; + * 5. uint32_t bayer_scale_hor_ratio_out; + * 6. uint32_t bayer_scale_ver_ratio_in; + * 7. uint32_t bayer_scale_ver_ratio_out; + * + * The sensor data size inputted to ISP is expressed by this parameter. + * This is the size BEFORE the bayer scaling is applied. + * 8. struct ia_css_resolution isp_input_sensor_data_res_bqs; + * + * The origin of the sensor data area positioned on the shading table at the shading correction + * is expressed by this parameter. + * The size of this area assumes the size AFTER the bayer scaling is applied + * to the isp_input_sensor_data_resolution_bqs. + * 9. struct ia_css_coordinate sensor_data_origin_bqs_on_sctbl; + * + * ****** Definitions of the shading table and the sensor data at the shading correction ****** + * + * (0,0)--------------------- TW ------------------------------- + * | shading table | + * | (ox,oy)---------- W -------------------------- | + * | | sensor data | | + * | | | | + * TH H sensor data center | | + * | | (cx,cy) | | + * | | | | + * | | | | + * | | | | + * | ------------------------------------------- | + * | | + * ---------------------------------------------------------- + * + * Example of still mode for output 1080p: + * + * num_hor_grids = 66 + * num_ver_grids = 37 + * bqs_per_grid_cell = 16 + * bayer_scale_hor_ratio_in = 1 + * bayer_scale_hor_ratio_out = 1 + * bayer_scale_ver_ratio_in = 1 + * bayer_scale_ver_ratio_out = 1 + * isp_input_sensor_data_resolution_bqs = {966, 546} + * sensor_data_origin_bqs_on_sctbl = {61, 15} + * + * TW, TH [bqs]: width and height of shading table + * TW = (num_hor_grids - 1) * bqs_per_grid_cell = (66 - 1) * 16 = 1040 + * TH = (num_ver_grids - 1) * bqs_per_grid_cell = (37 - 1) * 16 = 576 * - * Before the shading correction is applied, NxN-filter and/or scaling - * are applied in the isp, depending on the isp binaries. - * Then, these should be considered in generating the shading table. - * - Bad pixels on left/top sides generated by NxN-filter - * (Bad pixels are NOT considered currently, - * because they are subtle.) - * - Down-scaling/Up-scaling factor + * W, H [bqs]: width and height of sensor data at shading correction + * W = sensor_data_res_bqs.width + * = isp_input_sensor_data_res_bqs.width + * * bayer_scale_hor_ratio_out / bayer_scale_hor_ratio_in + 0.5 = 966 + * H = sensor_data_res_bqs.height + * = isp_input_sensor_data_res_bqs.height + * * bayer_scale_ver_ratio_out / bayer_scale_ver_ratio_in + 0.5 = 546 * - * Shading correction is applied to the area - * which has real sensor data and margin. - * Then, the shading table should cover the area including margin. - * This structure has this information. - * - Origin coordinate of bayer (real sensor data) - * on the shading table + * (ox, oy) [bqs]: origin of sensor data positioned on shading table at shading correction + * ox = sensor_data_origin_bqs_on_sctbl.x = 61 + * oy = sensor_data_origin_bqs_on_sctbl.y = 15 + * + * (cx, cy) [bqs]: center of sensor data positioned on shading table at shading correction + * cx = ox + W/2 = 61 + 966/2 = 544 + * cy = oy + H/2 = 15 + 546/2 = 288 + * + * ****** Relation between the shading table and the sensor data ****** + * + * The origin of the sensor data should be on the shading table. + * 0 <= ox < TW, 0 <= oy < TH + * + * ****** How to center the shading table on the sensor data ****** + * + * To center the shading table on the sensor data, + * CSS decides the shading table size so that a certain grid point is positioned + * on the center of the sensor data at the shading correction. + * CSS expects the shading center is set on this grid point + * when the shading table data is calculated in AIC. + * + * W, H [bqs]: width and height of sensor data at shading correction + * W = sensor_data_res_bqs.width + * H = sensor_data_res_bqs.height + * + * (cx, cy) [bqs]: center of sensor data positioned on shading table at shading correction + * cx = sensor_data_origin_bqs_on_sctbl.x + W/2 + * cy = sensor_data_origin_bqs_on_sctbl.y + H/2 + * + * CSS decides the shading table size and the sensor data position + * so that the (cx, cy) satisfies this condition. + * mod(cx, bqs_per_grid_cell) = 0 + * mod(cy, bqs_per_grid_cell) = 0 + * + * ****** How to change the sensor data size by processes in the driver and ISP ****** + * + * 1. sensor data size: Physical sensor size + * (The struct ia_css_shading_info does not have this information.) + * 2. process: Driver applies the sensor cropping/binning/scaling to physical sensor size. + * 3. sensor data size: ISP input size (== shading_info.isp_input_sensor_data_res_bqs) + * (ISP assumes the ISP input sensor data is centered on the physical sensor.) + * 4. process: ISP applies the bayer scaling by the factor of shading_info.bayer_scale_*. + * 5. sensor data size: Scaling factor * ISP input size (== shading_info.sensor_data_res_bqs) + * 6. process: ISP applies the shading correction. * * ISP block: SC1 * ISP1: SC1 is used. * ISP2: SC1 is used. */ struct { - uint32_t enable; /**< Shading correction enabled. - 0:disabled, 1:enabled */ - uint32_t num_hor_grids; /**< Number of data points per line - per color on shading table. */ - uint32_t num_ver_grids; /**< Number of lines of data points - per color on shading table. */ - 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 num_hor_grids; /**< Number of data points per line per color on shading table. */ + uint32_t num_ver_grids; /**< Number of lines of data points per color on shading table. */ + uint32_t bqs_per_grid_cell; /**< Grid cell size in BQ unit. + 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. */ uint32_t bayer_scale_hor_ratio_in; uint32_t bayer_scale_hor_ratio_out; - /**< Horizontal ratio of bayer scaling - between input width and output width, for the scaling - which should be done before shading correction. - output_width = input_width * bayer_scale_hor_ratio_out - / bayer_scale_hor_ratio_in */ + /**< Horizontal ratio of bayer scaling between input width and output width, + for the scaling which should be done before shading correction. + output_width = input_width * bayer_scale_hor_ratio_out + / bayer_scale_hor_ratio_in + 0.5 */ uint32_t bayer_scale_ver_ratio_in; uint32_t bayer_scale_ver_ratio_out; - /**< Vertical ratio of bayer scaling - between input height and output height, for the scaling - which should be done before shading correction. - output_height = input_height * bayer_scale_ver_ratio_out - / bayer_scale_ver_ratio_in */ - uint32_t sc_bayer_origin_x_bqs_on_shading_table; - /**< X coordinate (in bqs) of bayer origin on shading table. - This indicates the left-most pixel of bayer - (not include margin) inputted to the shading correction. - This corresponds to the left-most pixel of bayer - inputted to isp from sensor. */ - uint32_t sc_bayer_origin_y_bqs_on_shading_table; - /**< Y coordinate (in bqs) of bayer origin on shading table. - This indicates the top pixel of bayer - (not include margin) inputted to the shading correction. - This corresponds to the top pixel of bayer - inputted to isp from sensor. */ + /**< Vertical ratio of bayer scaling between input height and output height, + for the scaling which should be done before shading correction. + output_height = input_height * bayer_scale_ver_ratio_out + / bayer_scale_ver_ratio_in + 0.5 */ + struct ia_css_resolution isp_input_sensor_data_res_bqs; + /**< Sensor data size (in bqs) inputted to ISP. This is the size BEFORE bayer scaling. + NOTE: This is NOT the size of the physical sensor size. + CSS requests the driver that ISP inputs sensor data + by the size of isp_input_sensor_data_res_bqs. + The driver sends the sensor data to ISP, + after the adequate cropping/binning/scaling + are applied to the physical sensor data area. + ISP assumes the area of isp_input_sensor_data_res_bqs + is centered on the physical sensor. */ + struct ia_css_resolution sensor_data_res_bqs; + /**< Sensor data size (in bqs) at shading correction. + This is the size AFTER bayer scaling. */ + struct ia_css_coordinate sensor_data_origin_bqs_on_sctbl; + /**< Origin of sensor data area positioned on shading table at shading correction. + The coordinate x,y should be positive values. */ } type_1; /**< More structures can be added here when more shading correction types will be added @@ -205,26 +309,29 @@ struct ia_css_shading_info { } info; }; -/** Default Shading Correction information. */ -#define DEFAULT_SHADING_INFO \ +/** Default Shading Correction information of Shading Correction Type 1. */ +#define DEFAULT_SHADING_INFO_TYPE_1 \ { \ IA_CSS_SHADING_CORRECTION_TYPE_1, /* type */ \ { /* info */ \ { \ - 0, /* enable */ \ - 0, /* num_hor_grids */ \ - 0, /* num_ver_grids */ \ - 0, /* bqs_per_grid_cell */ \ - 1, /* bayer_scale_hor_ratio_in */ \ - 1, /* bayer_scale_hor_ratio_out */ \ - 1, /* bayer_scale_ver_ratio_in */ \ - 1, /* bayer_scale_ver_ratio_out */ \ - 0, /* sc_bayer_origin_x_bqs_on_shading_table */ \ - 0 /* sc_bayer_origin_y_bqs_on_shading_table */ \ + 0, /* num_hor_grids */ \ + 0, /* num_ver_grids */ \ + 0, /* bqs_per_grid_cell */ \ + 1, /* bayer_scale_hor_ratio_in */ \ + 1, /* bayer_scale_hor_ratio_out */ \ + 1, /* bayer_scale_ver_ratio_in */ \ + 1, /* bayer_scale_ver_ratio_out */ \ + {0, 0}, /* isp_input_sensor_data_res_bqs */ \ + {0, 0}, /* sensor_data_res_bqs */ \ + {0, 0} /* sensor_data_origin_bqs_on_sctbl */ \ } \ } \ } +/** Default Shading Correction information. */ +#define DEFAULT_SHADING_INFO DEFAULT_SHADING_INFO_TYPE_1 + /** structure that describes the 3A and DIS grids */ struct ia_css_grid_info { /** \name ISP input size @@ -456,7 +563,8 @@ struct ia_css_isp_config { struct ia_css_2500_yuvp1_b0_kernel_config *yuvp1_b0_2500_config; /**< Skylake: yuvp1 config for B0*/ struct ia_css_2500_yuvp1_c0_kernel_config *yuvp1_c0_2500_config; /**< Skylake: yuvp1 config for C0*/ struct ia_css_2500_yuvp2_kernel_config *yuvp2_2500_config; /**< Skylake: yuvp2 config */ - struct ia_css_2500_tnr_kernel_config *tnr_2500_config; /**< Skylake: TNR config */ + struct ia_css_2500_tnr_kernel_config *tnr_2500_config; /**< Skylake: TNR config -- To be deprecated */ + struct ia_css_tnr3_kernel_config *tnr3_config; /**< TNR3 config */ struct ia_css_2500_dpc_kernel_config *dpc_2500_config; /**< Skylake: DPC config */ struct ia_css_2500_awb_kernel_config *awb_2500_config; /**< Skylake: auto white balance config */ struct ia_css_2500_awb_fr_kernel_config *awb_fr_2500_config; /**< Skylake: auto white balance filter response config */ @@ -471,7 +579,8 @@ struct ia_css_isp_config { [OSYS, n/a] */ struct ia_css_output_config *output_config_display; /**< Viewfinder/display output mirroring, flipping (optional) */ - struct ia_css_frame *output_frame; /**< Output frame the config is to be applied to (optional) */ + struct ia_css_frame *output_frame; /**< Output frame the config is to be applied to (optional) */ + struct ia_css_2500_input_feeder_config *input_feeder_2500_config; /**< Input feeder cropping configuration (getters only) */ uint32_t isp_config_id; /**< Unique ID to track which config was actually applied to a particular frame */ }; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version.h index 48c5989..fa5de3d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_VERSION_H #define __IA_CSS_VERSION_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version_data.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version_data.h index 5611782..64f76a2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version_data.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/ia_css_version_data.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + // // This file contains the version data for the CSS // @@ -22,7 +23,7 @@ #define __IA_CSS_VERSION_DATA_H -#define CSS_VERSION_STRING "REL:20150521_21.4_0539; API:2.1.15.3; GIT:irci_candrpv_0415_20150504_35b345#35b345be52ac575f8934abb3a88fea26a94e7343; SDK:/nfs/iir/disks/iir_hivepackages_003/iir_hivepkgs_disk017/Css_Mizuchi/packages/Css_Mizuchi/int_css_mizuchi_20140829_1053; USER:viedifw; " +#define CSS_VERSION_STRING "REL:20150701_27.3_0620; API:2.1.20.4; GIT:irci_20150630_0351_#7f4601d66644d6169cede1aa847af0103b40f21c; SDK:; USER:viedifw; " #endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.c index 942ebe0..607523d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.h index c3785e0..6edb861 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_AA_HOST_H #define __IA_CSS_AA_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_param.h index dbab4d6..0e74640 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_AA_PARAM_H #define __IA_CSS_AA_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_state.h index cc40401..f587bb4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_AA2_STATE_H #define __IA_CSS_AA2_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_types.h index 834eedb..16a80aa 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/aa/aa_2/ia_css_aa2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_AA2_TYPES_H #define __IA_CSS_AA2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.c index edc4f1a..168ddc5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.h index 29566c0..00e6be3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR_HOST_H #define __IA_CSS_ANR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_param.h index 2621b92..7253749 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR_PARAM_H #define __IA_CSS_ANR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_types.h index e205574..994cd57 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_1.0/ia_css_anr_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR_TYPES_H #define __IA_CSS_ANR_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.c index b338c43..1cbfa58 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.h index 83c37e32..bb4d214 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR2_HOST_H #define __IA_CSS_ANR2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c index 2de51fe..1db094a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #include "ia_css_types.h" #include "ia_css_anr2_table.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h index 534119e..23cfefa 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR2_TABLE_HOST_H #define __IA_CSS_ANR2_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_types.h index 3832ada..79f5208 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR2_TYPES_H #define __IA_CSS_ANR2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr_param.h index 4a28985..c4363c6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/anr/anr_2/ia_css_anr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ANR2_PARAM_H #define __IA_CSS_ANR2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h index 8e1f300..f02aef9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BAYER_LOAD_PARAM_H #define __IA_CSS_BAYER_LOAD_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h index 053b411..86785c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,27 +12,11 @@ * more details. */ + #ifndef __IA_CSS_BAYER_LS_PARAM_H #define __IA_CSS_BAYER_LS_PARAM_H #include "type_support.h" - -#define NUM_BAYER_LS 2 -#define BAYER_IDX_GR 0 -#define BAYER_IDX_R 1 -#define BAYER_IDX_B 2 -#define BAYER_IDX_GB 3 -#define BAYER_QUAD_WIDTH 2 -#define BAYER_QUAD_HEIGHT 2 -#define NOF_BAYER_VECTORS 4 - -/** bayer load/store */ -struct sh_css_isp_bayer_ls_isp_config { - uint32_t base_address[NUM_BAYER_LS]; - uint32_t width[NUM_BAYER_LS]; - uint32_t height[NUM_BAYER_LS]; - uint32_t stride[NUM_BAYER_LS]; -}; - +#include "../../io_ls/common/ia_css_common_io_types.h" #endif /* __IA_CSS_BAYER_LS_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h index f330be8..60c0616 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BAYER_STORE_PARAM_H #define __IA_CSS_BAYER_STORE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.c index 69e708f..096307b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #if !defined(HAS_NO_HMEM) #include "ia_css_memory_access.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.h index 339e954..3887e4c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BH_HOST_H #define __IA_CSS_BH_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_param.h index b0a8ef3..10a6ab0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_HB_PARAM_H #define __IA_CSS_HB_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_types.h index 9ae27a9..b4dd39c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bh/bh_2/ia_css_bh_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BH_TYPES_H #define __IA_CSS_BH_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.c index 3af107d..596c1d8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "type_support.h" #include "ia_css_bnlm.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.h index b99c064..bfc48b6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNLM_HOST_H #define __IA_CSS_BNLM_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.c index e2eb88c..767745b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_bnlm_types.h" const struct ia_css_bnlm_config default_bnlm_config = { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.h index f18c807..8dd8d2e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_default.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNLM_DEFAULT_HOST_H #define __IA_CSS_BNLM_DEFAULT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_param.h index 2f4be43..261b68f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNLM_PARAM_H #define __IA_CSS_BNLM_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_state.h index 79cce0e..1db1891 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNLM_STATE_H #define __IA_CSS_BNLM_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_types.h index 219fb83..bcf6f08 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnlm/ia_css_bnlm_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNLM_TYPES_H #define __IA_CSS_BNLM_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c index a7de6ec..aeb5ea4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "type_support.h" #include "ia_css_bnr2_2.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h index 59349c1..ecf296f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNR2_2_HOST_H #define __IA_CSS_BNR2_2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h index 6dec27a..658b4e5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNR2_2_PARAM_H #define __IA_CSS_BNR2_2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h index be80f70..3cad8c8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNR2_2_TYPES_H #define __IA_CSS_BNR2_2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c index d1baca5..df793db 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h index ccd2abc..d7d53ec 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNR_HOST_H #define __IA_CSS_BNR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h index 331e058..89f1bba 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_BNR_PARAM_H #define __IA_CSS_BNR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c index d14fd8f..0e7d70d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h index 6f00d28..6a6d63a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR_HOST_H #define __IA_CSS_CNR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h index c1af207..42f2c03 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR_PARAM_H #define __IA_CSS_CNR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h index 795fba7..281d130 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR_STATE_H #define __IA_CSS_CNR_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c index 4b4b2b7..3a14941 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h index abcf0eb..4eaa142 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR2_HOST_H #define __IA_CSS_CNR2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h index d6f490e..9414382 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR2_PARAM_H #define __IA_CSS_CNR2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h index 6df6c2b..140ab5d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR2_TYPES_H #define __IA_CSS_CNR2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h index 56651ba..83d8597 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNRX_PARAM_H #define __IA_CSS_CNRX_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h index e533e2f..c115ba2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CNR2_STATE_H #define __IA_CSS_CNR2_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c index 8f25ee1..f5801d5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "ia_css_conversion.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h index cbe8b22..c2e2bd3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CONVERSION_HOST_H #define __IA_CSS_CONVERSION_HOST_H @@ -26,4 +27,6 @@ ia_css_conversion_encode( const struct ia_css_conversion_config *from, unsigned size); +/* 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 /* __IA_CSS_CONVERSION_HOST_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h index 301d506..bb992d0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CONVERSION_PARAM_H #define __IA_CSS_CONVERSION_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h index 3f11442..1a12d63 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CONVERSION_TYPES_H #define __IA_CSS_CONVERSION_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c index 45e1ea8..23d514b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_copy_output.host.h" #include "ia_css_binary.h" #include "type_support.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h index 3eb7736..dcd905e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_COPY_OUTPUT_HOST_H #define __IA_CSS_COPY_OUTPUT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h index 622d918..8579233 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_COPY_PARAM_H #define __IA_CSS_COPY_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.c index 9290522..f8d14cc3d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.h index 9c1a4c7..fc7642c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CROP_HOST_H #define __IA_CSS_CROP_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_param.h index 8bfc8da..8e036f9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CROP_PARAM_H #define __IA_CSS_CROP_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_types.h index 8091ad4..395bc82 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/crop/crop_1.0/ia_css_crop_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CROP_TYPES_H #define __IA_CSS_CROP_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.c index 9f94ef1..ff2c570 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.h index eb10d8a..1845a9e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CSC_HOST_H #define __IA_CSS_CSC_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_param.h index 0b054a9..990d89a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CSC_PARAM_H #define __IA_CSS_CSC_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_types.h index 54ced07..7ea9411 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/csc/csc_1.0/ia_css_csc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CSC_TYPES_H #define __IA_CSS_CSC_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c index e27648c..a74130a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h index d943aff..82545dd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC1_5_HOST_H #define __IA_CSS_CTC1_5_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h index 8d9ac2b..0f08caac 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC1_5_PARAM_H #define __IA_CSS_CTC1_5_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h index dcd471f..52ed179 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTCX_PARAM_H #define __IA_CSS_CTCX_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c index c8b4b33..6c5a9c0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "assert_support.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h index 3733aee..a8cb1d3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC2_HOST_H #define __IA_CSS_CTC2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h index c66e823..5f97f65 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC2_PARAM_H #define __IA_CSS_CTC2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h index 7b75f01..736238b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC2_TYPES_H #define __IA_CSS_CTC2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c index 7c1a367..e443dfd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h index bec52a6..1766a12 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC_HOST_H #define __IA_CSS_CTC_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h index 6e88ad3..49e4e84 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC_PARAM_H #define __IA_CSS_CTC_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c index edf85ab..657e844 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include /* memcpy */ #include "system_global.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h index a350dec..394f9cf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC_TABLE_HOST_H #define __IA_CSS_CTC_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h index 1da215b..a99fc77 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_CTC_TYPES_H #define __IA_CSS_CTC_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.c index fbab2f1..2517bdc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.h index 5dd6f06..b999656e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE_HOST_H #define __IA_CSS_DE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_param.h index 833c80a..d7c5af2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE_PARAM_H #define __IA_CSS_DE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_state.h index d645117..e0f8b31 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE_STATE_H #define __IA_CSS_DE_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_types.h index 525c838..aa8ccdb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_1.0/ia_css_de_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE_TYPES_H #define __IA_CSS_DE_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.c index a5247a5..e65a494 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.h index f7cd844..e6cea45 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE2_HOST_H #define __IA_CSS_DE2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_param.h index ea2da73..9074807 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE2_PARAM_H #define __IA_CSS_DE2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_types.h index eac1b27..6cfa892 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE2_TYPES_H #define __IA_CSS_DE2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_param.h index 59af952..4788ae0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DEX_PARAM_H #define __IA_CSS_DEX_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_state.h index f2c65ba..48d254b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/de/de_2/ia_css_de_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DE2_STATE_H #define __IA_CSS_DE2_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.c index a5f0466..cbc4ff6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" @@ -19,6 +20,18 @@ #include "ia_css_dp.host.h" +/* 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 +}; const struct ia_css_dp_config default_dp_config = { 8192, 2048, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.h index 302f7f9..2525a2d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #ifndef __IA_CSS_DP_HOST_H #define __IA_CSS_DP_HOST_H @@ -20,6 +21,7 @@ #include "ia_css_dp_param.h" extern const struct ia_css_dp_config default_dp_config; +extern const struct ia_css_dp_config default_dp_10bpp_config; void ia_css_dp_encode( diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_param.h index fc9035a..353d8f8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DP_PARAM_H #define __IA_CSS_DP_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_state.h index 126d0d3..475b326 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,13 +12,14 @@ * more details. */ + #ifndef __IA_CSS_DP_STATE_H #define __IA_CSS_DP_STATE_H #include "type_support.h" #include "vmem.h" -#if NEED_BDS_OTHER_THAN_1_00 +#if ENABLE_FIXED_BAYER_DS #define MAX_VECTORS_PER_DP_LINE MAX_VECTORS_PER_BUF_INPUT_LINE #else #define MAX_VECTORS_PER_DP_LINE MAX_VECTORS_PER_BUF_LINE diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_types.h index b5d7b6b..34e94b9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dp/dp_1.0/ia_css_dp_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DP_TYPES_H #define __IA_CSS_DP_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.c index bc14b85..6fdbc33 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_dpc2.host.h" #include "assert_support.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.h index 641564b..5e6ed85 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DPC2_HOST_H #define __IA_CSS_DPC2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.c index c102601..4194264 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_dpc2_types.h" const struct ia_css_dpc2_config default_dpc2_config = { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.h index a1527ce..3ef451c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_default.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DPC2_DEFAULT_HOST_H #define __IA_CSS_DPC2_DEFAULT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_param.h index ef668d5..8552a7b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DPC2_PARAM_H #define __IA_CSS_DPC2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_state.h index cbf1e81..6f49e72 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DPC2_STATE_H #define __IA_CSS_DPC2_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_types.h index b2c9741..362f9af 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dpc2/ia_css_dpc2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DPC2_TYPES_H #define __IA_CSS_DPC2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c index 3ec384e..32d03b3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_frame_public.h" #define IA_CSS_INCLUDE_CONFIGURATIONS #include "ia_css_isp_configs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h index 2f513e2..80236c0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DVS_HOST_H #define __IA_CSS_DVS_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h index e06a15d..6b91a50 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,13 +12,19 @@ * more details. */ + #ifndef __IA_CSS_DVS_PARAM_H #define __IA_CSS_DVS_PARAM_H #include + +#if !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) && !defined(PARAMBIN_GENERATION) #include "dma.h" +#endif /* !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) */ + #include "uds/uds_1.0/ia_css_uds_param.h" + /** dvserence frame */ struct sh_css_isp_dvs_isp_config { uint32_t num_horizontal_blocks; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h index 216c54a..f975cde 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_DVS_TYPES_H #define __IA_CSS_DVS_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.c index 1e50392..28d0442 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #ifndef IA_CSS_NO_DEBUG #include "ia_css_debug.h" #endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.h index 355ff13..044e9c3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EED1_8_HOST_H #define __IA_CSS_EED1_8_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c index 3622719..2db02ce 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_eed1_8_types.h" /* The default values for the kernel parameters are based on diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h index 782f739..b2b1ce5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EED1_8_DEFAULT_HOST_H #define __IA_CSS_EED1_8_DEFAULT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_param.h index bc3a07f..a3a53fd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EED1_8_PARAM_H #define __IA_CSS_EED1_8_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_state.h index 47e451b..ca836c3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EED1_8_STATE_H #define __IA_CSS_EED1_8_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_types.h index 07651f0..994b55e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/eed1_8/ia_css_eed1_8_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_EED1_8_TYPES_H #define __IA_CSS_EED1_8_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.c index 94631ee..b493bad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_formats.host.h" #include "ia_css_types.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.h index 8a90cd8..adfdead 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FORMATS_HOST_H #define __IA_CSS_FORMATS_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_param.h index 2eb6030..d7eb7b2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FORMATS_PARAM_H #define __IA_CSS_FORMATS_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_types.h index cb61725..e4c0938 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fc/fc_1.0/ia_css_formats_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FORMATS_TYPES_H #define __IA_CSS_FORMATS_TYPES_H @@ -30,7 +31,9 @@ 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 */ + 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/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c index 0ce5ace..874b94c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h index fdc27ca..03b8cdd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FIXEDBDS_HOST_H #define __IA_CSS_FIXEDBDS_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h index cd20f7e..5e7c908 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,11 +12,19 @@ * more details. */ + #ifndef __IA_CSS_FIXEDBDS_PARAM_H #define __IA_CSS_FIXEDBDS_PARAM_H #include "type_support.h" +#define BDS_UNIT 8 +#define FRAC_LOG 3 +#define FRAC_ACC (1< #include #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h index bb905c8..00b2b0d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FPN_HOST_H #define __IA_CSS_FPN_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h index 68765c3..76d1cd6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FPN_PARAM_H #define __IA_CSS_FPN_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h index 5a2f0c0..968be74 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FPN_TYPES_H #define __IA_CSS_FPN_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.c index 0cfb5c9..af42519 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.h index 06f0884..ec0de98 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC_HOST_H #define __IA_CSS_GC_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_param.h index 52972b1..6a70c8d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC_PARAM_H #define __IA_CSS_GC_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c index 082db22..c339eff 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include /* memcpy */ #include "system_global.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h index 9686623..7186291 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC_TABLE_HOST_H #define __IA_CSS_GC_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_types.h index dd9f0ed..9bdd058 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_1.0/ia_css_gc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC_TYPES_H #define __IA_CSS_GC_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.c index 0fb1a91..fa2789f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.h index ba140ee..5b604a4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC2_HOST_H #define __IA_CSS_GC2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_param.h index d25239f..b424e93 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC2_PARAM_H #define __IA_CSS_GC2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c index f14a66b..2150e99 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include /* memcpy */ #include "system_global.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h index 8686e6e..8819b4f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC2_TABLE_HOST_H #define __IA_CSS_GC2_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_types.h index e439583..f2f4aec 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/gc/gc_2/ia_css_gc2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_GC2_TYPES_H #define __IA_CSS_GC2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.c index b485bf8..4cafbdc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.c @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #include "ia_css_hdr.host.h" void diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.h index ebf4f26..b6b8dc0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr.host.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef __IA_CSS_HDR_HOST_H #define __IA_CSS_HDR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_param.h index 8fefebd..b8de9c6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_param.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef __IA_CSS_HDR_PARAMS_H #define __IA_CSS_HDR_PARAMS_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_types.h index 9a0cbd6..8a4770c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/hdr/ia_css_hdr_types.h @@ -1,7 +1,7 @@ -/* Release Version: irci_stable_candrpv_0415_20150521_0458 */ +/* Release Version: irci_master_20150701_0213 */ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ * more details. */ + #ifndef __IA_CSS_HDR_TYPES_H #define __IA_CSS_HDR_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.c index 270f423..4f172a5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef IA_CSS_NO_DEBUG #include "ia_css_debug.h" #endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h index 580d51fe..0b97d55 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IEFD2_6_HOST_H #define __IA_CSS_IEFD2_6_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.c index b43ffd8..b12cd8e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_iefd2_6_types.h" const struct ia_css_iefd2_6_config default_iefd2_6_config = { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.h index 38f06de..ee6783e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IEFD2_6_DEFAULT_HOST_H #define __IA_CSS_IEFD2_6_DEFAULT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h index 3079096..1a9b637 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IEFD2_6_PARAM_H #define __IA_CSS_IEFD2_6_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h index 0915f14..51e088e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_IEFD2_6_STATE_H #define _IA_CSS_IEFD2_6_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_types.h index b0eadab..b1ad11b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iefd2_6/ia_css_iefd2_6_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IEFD2_6_TYPES_H #define __IA_CSS_IEFD2_6_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 100644 index 7cb259a..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1,84 +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_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 - } -} diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 100644 index ab20ee7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.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 __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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 100644 index 9fe58b2..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_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_BAYER_IO_PARAM -#define __IA_CSS_BAYER_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif /* __IA_CSS_BAYER_IO_PARAM */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 100644 index c2a8336..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.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_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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_param.h deleted file mode 100644 index 70e3600..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_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_COMMON_IO_PARAM -#define __IA_CSS_COMMON_IO_PARAM - -#include "../common/ia_css_common_io_types.h" - -#endif /* __IA_CSS_COMMON_IO_PARAM */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_types.h deleted file mode 100644 index 9d29105..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/common/ia_css_common_io_types.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_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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h deleted file mode 100644 index a5e5f62..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_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_PLANE_IO_PARAM_H -#define __IA_CSS_PLANE_IO_PARAM_H - -#include "../common/ia_css_common_io_param.h" - -#endif /* __IA_CSS_PLANE_IO_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h deleted file mode 100644 index 34e88d4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_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_PLANE_IO_TYPES_H -#define __IA_CSS_PLANE_IO_TYPES_H - -#include "../common/ia_css_common_io_types.h" - -#define PLANE_IO_LS_NUM_PLANES 3 - -struct ia_css_plane_io_config { - struct ia_css_common_io_config get_plane_io_config[PLANE_IO_LS_NUM_PLANES]; - struct ia_css_common_io_config put_plane_io_config[PLANE_IO_LS_NUM_PLANES]; -}; - -#endif /* __IA_CSS_PLANE_IO_TYPES_H */ - diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h deleted file mode 100644 index cf27054..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_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_YUV420_IO_PARAM -#define __IA_CSS_YUV420_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h deleted file mode 100644 index ffb9413..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.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_YUV420_IO_TYPES -#define __IA_CSS_YUV420_IO_TYPES - -#include "../common/ia_css_common_io_types.h" - -#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 100644 index 6258fb4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_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_YUV444_IO_PARAM -#define __IA_CSS_YUV444_IO_PARAM - -#include "../common/ia_css_common_io_param.h" - -#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 100644 index 5d0c92a..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.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_YUV444_IO_TYPES -#define __IA_CSS_YUV444_IO_TYPES - -#include "../common/ia_css_common_io_types.h" - -#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c new file mode 100644 index 0000000..33fca0c --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c @@ -0,0 +1,85 @@ +/* + * 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 + } +} diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h new file mode 100644 index 0000000..9f4bc256 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h @@ -0,0 +1,30 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h new file mode 100644 index 0000000..269e5e3 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h @@ -0,0 +1,21 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h new file mode 100644 index 0000000..f24b8d8 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h @@ -0,0 +1,21 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h new file mode 100644 index 0000000..d73f1bf --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h @@ -0,0 +1,21 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h new file mode 100644 index 0000000..33ff920 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h @@ -0,0 +1,30 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h new file mode 100644 index 0000000..e8a5395 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h @@ -0,0 +1,21 @@ +/* + * 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_PLANE_IO_PARAM_H +#define __IA_CSS_PLANE_IO_PARAM_H + +#include "../common/ia_css_common_io_param.h" + +#endif /* __IA_CSS_PLANE_IO_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h new file mode 100644 index 0000000..d67344f0 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h @@ -0,0 +1,29 @@ +/* + * 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_PLANE_IO_TYPES_H +#define __IA_CSS_PLANE_IO_TYPES_H + +#include "../common/ia_css_common_io_types.h" + +#define PLANE_IO_LS_NUM_PLANES 3 + +struct ia_css_plane_io_config { + struct ia_css_common_io_config get_plane_io_config[PLANE_IO_LS_NUM_PLANES]; + struct ia_css_common_io_config put_plane_io_config[PLANE_IO_LS_NUM_PLANES]; +}; + +#endif /* __IA_CSS_PLANE_IO_TYPES_H */ + diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h new file mode 100644 index 0000000..6b4777c --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h @@ -0,0 +1,21 @@ +/* + * 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_YUV420_IO_PARAM +#define __IA_CSS_YUV420_IO_PARAM + +#include "../common/ia_css_common_io_param.h" + +#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h new file mode 100644 index 0000000..dabf7d0 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h @@ -0,0 +1,21 @@ +/* + * 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_YUV420_IO_TYPES +#define __IA_CSS_YUV420_IO_TYPES + +#include "../common/ia_css_common_io_types.h" + +#endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c new file mode 100644 index 0000000..a71012a --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c @@ -0,0 +1,85 @@ +/* + * 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 + } +} diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h new file mode 100644 index 0000000..7cb6887 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h @@ -0,0 +1,30 @@ +/* + * 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 */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h new file mode 100644 index 0000000..b025029 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h @@ -0,0 +1,21 @@ +/* + * 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 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h new file mode 100644 index 0000000..6c0cc85 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h @@ -0,0 +1,21 @@ +/* + * 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 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c index 9e41cc0..b6451d5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_iterator.host.h" #include "ia_css_frame_public.h" #include "ia_css_binary.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h index d8f249c..5c984fd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ITERATOR_HOST_H #define __IA_CSS_ITERATOR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h index d308126..766466c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ITERATOR_PARAM_H #define __IA_CSS_ITERATOR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c index 836a3b9..fbe50c1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h index 8f0a78f..23284ae 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC1_5_HOST_H #define __IA_CSS_MACC1_5_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h index 41a2da4..4ec2a18 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC1_5_PARAM_H #define __IA_CSS_MACC1_5_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c index 89714bf..9adb94d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #include "ia_css_types.h" #include "ia_css_macc1_5_table.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h index 10a50aa..fed71a5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC1_5_TABLE_HOST_H #define __IA_CSS_MACC1_5_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h index 3d510bf..94a69c1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC1_5_TYPES_H #define __IA_CSS_MACC1_5_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.c index 1f7e9e4..9de45fd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.h index 044b01d..e23af3a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC_HOST_H #define __IA_CSS_MACC_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_param.h index 6a12b92..f797e3c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC_PARAM_H #define __IA_CSS_MACC_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c index 8a6c3ca..feeeddf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #include "ia_css_types.h" #include "ia_css_macc_table.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h index 96d62c9..133099e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC_TABLE_HOST_H #define __IA_CSS_MACC_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_types.h index a25581c..a8960c8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/macc/macc_1.0/ia_css_macc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_MACC_TYPES_H #define __IA_CSS_MACC_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.c index 6a140a2..fc7ee74 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,5 +13,6 @@ */ + #include "ia_css_norm.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.h index 42b5143..9bb621a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_NORM_HOST_H #define __IA_CSS_NORM_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_param.h index 85dc6fc..1b79032 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_NORM_PARAM_H #define __IA_CSS_NORM_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_types.h index 5581bdd..8ba21a27 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/norm/norm_1.0/ia_css_norm_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_NORM_TYPES_H #define __IA_CSS_NORM_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.c index f77aff1..99cef65 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "sh_css_frac.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.h index 0684650..125b8d1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB2_HOST_H #define __IA_CSS_OB2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_param.h index 5c21d6a..641f75c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB2_PARAM_H #define __IA_CSS_OB2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_types.h index eeaadfe..0a21081 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob2/ia_css_ob2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB2_TYPES_H #define __IA_CSS_OB2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.c index fd891ac..edac723 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.h index 4af1814..2755610 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB_HOST_H #define __IA_CSS_OB_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_param.h index a60a644..381662a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB_PARAM_H #define __IA_CSS_OB_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_types.h index 88459b6..633cdc4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ob/ob_1.0/ia_css_ob_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OB_TYPES_H #define __IA_CSS_OB_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.c index 8fdf47c..aad492d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_frame.h" #include "ia_css_debug.h" #define IA_CSS_INCLUDE_CONFIGURATIONS diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.h index 530f934..437501f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OUTPUT_HOST_H #define __IA_CSS_OUTPUT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_param.h index 26ec27e..d9eee13 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OUTPUT_PARAM_H #define __IA_CSS_OUTPUT_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_types.h index 4335ac2..98a7f3a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/output/output_1.0/ia_css_output_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_OUTPUT_TYPES_H #define __IA_CSS_OUTPUT_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.c deleted file mode 100644 index 283ca1b..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.c +++ /dev/null @@ -1,82 +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" -#include "ia_css_pdaf.host.h" - -const struct ia_css_pdaf_config default_pdaf_config; - -void -ia_css_pdaf_dmem_encode( - struct isp_pdaf_dmem_params *to, - const struct ia_css_pdaf_config *from, - unsigned size) -{ - (void)size; - to->frm_length = from->frm_length; - to->frm_width = from->frm_width; - - to->ext_cfg_l_data.num_valid_patterns = from->ext_cfg_data.l_pixel_grid.num_valid_patterns; - - to->ext_cfg_r_data.num_valid_patterns = from->ext_cfg_data.r_pixel_grid.num_valid_patterns; - - to->stats_calc_data.num_valid_elm = from->stats_calc_cfg_data.num_valid_elm; -} - -void -ia_css_pdaf_vmem_encode( - struct isp_pdaf_vmem_params *to, - const struct ia_css_pdaf_config *from, - unsigned size) -{ - - unsigned int i; - (void)size; - /* Initialize left pixel grid */ - for ( i=0 ; i < from->ext_cfg_data.l_pixel_grid.num_valid_patterns ; i++) { - - to->ext_cfg_l_data.y_offset[0][i] = from->ext_cfg_data.l_pixel_grid.y_offset[i]; - to->ext_cfg_l_data.x_offset[0][i] = from->ext_cfg_data.l_pixel_grid.x_offset[i]; - to->ext_cfg_l_data.y_step_size[0][i] = from->ext_cfg_data.l_pixel_grid.y_step_size[i]; - to->ext_cfg_l_data.x_step_size[0][i] = from->ext_cfg_data.l_pixel_grid.x_step_size[i]; - } - - for ( ; i < ISP_NWAY ; i++) { - - to->ext_cfg_l_data.y_offset[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_l_data.x_offset[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_l_data.y_step_size[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_l_data.x_step_size[0][i] = PDAF_INVALID_VAL; - } - - /* Initialize left pixel grid */ - - for ( i=0 ; i < from->ext_cfg_data.r_pixel_grid.num_valid_patterns ; i++) { - - to->ext_cfg_r_data.y_offset[0][i] = from->ext_cfg_data.r_pixel_grid.y_offset[i]; - to->ext_cfg_r_data.x_offset[0][i] = from->ext_cfg_data.r_pixel_grid.x_offset[i]; - to->ext_cfg_r_data.y_step_size[0][i] = from->ext_cfg_data.r_pixel_grid.y_step_size[i]; - to->ext_cfg_r_data.x_step_size[0][i] = from->ext_cfg_data.r_pixel_grid.x_step_size[i]; - } - - for ( ; i < ISP_NWAY ; i++) { - - to->ext_cfg_r_data.y_offset[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_r_data.x_offset[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_r_data.y_step_size[0][i] = PDAF_INVALID_VAL; - to->ext_cfg_r_data.x_step_size[0][i] = PDAF_INVALID_VAL; - } -} diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.host.h deleted file mode 100644 index 21f72a4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf.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_PDAF_HOST_H -#define __IA_CSS_PDAF_HOST_H - -#include "ia_css_pdaf_types.h" -#include "ia_css_pdaf_param.h" - -extern const struct ia_css_pdaf_config default_pdaf_config; - -void -ia_css_pdaf_dmem_encode( - struct isp_pdaf_dmem_params *to, - const struct ia_css_pdaf_config *from, - unsigned size); - -void -ia_css_pdaf_vmem_encode( - struct isp_pdaf_vmem_params *to, - const struct ia_css_pdaf_config *from, - unsigned size); - -#endif /* __IA_CSS_PDAF_HOST_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_param.h deleted file mode 100644 index 6633f0c..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_param.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_PDAF_PARAM_H -#define __IA_CSS_PDAF_PARAM_H - -#define PDAF_INVALID_VAL 0x7FFF -#include "vmem.h" - -struct isp_stats_calc_dmem_params { - - uint16_t num_valid_elm; -}; -/* - * Extraction configuration parameters - */ - -struct isp_extraction_dmem_params { - - uint8_t num_valid_patterns; -}; - -struct isp_extraction_vmem_params { - - VMEM_ARRAY(y_step_size, ISP_VEC_NELEMS); - VMEM_ARRAY(y_offset, ISP_VEC_NELEMS); - VMEM_ARRAY(x_step_size, ISP_VEC_NELEMS); - VMEM_ARRAY(x_offset, ISP_VEC_NELEMS); -}; - -/* - * PDAF configuration parameters - */ -struct isp_pdaf_vmem_params { - - struct isp_extraction_vmem_params ext_cfg_l_data; - struct isp_extraction_vmem_params ext_cfg_r_data; -}; - -struct isp_pdaf_dmem_params { - - uint16_t frm_length; - uint16_t frm_width; - struct isp_stats_calc_dmem_params stats_calc_data; - struct isp_extraction_dmem_params ext_cfg_l_data; - struct isp_extraction_dmem_params ext_cfg_r_data; -}; - -#endif /* __IA_CSS_PDAF_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_types.h deleted file mode 100644 index 3e42877c..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/pdaf/ia_css_pdaf_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_PDAF_TYPES_H -#define __IA_CSS_PDAF_TYPES_H - -#include "type_support.h" -#include "isp2600_config.h" -/* - * Header file for PDAF parameters - * These parameters shall be filled by host/driver - * and will be converted to ISP parameters in encode - * function. - */ - -struct ia_css_statistics_calc_config { - - uint16_t num_valid_elm; -}; -struct ia_css_pixel_grid_config { - - uint8_t num_valid_patterns; - int16_t y_step_size[ISP_NWAY]; - int16_t y_offset[ISP_NWAY]; - int16_t x_step_size[ISP_NWAY]; - int16_t x_offset[ISP_NWAY]; -}; - -struct ia_css_extraction_config { - - struct ia_css_pixel_grid_config l_pixel_grid; /* Left PDAF pixel grid */ - struct ia_css_pixel_grid_config r_pixel_grid; /* Right PDAF pixel grid */ -}; - -struct ia_css_pdaf_config { - - uint16_t frm_length; - uint16_t frm_width; - struct ia_css_extraction_config ext_cfg_data; - struct ia_css_statistics_calc_config stats_calc_cfg_data; -}; - -#endif /* __IA_CSS_PDAF_TYPES_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c index d1fb4b1..a65ba17 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_frame.h" #include "ia_css_types.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h index c41e9e5..219ac03 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_QPLANE_HOST_H #define __IA_CSS_QPLANE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h index 5885f62..429e63b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_QPLANE_PARAM_H #define __IA_CSS_QPLANE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h index 955fd47..294ffbf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_QPLANE_TYPES_H #define __IA_CSS_QPLANE_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.c index 68a27f0..6b721b1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_frame.h" #include "ia_css_types.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.h index ac6b7f6..b825a2c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_RAW_HOST_H #define __IA_CSS_RAW_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_param.h index 12168b2..41eb738 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_RAW_PARAM_H #define __IA_CSS_RAW_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_types.h index 54f8c29..5f49c83 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw/raw_1.0/ia_css_raw_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_RAW_TYPES_H #define __IA_CSS_RAW_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c index 74521c9..13f7c71 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #if !defined(HAS_NO_HMEM) #include "ia_css_memory_access.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h index b4f245c..20400c9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_RAA_HOST_H #define __IA_CSS_RAA_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.c index 4c0ed5d..25e5705 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.h index 3c6d728..bfcc765 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_REF_HOST_H #define __IA_CSS_REF_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_param.h index 1f1b72a..adb0928 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_REF_PARAM_H #define __IA_CSS_REF_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_state.h index 7867be8..0fac36b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_REF_STATE_H #define __IA_CSS_REF_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_types.h index ce0eaee..c471291 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ref/ref_1.0/ia_css_ref_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_REF_TYPES_H #define __IA_CSS_REF_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c index 39de369..6604ad0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h index 4bc6c0b..82cff85 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_S3A_HOST_H #define __IA_CSS_S3A_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h index 35fb0a2..fc95b2a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_S3A_PARAM_H #define __IA_CSS_S3A_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h index f57ed1e..cb29ba9 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_S3A_TYPES_H #define __IA_CSS_S3A_TYPES_H @@ -99,7 +100,6 @@ struct ia_css_3a_grid_info { #if defined(SYSTEM_css_skycam_c0_system) -#if defined USE_NEW_AE_STRUCT || defined USE_NEW_AWB_STRUCT #define DEFAULT_3A_GRID_INFO \ { \ 0, /* ae_enable */ \ @@ -115,21 +115,6 @@ struct ia_css_3a_grid_info { #else #define DEFAULT_3A_GRID_INFO \ { \ - 0, /* ae_enable */ \ - {0,0,0,0,0,0,0,0,0}, /* AE: width,height,b_width,b_height,x_start,y_start,x_end,y_end*/ \ - 0, /* awb_enable */ \ - {0,0,0,0,0,0,0,0}, /* AWB: width,height,b_width,b_height,x_start,y_start,x_end,y_end*/ \ - 0, /* af_enable */ \ - {0,0,0,0,0,0,0}, /* AF: width,height,b_width,b_height,x_start,y_start,ff_en*/ \ - 0, /* awb_fr_enable */ \ - {0,0,0,0,0,0,0}, /* AWB_FR: width,height,b_width,b_height,x_start,y_start,ff_en*/ \ - 0, /* elem_bit_depth */ \ -} -#endif /* USE_NEW_AE_STRUCT || defined USE_NEW_AWB_STRUCT */ - -#else -#define DEFAULT_3A_GRID_INFO \ -{ \ 0, /* enable */ \ 0, /* use_dmem */ \ 0, /* has_histogram */ \ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h index e2bfb94..a8d195d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,21 +12,22 @@ * more details. */ + #ifndef __IA_CSS_S3A_STAT_LS_PARAM_H #define __IA_CSS_S3A_STAT_LS_PARAM_H #include "type_support.h" +#include "../../io_ls/common/ia_css_common_io_types.h" #define NUM_S3A_LS 1 /** s3a statistics store */ +struct ia_css_s3a_stat_ls_configuration { + uint32_t s3a_grid_size_log2; +}; + struct sh_css_isp_s3a_stat_ls_isp_config { - uint32_t base_address[NUM_S3A_LS]; - uint32_t width[NUM_S3A_LS]; - uint32_t height[NUM_S3A_LS]; - uint32_t stride[NUM_S3A_LS]; uint32_t s3a_grid_size_log2[NUM_S3A_LS]; }; - #endif /* __IA_CSS_S3A_STAT_LS_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h index 676b42d..72c637e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_S3A_STAT_STORE_PARAM_H #define __IA_CSS_S3A_STAT_STORE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.c index d35194b..a03be1d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_satm.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.h index 807b716..93912eb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SATM_HOST_H #define __IA_CSS_SATM_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_param.h index 062f79aa4..908520d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SATM_PARAMS_H #define __IA_CSS_SATM_PARAMS_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_types.h index 94f10e3..6efdd2f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/satm/ia_css_satm_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SATM_TYPES_H #define __IA_CSS_SATM_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.c index e9c8e3b..33863e2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,10 +12,15 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" #include "assert_support.h" +#include "math_support.h" /* min() */ + +#define IA_CSS_INCLUDE_CONFIGURATIONS +#include "ia_css_isp_configs.h" #include "ia_css_sc.host.h" @@ -40,6 +45,42 @@ ia_css_sc_dump( "sc_gain_shift", sc->gain_shift); } +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); +} + /* ------ 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. diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.h index 205035c..b4c2237 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SC_HOST_H #define __IA_CSS_SC_HOST_H @@ -31,6 +32,37 @@ ia_css_sc_dump( const struct sh_css_isp_sc_params *sc, unsigned level); +/** @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); + /* ------ deprecated(bz675) : from ------ */ void sh_css_get_shading_settings(const struct ia_css_isp_parameters *params, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_param.h index 9c5b0b0..c2d59f4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,14 +12,57 @@ * more details. */ + #ifndef __IA_CSS_SC_PARAM_H #define __IA_CSS_SC_PARAM_H #include "type_support.h" +/* 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) + /* SC (Shading Corrction) */ struct sh_css_isp_sc_params { int32_t gain_shift; }; +/* 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 /* __IA_CSS_SC_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_types.h index e3b2e58..fc2458e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sc/sc_1.0/ia_css_sc_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SC_TYPES_H #define __IA_CSS_SC_TYPES_H @@ -117,5 +118,17 @@ struct ia_css_shading_settings { }; /* ------ deprecated(bz675) : to ------ */ -#endif /* __IA_CSS_SC_TYPES_H */ +/** 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 /* __IA_CSS_SC_TYPES_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/scale/scale_1.0/ia_css_scale_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/scale/scale_1.0/ia_css_scale_param.h index fd19f008..fbfb73e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/scale/scale_1.0/ia_css_scale_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/scale/scale_1.0/ia_css_scale_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_SCALE_PARAM_H #define _IA_CSS_SCALE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common.host.h index 4eb4910..307c6b3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_SDIS_COMMON_HOST_H #define _IA_CSS_SDIS_COMMON_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common_types.h index 295dc60..fa4579c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_common_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS_COMMON_TYPES_H #define __IA_CSS_SDIS_COMMON_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_param.h index 586cc43..b81eb54 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/common/ia_css_sdis_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS_PARAM_COMMON_H #define __IA_CSS_SDIS_PARAM_COMMON_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c index 0dde842..b6bf7a0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "memory_access.h" #include "assert_support.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h index 95e2c61..93ca25b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS_HOST_H #define __IA_CSS_SDIS_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h index 2dd8696..79d8c1b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS_PARAM_H #define __IA_CSS_SDIS_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h index d408b58..0b2723c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS_TYPES_H #define __IA_CSS_SDIS_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c index 930061d..68f0613 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include "memory_access.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h index 60198d4..40c2ced 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS2_HOST_H #define __IA_CSS_SDIS2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h index 7db7dd1..1f4bbd8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS2_TYPES_H #define __IA_CSS_SDIS2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h index cea352e..5b90d5a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SDIS2_PARAM_H #define __IA_CSS_SDIS2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c index e775af5..70928fb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_debug.h" #include "ia_css_tdf.host.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h index 1b3e759..76802b6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TDF_HOST_H #define __IA_CSS_TDF_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c index 9bb42da..5921310 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_tdf_types.h" const struct ia_css_tdf_config default_tdf_config = { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h index cd8fb70..d8de1c4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TDF_DEFAULT_HOST_H #define __IA_CSS_TDF_DEFAULT_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h index 9334f2e..9c33df1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TDF_PARAM_H #define __IA_CSS_TDF_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h index cc47a50..3f6e90f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TDF_TYPES_H #define __IA_CSS_TDF_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h new file mode 100644 index 0000000..bd3c3ac --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h @@ -0,0 +1,60 @@ +/* + * 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 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c index db3157f..c1a339d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "ia_css_frame.h" #include "sh_css_defs.h" @@ -84,7 +85,7 @@ ia_css_tnr_config( 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; - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) { + for (i = 0; i < NUM_TNR_FRAMES; i++) { to->tnr_frame_addr[i] = from->tnr_frames[i]->data + from->tnr_frames[i]->planes.yuyv.offset; } @@ -100,7 +101,7 @@ ia_css_tnr_configure( struct ia_css_tnr_configuration config; unsigned i; - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) + for (i = 0; i < NUM_TNR_FRAMES; i++) config.tnr_frames[i] = frames[i]; ia_css_configure_tnr(binary, &config); @@ -113,7 +114,6 @@ ia_css_init_tnr_state( { (void)size; - assert(NUM_VIDEO_TNR_FRAMES >= 2); assert(sizeof(*state) == size); state->tnr_in_buf_idx = 0; state->tnr_out_buf_idx = 1; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h index 9290dfa..8bbf561 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TNR_HOST_H #define __IA_CSS_TNR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h index d428402..ebab5ab 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TNR_PARAM_H #define __IA_CSS_TNR_PARAM_H @@ -27,14 +28,14 @@ struct sh_css_isp_tnr_params { }; struct ia_css_tnr_configuration { - const struct ia_css_frame *tnr_frames[NUM_VIDEO_TNR_FRAMES]; + const struct ia_css_frame *tnr_frames[NUM_TNR_FRAMES]; }; struct sh_css_isp_tnr_isp_config { uint32_t width_a_over_b; uint32_t frame_height; struct dma_port_config port_b; - hrt_vaddress tnr_frame_addr[NUM_VIDEO_TNR_FRAMES]; + hrt_vaddress tnr_frame_addr[NUM_TNR_FRAMES]; }; #endif /* __IA_CSS_TNR_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h index 8b1218f..49b334b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TNR_STATE_H #define __IA_CSS_TNR_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h index 4fd35e6..50987d0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TNR_TYPES_H #define __IA_CSS_TNR_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.c index 20fd68b..cbe6770 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.h index 984c5bd..b7d8e8b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_UDS_HOST_H #define __IA_CSS_UDS_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds_param.h index 26b7b5b..6200511 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/uds/uds_1.0/ia_css_uds_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_UDS_PARAM_H #define __IA_CSS_UDS_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.c index ab75625..f752ceb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_vf.host.h" #include #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.h index c7c3625..39f7c48 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_VF_HOST_H #define __IA_CSS_VF_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_param.h index df5d37c..ccfd531 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_VF_PARAM_H #define __IA_CSS_VF_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_types.h index d8cfdfb..068b225 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/vf/vf_1.0/ia_css_vf_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_VF_TYPES_H #define __IA_CSS_VF_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.c index e9187e1..fcd3dcd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #include "ia_css_types.h" #include "sh_css_defs.h" #ifndef IA_CSS_NO_DEBUG diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.h index 18666ba..5ca30c6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_WB_HOST_H #define __IA_CSS_WB_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_param.h index c95c53a..6cb84ed 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_WB_PARAM_H #define __IA_CSS_WB_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_types.h index 6bcfa27..1be22dd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/wb/wb_1.0/ia_css_wb_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_WB_TYPES_H #define __IA_CSS_WB_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c index 7e86bc8..5b24642 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "type_support.h" #include "math_support.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h index 8e8b85f..f33a6d7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_11_HOST_H #define __IA_CSS_XNR3_0_11_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h index a28cfd4..6f5e3f8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_11_PARAM_H #define __IA_CSS_XNR3_0_11_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h index b6bf449..e340feb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_11_TYPES_H #define __IA_CSS_XNR3_0_11_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c index d29b314..40c0c72 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "type_support.h" #include "math_support.h" #include "sh_css_defs.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h index 69817a6..ac7f666 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_5_HOST_H #define __IA_CSS_XNR3_0_5_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h index fc1d9cc..08ed966 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_5_PARAM_H #define __IA_CSS_XNR3_0_5_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h index ba7c81e..4f8f696 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_0_5_TYPES_H #define __IA_CSS_XNR3_0_5_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c index 3018100..9c38305 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -13,6 +13,7 @@ */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h index eb3425e..31e5758 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR_HOST_H #define __IA_CSS_XNR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h index 806c9f8..66bbf5e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR_PARAM_H #define __IA_CSS_XNR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c index cd5fb72..84c3d46 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include /* memcpy */ #include "system_global.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h index 1300867..fbebd09 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR_TABLE_HOST_H #define __IA_CSS_XNR_TABLE_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h index 89e8b0f..857fe07 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR_TYPES_H #define __IA_CSS_XNR_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c index a783abb..b9929ad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,10 +12,12 @@ * more details. */ + #include "type_support.h" #include "math_support.h" #include "sh_css_defs.h" #include "ia_css_types.h" +#include "assert_support.h" #include "ia_css_xnr3.host.h" /* Maximum value for alpha on ISP interface */ @@ -26,6 +28,28 @@ #define XNR_MIN_SIGMA (IA_CSS_XNR3_SIGMA_SCALE / 100) /* + * 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}; + + +/* * 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 @@ -168,6 +192,66 @@ ia_css_xnr3_encode( to->blending.strength = blending; } +/* (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]; + } + } +} + + + /* Dummy Function added as the tool expects it*/ void ia_css_xnr3_debug_dtrace( diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h index 6fbde9b..9969a0d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_HOST_H #define __IA_CSS_XNR3_HOST_H @@ -27,6 +28,12 @@ ia_css_xnr3_encode( unsigned size); void +ia_css_xnr3_vmem_encode( + struct sh_css_isp_xnr3_vmem_params *to, + const struct ia_css_xnr3_config *from, + unsigned size); + +void ia_css_xnr3_debug_dtrace( const struct ia_css_xnr3_config *config, unsigned level); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h index 77e2d76..74140b1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,10 +12,13 @@ * more details. */ + #ifndef __IA_CSS_XNR3_PARAM_H #define __IA_CSS_XNR3_PARAM_H #include "type_support.h" +#include "vmem.h" /* needed for VMEM_ARRAY */ + /* 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 @@ -74,4 +77,17 @@ struct sh_css_isp_xnr3_params { struct sh_css_xnr3_blending_params blending; }; +/* + * 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 /*__IA_CSS_XNR3_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h index 8f14d10..cbe353d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_TYPES_H #define __IA_CSS_XNR3_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h index 1a98555..a1f2cbf 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_XNR3_WRAPPER_PARAM_H #define __IA_CSS_XNR3_WRAPPER_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c index d8dccce..8ebee13 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h index b5730df3..9504922 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR_HOST_H #define __IA_CSS_YNR_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h index ad61ec12..aa5214e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR_PARAM_H #define __IA_CSS_YNR_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h index b2348b1..208b754 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR_STATE_H #define __IA_CSS_YNR_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h index 3f46655..86fc8f7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR_TYPES_H #define __IA_CSS_YNR_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c index 44b0050..d4204f1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "sh_css_defs.h" #include "ia_css_debug.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h index 71e89c4..7906e68 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR2_HOST_H #define __IA_CSS_YNR2_HOST_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h index e56b695..3f71913 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR2_PARAM_H #define __IA_CSS_YNR2_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h index e0a0b10..cdf56b7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR2_TYPES_H #define __IA_CSS_YNR2_TYPES_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h index 48fb7d2..edf6181 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNRX_PARAM_H #define __IA_CSS_YNRX_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h index 2516dd3..3cd0251 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YNR2_STATE_H #define __IA_CSS_YNR2_STATE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h index 400c679..d091c4e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YUV_LOAD_PARAM_H #define __IA_CSS_YUV_LOAD_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h index 2bf2e00..e820507 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,24 +12,11 @@ * more details. */ + #ifndef __IA_CSS_YUV_LS_PARAM_H #define __IA_CSS_YUV_LS_PARAM_H #include "type_support.h" - -/* The number of load/store kernels in a pipeline can be greater than one. - * A kernel can consume more than one input or can produce more - * than one output. - */ -#define NUM_YUV_LS 2 - -/** YUV load/store */ -struct sh_css_isp_yuv_ls_isp_config { - unsigned base_address[NUM_YUV_LS]; - unsigned width[NUM_YUV_LS]; - unsigned height[NUM_YUV_LS]; - unsigned stride[NUM_YUV_LS]; -}; - +#include "../../io_ls/common/ia_css_common_io_types.h" #endif /* __IA_CSS_YUV_LS_PARAM_H */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h index 69c474e..3a58de6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_YUV_STORE_PARAM_H #define __IA_CSS_YUV_STORE_PARAM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/input_buf.isp.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/input_buf.isp.h index 9668350..eb8b6d3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/input_buf.isp.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/input_buf.isp.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _INPUT_BUF_ISP_H_ #define _INPUT_BUF_ISP_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_const.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_const.h index 3941e0f..0d988b0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_const.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_const.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _COMMON_ISP_CONST_H_ #define _COMMON_ISP_CONST_H_ @@ -106,107 +107,111 @@ #define SH_CSS_BINARY_ID_KERNEL_TEST_LOAD_STORE 59 #define SH_CSS_BINARY_ID_CAPTURE_PP_BLI 60 #define SH_CSS_BINARY_ID_CAPTURE_PP_LDC 61 +#define SH_CSS_BINARY_ID_PRIMARY_STRIPED_ISP2_XNR 62 /* skycam kerneltest pipelines */ -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM 120 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM_STRIPED 121 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN 122 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN_STRIPED 123 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD 124 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD_STRIPED 125 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB 126 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A 127 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A_STRIPED 128 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AF 129 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID 130 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE 131 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE_STRIPED 132 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DEMOSAIC 133 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP1_C0 134 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2 135 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF 136 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF_STRIPED 137 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_REF 138 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS 139 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR 140 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_STRIPED 141 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_BLENDING 142 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_BLOCK 143 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AE 144 -#define SH_CSS_BINARY_ID_VIDEO_RAW 145 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB_FR 146 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP 147 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP_STRIPED 148 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR 149 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_IF 150 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_IF_STRIPED 151 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM 152 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_STRIPED 153 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS_STRIPED 154 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID_STRIPED 155 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV 156 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV_BLOCK 157 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_BLOCK 158 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_STRIPED 159 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_BLOCK_STRIPED 160 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_INPUT_YUV 161 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV 162 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV_16 163 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SPLIT 164 -#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM_STRIPED 165 - +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM 121 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM_STRIPED 122 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID 123 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID_STRIPED 124 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN 125 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN_STRIPED 126 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD 127 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD_STRIPED 128 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AE 129 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB 130 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AF 131 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB_FR 132 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A 133 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A_STRIPED 134 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE 135 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE_STRIPED 136 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR 137 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR_STRIPED 138 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DEMOSAIC 139 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP 140 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP_STRIPED 141 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP1_C0 142 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2 143 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2_STRIPED 144 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_REF 145 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR 146 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_STRIPED 147 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_BLENDING 148 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF 149 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF_STRIPED 150 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS 151 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS_STRIPED 152 +#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DVS_STAT_C0 153 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_BLOCK 154 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_STRIPED 155 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM 156 +#define SH_CSS_BINARY_ID_VIDEO_RAW 157 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV 158 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV_BLOCK 159 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_BLOCK 160 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_STRIPED 161 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_BLOCK_STRIPED 162 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_INPUT_YUV 163 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV 164 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV_16 165 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SPLIT 166 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM_STRIPED 167 +#define SH_CSS_BINARY_ID_COPY_KERNELTEST_OUTPUT_SYSTEM 168 /* skycam partial test pipelines*/ -#define SH_CSS_BINARY_ID_IF_TO_DPC 201 -#define SH_CSS_BINARY_ID_IF_TO_BDS 202 +#define SH_CSS_BINARY_ID_IF_TO_BDS 201 +#define SH_CSS_BINARY_ID_IF_TO_BDS_STRIPED 202 #define SH_CSS_BINARY_ID_IF_TO_NORM 203 -#define SH_CSS_BINARY_ID_IF_TO_OB 204 -#define SH_CSS_BINARY_ID_IF_TO_LIN 205 -#define SH_CSS_BINARY_ID_IF_TO_SHD 206 -#define SH_CSS_BINARY_ID_IF_TO_BNR 207 -#define SH_CSS_BINARY_ID_IF_TO_RGBPP_NV12_16 208 -#define SH_CSS_BINARY_ID_IF_TO_RGBPP 210 -#define SH_CSS_BINARY_ID_IF_TO_YUVP1 211 -#define SH_CSS_BINARY_ID_IF_TO_DM 214 -#define SH_CSS_BINARY_ID_IF_TO_YUVP2_C0 216 -#define SH_CSS_BINARY_ID_IF_TO_YUVP2_ANR_VIA_ISP 217 -#define SH_CSS_BINARY_ID_VIDEO_IF_TO_DVS 218 -#define SH_CSS_BINARY_ID_VIDEO_IF_TO_TNR 219 -#define SH_CSS_BINARY_ID_IF_TO_BDS_STRIPED 224 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR_STRIPED 225 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2_STRIPED 227 -#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0 228 -#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0_STRIPED 229 -#define SH_CSS_BINARY_ID_IF_TO_REF 236 -#define SH_CSS_BINARY_ID_IF_TO_DVS_STRIPED 237 -#define SH_CSS_BINARY_ID_IF_TO_YUVP2_STRIPED 238 -#define SH_CSS_BINARY_ID_IF_TO_YUVP1_STRIPED 239 -#define SH_CSS_BINARY_ID_IF_TO_RGBPP_STRIPED 240 -#define SH_CSS_BINARY_ID_IF_TO_ANR_STRIPED 241 -#define SH_CSS_BINARY_ID_IF_TO_BNR_STRIPED 242 -#define SH_CSS_BINARY_ID_IF_TO_SHD_STRIPED 243 -#define SH_CSS_BINARY_ID_IF_TO_LIN_STRIPED 244 -#define SH_CSS_BINARY_ID_IF_TO_OB_STRIPED 245 -#define SH_CSS_BINARY_ID_IF_TO_NORM_STRIPED 248 -#define SH_CSS_BINARY_ID_COPY_KERNELTEST_OUTPUT_SYSTEM 253 -#define SH_CSS_BINARY_ID_IF_TO_XNR 256 -#define SH_CSS_BINARY_ID_IF_TO_XNR_STRIPED 257 -#define SH_CSS_BINARY_ID_IF_TO_REF_STRIPED 258 -#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS 259 -#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0 262 -#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY 263 -#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY_STRIPED 264 -#define SH_CSS_BINARY_ID_IF_TO_ANR 265 -#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DVS_STAT_C0 266 -#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS_STRIPED 270 -#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY 276 -#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY_STRIPED 277 -#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0_STRIPED 278 +#define SH_CSS_BINARY_ID_IF_TO_NORM_STRIPED 204 +#define SH_CSS_BINARY_ID_IF_TO_OB 205 +#define SH_CSS_BINARY_ID_IF_TO_OB_STRIPED 206 +#define SH_CSS_BINARY_ID_IF_TO_LIN 207 +#define SH_CSS_BINARY_ID_IF_TO_LIN_STRIPED 208 +#define SH_CSS_BINARY_ID_IF_TO_SHD 209 +#define SH_CSS_BINARY_ID_IF_TO_SHD_STRIPED 210 +#define SH_CSS_BINARY_ID_IF_TO_BNR 211 +#define SH_CSS_BINARY_ID_IF_TO_BNR_STRIPED 212 +#define SH_CSS_BINARY_ID_IF_TO_ANR 213 +#define SH_CSS_BINARY_ID_IF_TO_ANR_STRIPED 214 +#define SH_CSS_BINARY_ID_IF_TO_DM 215 +#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0 216 +#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0_STRIPED 217 +#define SH_CSS_BINARY_ID_IF_TO_RGBPP 218 +#define SH_CSS_BINARY_ID_IF_TO_RGBPP_NV12_16 219 +#define SH_CSS_BINARY_ID_IF_TO_RGBPP_STRIPED 220 +#define SH_CSS_BINARY_ID_IF_TO_YUVP1 221 +#define SH_CSS_BINARY_ID_IF_TO_YUVP1_STRIPED 222 +#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0 223 +#define SH_CSS_BINARY_ID_IF_TO_YUVP2_C0 224 +#define SH_CSS_BINARY_ID_IF_TO_YUVP2_STRIPED 225 +#define SH_CSS_BINARY_ID_IF_TO_XNR 226 +#define SH_CSS_BINARY_ID_IF_TO_XNR_STRIPED 227 +#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY 228 +#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY_STRIPED 229 +#define SH_CSS_BINARY_ID_IF_TO_REF 230 +#define SH_CSS_BINARY_ID_IF_TO_REF_STRIPED 231 +#define SH_CSS_BINARY_ID_VIDEO_IF_TO_DVS 232 +#define SH_CSS_BINARY_ID_IF_TO_DVS_STRIPED 233 +#define SH_CSS_BINARY_ID_VIDEO_IF_TO_TNR 234 +#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS 235 +#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS_STRIPED 236 +#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY 237 +#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY_STRIPED 238 +#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0_STRIPED 239 +#define SH_CSS_BINARY_ID_VIDEO_YUVP1_TO_OSYS 240 +#define SH_CSS_BINARY_ID_IF_TO_OSYS_PREVIEW 241 +#define SH_CSS_BINARY_ID_IF_TO_OSYS_PREVIEW_STRIPED 242 /* Skycam IR camera binaries */ -#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_XNR 300 -#define SH_CSS_BINARY_ID_VIDEO_IR_IF_TO_OSYS_NO_DVS_NO_TNR_NO_XNR 301 -#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_XNR_NO_DVS_PRIMARY 302 +#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS 300 +#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_TNR3 301 +#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_PRIMARY 302 + +/* Binaries under development */ +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR3 401 +#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR3_STRIPED 402 + #define XMEM_WIDTH_BITS HIVE_ISP_DDR_WORD_BITS #define XMEM_SHORTS_PER_WORD (HIVE_ISP_DDR_WORD_BITS/16) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_exprs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_exprs.h index 019d5e4..ecafb02 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_exprs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_exprs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _COMMON_ISP_EXPRS_H_ #define _COMMON_ISP_EXPRS_H_ @@ -277,10 +278,6 @@ #define OUTPUT_C_VECTORS_PER_CHUNK CEIL_DIV(MAX_VECTORS_PER_CHUNK, 2) #endif -/**** SCTBL defs *******/ -#define ISP_SCTBL_HEIGHT \ - _ISP_SCTBL_HEIGHT(ISP_INPUT_HEIGHT, DECI_FACTOR_LOG2) - /**** UDS defs *********/ #define UDS_DMACH_STRIDE_B_IN_Y (( ISP_INTERNAL_WIDTH /BITS8_ELEMENTS_PER_XMEM_ADDR)*HIVE_ISP_DDR_WORD_BYTES) #define UDS_DMACH_STRIDE_B_IN_C (((ISP_INTERNAL_WIDTH/2)/BITS8_ELEMENTS_PER_XMEM_ADDR)*HIVE_ISP_DDR_WORD_BYTES) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_types.h index 7a73702..c9db9a4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/isp/modes/interface/isp_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _ISP_TYPES_H_ #define _ISP_TYPES_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/interface/ia_css_binary.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/interface/ia_css_binary.h index 78f6c08..3632afb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/interface/ia_css_binary.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/interface/ia_css_binary.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_BINARY_H_ #define _IA_CSS_BINARY_H_ @@ -102,6 +103,8 @@ struct ia_css_binary_descr { bool enable_xnr; bool enable_fractional_ds; bool enable_dpc; + bool enable_luma_only; + bool enable_tnr; bool enable_capture_pp_bli; struct ia_css_resolution dvs_env; enum ia_css_stream_format stream_format; @@ -136,6 +139,8 @@ struct ia_css_binary { int sctbl_width_per_color; int sctbl_aligned_width_per_color; int sctbl_height; + int sctbl_legacy_width_per_color; + int sctbl_legacy_height; struct ia_css_sdis_info dis; struct ia_css_resolution dvs_envelope; bool online; @@ -169,6 +174,8 @@ struct ia_css_binary { 0, /* sctbl_width_per_color */ \ 0, /* sctbl_aligned_width_per_color */ \ 0, /* sctbl_height */ \ + 0, /* sctbl_legacy_width_per_color */ \ + 0, /* sctbl_legacy_height */ \ IA_CSS_DEFAULT_SDIS_INFO, /* dis */ \ { 0, 0},/* dvs_envelope_info */ \ false, /* online */ \ @@ -210,9 +217,12 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, * @param[in] type: The shading correction type. * @param[in] required_bds_factor: The bayer downscaling factor required in the pipe. * @param[in] stream_config: The stream configuration. - * @param[out] info: The shading information. + * @param[out] shading_info: The shading information. + * The shading information necessary as API is stored in the shading_info. * The driver needs to get this information to generate - * the shading table directly required in the isp. + * the shading table directly required from ISP. + * @param[out] pipe_config: The pipe configuration. + * The shading information related to ISP (but, not necessary as API) is stored in the pipe_config. * @return IA_CSS_SUCCESS or error code upon error. * */ @@ -221,7 +231,8 @@ ia_css_binary_get_shading_info(const struct ia_css_binary *binary, enum ia_css_shading_correction_type type, unsigned int required_bds_factor, const struct ia_css_stream_config *stream_config, - struct ia_css_shading_info *info); + struct ia_css_shading_info *shading_info, + struct ia_css_pipe_config *pipe_config); enum ia_css_err ia_css_binary_3a_grid_info(const struct ia_css_binary *binary, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/src/binary.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/src/binary.c index b98fc412..bae7309 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/src/binary.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/binary/src/binary.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include /* HR_GDC_N */ #include "isp.h" /* ISP_VEC_NELEMS */ @@ -28,11 +29,15 @@ #if !defined(IS_ISP_2500_SYSTEM) #include "vf/vf_1.0/ia_css_vf.host.h" +#include "sc/sc_1.0/ia_css_sc.host.h" #include "sdis/sdis_1.0/ia_css_sdis.host.h" +#include "fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h" /* FRAC_ACC */ #else #include +#include "input/sc_input_yuv_1.0/ia_css_input_yuv.host.h" +#include "raw/sc_raw_1.0/ia_css_raw.host.h" +#include "components/input_feeder/src/host/ia_css_input_feeder.host.h" #endif - #include "camera/pipe/interface/ia_css_pipe_binarydesc.h" #if defined(HAS_RES_MGR) #include @@ -114,83 +119,95 @@ ia_css_binary_internal_res(const struct ia_css_frame_info *in_info, #endif } -/* Computation results of the origin coordinate of bayer on the shading table. */ -struct sh_css_shading_table_bayer_origin_compute_results { - uint32_t bayer_scale_hor_ratio_in; /* Horizontal ratio (in) of bayer scaling. */ - uint32_t bayer_scale_hor_ratio_out; /* Horizontal ratio (out) of bayer scaling. */ - uint32_t bayer_scale_ver_ratio_in; /* Vertical ratio (in) of bayer scaling. */ - uint32_t bayer_scale_ver_ratio_out; /* Vertical ratio (out) of bayer scaling. */ - uint32_t sc_bayer_origin_x_bqs_on_shading_table; /* X coordinate (in bqs) of bayer origin on shading table. */ - uint32_t sc_bayer_origin_y_bqs_on_shading_table; /* Y coordinate (in bqs) of bayer origin on shading table. */ +/* Requirements for the shading correction. */ +struct sh_css_binary_sc_requirements { + /* Bayer scaling factor, for the scaling which is applied before shading correction. */ + uint32_t bayer_scale_hor_ratio_in; /* Horizontal ratio (in) of scaling applied BEFORE shading correction. */ + uint32_t bayer_scale_hor_ratio_out; /* Horizontal ratio (out) of scaling applied BEFORE shading correction. */ + uint32_t bayer_scale_ver_ratio_in; /* Vertical ratio (in) of scaling applied BEFORE shading correction. */ + uint32_t bayer_scale_ver_ratio_out; /* Vertical ratio (out) of scaling applied BEFORE shading correction. */ + + /* ISP internal frame is composed of the real sensor data and the padding data. */ + uint32_t sensor_data_origin_x_bqs_on_internal; /* X origin (in bqs) of sensor data on internal frame + at shading correction. */ + uint32_t sensor_data_origin_y_bqs_on_internal; /* Y origin (in bqs) of sensor data on internal frame + at shading correction. */ }; -/* Compute the origin coordinate of bayer (= real sensor data area) - on the shading table, which bayer is inputted to shading correction. */ +/* Get the requirements for the shading correction. */ static enum ia_css_err -ia_css_binary_compute_shading_table_bayer_origin( - const struct ia_css_binary *binary, /* [in] */ - unsigned int required_bds_factor, /* [in] */ - const struct ia_css_stream_config *stream_config, /* [in] */ - struct sh_css_shading_table_bayer_origin_compute_results *res) /* [out] */ +sh_css_binary_get_sc_requirements( + const struct ia_css_binary *binary, /* [in] */ + unsigned int required_bds_factor, /* [in] */ + const struct ia_css_stream_config *stream_config, /* [in] */ + struct sh_css_binary_sc_requirements *scr) /* [out] */ { +#if !defined(IS_ISP_2500_SYSTEM) enum ia_css_err err; - /* Numerator and denominator of the fixed bayer downscaling factor. - (numerator >= denominator) */ + /* Numerator and denominator of the fixed bayer downscaling factor. (numerator >= denominator) */ unsigned int bds_num, bds_den; - /* Horizontal/Vertical ratio of bayer scaling - between input area and output area. */ - unsigned int bs_hor_ratio_in; - unsigned int bs_hor_ratio_out; - unsigned int bs_ver_ratio_in; - unsigned int bs_ver_ratio_out; + /* Horizontal/Vertical ratio of bayer scaling between input area and output area. */ + unsigned int bs_hor_ratio_in, bs_hor_ratio_out, bs_ver_ratio_in, bs_ver_ratio_out; /* Left padding set by InputFormatter. */ - unsigned int left_padding_bqs; /* in bqs */ - - /* Flag for the NEED_BDS_FACTOR_2_00 macro defined in isp kernels. */ - unsigned int need_bds_factor_2_00; - - /* Left padding adjusted inside the isp. */ - unsigned int left_padding_adjusted_bqs; /* in bqs */ - - /* Bad pixels caused by filters. - NxN-filter (before/after bayer scaling) moves the image position - to right/bottom directions by a few pixels. - It causes bad pixels at left/top sides, - and effective bayer size decreases. */ - unsigned int bad_bqs_on_left_before_bs; /* in bqs */ - unsigned int bad_bqs_on_left_after_bs; /* in bqs */ - unsigned int bad_bqs_on_top_before_bs; /* in bqs */ - unsigned int bad_bqs_on_top_after_bs; /* in bqs */ - - /* Get the numerator and denominator of bayer downscaling factor. */ - err = sh_css_bds_factor_get_numerator_denominator - (required_bds_factor, &bds_num, &bds_den); - if (err != IA_CSS_SUCCESS) + unsigned int left_padding_bqs; + + /* Flags corresponding to NEED_BDS_FACTOR_2_00/NEED_BDS_FACTOR_1_50/NEED_BDS_FACTOR_1_25 macros + * defined in isp kernels. */ + unsigned int need_bds_factor_2_00, need_bds_factor_1_50, need_bds_factor_1_25; + + /* Left padding adjusted inside the isp kernels. */ + unsigned int left_padding_adjusted_bqs; + + /* Top padding padded inside the isp kernel for bayer downscaling binaries. */ + unsigned int top_padding_bqs; + + /* Bayer downscaling factor 1.0 by fixed-point. */ + int bds_frac_acc = FRAC_ACC; /* FRAC_ACC is defined in ia_css_fixedbds_param.h. */ + + /* Right/Down shift amount caused by filters applied BEFORE shading corrertion. */ + unsigned int right_shift_bqs_before_bs; /* right shift before bayer scaling */ + unsigned int right_shift_bqs_after_bs; /* right shift after bayer scaling */ + unsigned int down_shift_bqs_before_bs; /* down shift before bayer scaling */ + unsigned int down_shift_bqs_after_bs; /* down shift after bayer scaling */ + + /* Origin of the real sensor data area on the internal frame at shading correction. */ + unsigned int sensor_data_origin_x_bqs_on_internal; + unsigned int sensor_data_origin_y_bqs_on_internal; + + IA_CSS_ENTER_PRIVATE("binary=%p, required_bds_factor=%d, stream_config=%p", + binary, required_bds_factor, stream_config); + + /* Get the numerator and denominator of the required bayer downscaling factor. */ + err = sh_css_bds_factor_get_numerator_denominator(required_bds_factor, &bds_num, &bds_den); + if (err != IA_CSS_SUCCESS) { + IA_CSS_LEAVE_ERR_PRIVATE(err); return err; + } - /* Set the horizontal/vertical ratio of bayer scaling - between input area and output area. */ + IA_CSS_LOG("bds_num=%d, bds_den=%d", bds_num, bds_den); + + /* Set the horizontal/vertical ratio of bayer scaling between input area and output area. */ bs_hor_ratio_in = bds_num; bs_hor_ratio_out = bds_den; bs_ver_ratio_in = bds_num; bs_ver_ratio_out = bds_den; - /* Set the left padding set by InputFormatter. (ifmtr.c) */ + /* Set the left padding set by InputFormatter. (ia_css_ifmtr_configure() in ifmtr.c) */ if (stream_config->left_padding == -1) left_padding_bqs = _ISP_BQS(binary->left_padding); else - left_padding_bqs = (unsigned int)((int)ISP_VEC_NELEMS - - _ISP_BQS(stream_config->left_padding)); - - /* Set the left padding adjusted inside the isp. - When bds_factor 2.00 is needed, some padding is added to left_padding - inside the isp, before bayer downscaling. (raw.isp.c) - (Hopefully, left_crop/left_padding/top_crop should be defined in css - appropriately, depending on bds_factor.) - */ + left_padding_bqs = (unsigned int)((int)ISP_VEC_NELEMS - _ISP_BQS(stream_config->left_padding)); + + IA_CSS_LOG("stream.left_padding=%d, binary.left_padding=%d, left_padding_bqs=%d", + stream_config->left_padding, binary->left_padding, left_padding_bqs); + + /* Set the left padding adjusted inside the isp kernels. + * When the bds_factor isn't 1.00, the left padding size is adjusted inside the isp, + * before bayer downscaling. (scaled_hor_plane_index(), raw_compute_hphase() in raw.isp.c) + */ need_bds_factor_2_00 = ((binary->info->sp.bds.supported_bds_factors & (PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_2_00) | PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_2_50) | @@ -201,55 +218,138 @@ ia_css_binary_compute_shading_table_bayer_origin( PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_6_00) | PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_8_00))) != 0); - if (need_bds_factor_2_00 && binary->info->sp.pipeline.left_cropping > 0) - left_padding_adjusted_bqs = left_padding_bqs + ISP_VEC_NELEMS; - else + need_bds_factor_1_50 = ((binary->info->sp.bds.supported_bds_factors & + (PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_1_50) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_2_25) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_3_00) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_4_50) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_6_00))) != 0); + + need_bds_factor_1_25 = ((binary->info->sp.bds.supported_bds_factors & + (PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_1_25) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_2_50) | + PACK_BDS_FACTOR(SH_CSS_BDS_FACTOR_5_00))) != 0); + + if (binary->info->sp.pipeline.left_cropping > 0 && + (need_bds_factor_2_00 || need_bds_factor_1_50 || need_bds_factor_1_25)) { + /* + * downscale 2.0 -> first_vec_adjusted_bqs = 128 + * downscale 1.5 -> first_vec_adjusted_bqs = 96 + * downscale 1.25 -> first_vec_adjusted_bqs = 80 + */ + unsigned int first_vec_adjusted_bqs + = ISP_VEC_NELEMS * bs_hor_ratio_in / bs_hor_ratio_out; + left_padding_adjusted_bqs = first_vec_adjusted_bqs + - _ISP_BQS(binary->info->sp.pipeline.left_cropping); + } else left_padding_adjusted_bqs = left_padding_bqs; - /* Currently, the bad pixel caused by filters before bayer scaling - is NOT considered, because the bad pixel is subtle. - When some large filter is used in the future, - we need to consider the bad pixel. + IA_CSS_LOG("supported_bds_factors=%d, need_bds_factor:2_00=%d, 1_50=%d, 1_25=%d", + binary->info->sp.bds.supported_bds_factors, + need_bds_factor_2_00, need_bds_factor_1_50, need_bds_factor_1_25); + IA_CSS_LOG("left_cropping=%d, left_padding_adjusted_bqs=%d", + binary->info->sp.pipeline.left_cropping, left_padding_adjusted_bqs); + + /* Set the top padding padded inside the isp kernel for bayer downscaling binaries. + * When the bds_factor isn't 1.00, the top padding is padded inside the isp + * before bayer downscaling, because the top cropping size (input margin) is not enough. + * (calculate_input_line(), raw_compute_vphase(), dma_read_raw() in raw.isp.c) + * NOTE: In dma_read_raw(), the factor passed to raw_compute_vphase() is got by get_bds_factor_for_dma_read(). + * This factor is BDS_FPVAL_100/BDS_FPVAL_125/BDS_FPVAL_150/BDS_FPVAL_200. + */ + top_padding_bqs = 0; + if (binary->info->sp.pipeline.top_cropping > 0 && + (required_bds_factor == SH_CSS_BDS_FACTOR_1_25 || + required_bds_factor == SH_CSS_BDS_FACTOR_1_50 || + required_bds_factor == SH_CSS_BDS_FACTOR_2_00)) { + /* Calculation from calculate_input_line() and raw_compute_vphase() in raw.isp.c. */ + int top_cropping_bqs = _ISP_BQS(binary->info->sp.pipeline.top_cropping); + /* top cropping (in bqs) */ + int factor = bds_num * bds_frac_acc / bds_den; /* downscaling factor by fixed-point */ + int top_padding_bqsxfrac_acc = (top_cropping_bqs * factor - top_cropping_bqs * bds_frac_acc) + + (2 * bds_frac_acc - factor); /* top padding by fixed-point (in bqs) */ + + top_padding_bqs = (unsigned int)((top_padding_bqsxfrac_acc + bds_frac_acc/2 - 1) / bds_frac_acc); + } - Currently, when bds_factor isn't 1.00, 3x3 anti-alias filter is applied - to each color plane(Gr/R/B/Gb) before bayer downscaling. - This filter moves each color plane to right/bottom directions - by 1 pixel at the most, depending on downscaling factor. - */ - bad_bqs_on_left_before_bs = 0; - bad_bqs_on_top_before_bs = 0; + IA_CSS_LOG("top_cropping=%d, top_padding_bqs=%d", binary->info->sp.pipeline.top_cropping, top_padding_bqs); - /* Currently, the bad pixel caused by filters after bayer scaling - is NOT considered, because the bad pixel is subtle. - When some large filter is used in the future, - we need to consider the bad pixel. + /* Set the right/down shift amount caused by filters applied BEFORE bayer scaling, + * which scaling is applied BEFORE shading corrertion. + * + * When the bds_factor isn't 1.00, 3x3 anti-alias filter is applied to each color plane(Gr/R/B/Gb) + * before bayer downscaling. + * This filter shifts each color plane (Gr/R/B/Gb) to right/down directions by 1 pixel. + */ + right_shift_bqs_before_bs = 0; + down_shift_bqs_before_bs = 0; - Currently, when DPC&BNR is processed between bayer scaling and - shading correction, DPC&BNR moves each color plane to - right/bottom directions by 1 pixel. - */ - bad_bqs_on_left_after_bs = 0; - bad_bqs_on_top_after_bs = 0; - - /* Calculate the origin of bayer (real sensor data area) - located on the shading table during the shading correction. */ - res->sc_bayer_origin_x_bqs_on_shading_table - = ((left_padding_adjusted_bqs + bad_bqs_on_left_before_bs) - * bs_hor_ratio_out + bs_hor_ratio_in/2) / bs_hor_ratio_in - + bad_bqs_on_left_after_bs; - /* "+ bs_hor_ratio_in/2": rounding for division by bs_hor_ratio_in */ - res->sc_bayer_origin_y_bqs_on_shading_table - = (bad_bqs_on_top_before_bs - * bs_ver_ratio_out + bs_ver_ratio_in/2) / bs_ver_ratio_in - + bad_bqs_on_top_after_bs; - /* "+ bs_ver_ratio_in/2": rounding for division by bs_ver_ratio_in */ - - res->bayer_scale_hor_ratio_in = (uint32_t)bs_hor_ratio_in; - res->bayer_scale_hor_ratio_out = (uint32_t)bs_hor_ratio_out; - res->bayer_scale_ver_ratio_in = (uint32_t)bs_ver_ratio_in; - res->bayer_scale_ver_ratio_out = (uint32_t)bs_ver_ratio_out; + if (need_bds_factor_2_00 || need_bds_factor_1_50 || need_bds_factor_1_25) { + right_shift_bqs_before_bs = 1; + down_shift_bqs_before_bs = 1; + } + IA_CSS_LOG("right_shift_bqs_before_bs=%d, down_shift_bqs_before_bs=%d", + right_shift_bqs_before_bs, down_shift_bqs_before_bs); + + /* Set the right/down shift amount caused by filters applied AFTER bayer scaling, + * which scaling is applied BEFORE shading corrertion. + * + * When DPC&BNR is processed between bayer scaling and shading correction, + * DPC&BNR moves each color plane (Gr/R/B/Gb) to right/down directions by 1 pixel. + */ + right_shift_bqs_after_bs = 0; + down_shift_bqs_after_bs = 0; + + if (binary->info->mem_offsets.offsets.param->dmem.dp.size != 0) { /* if DPC&BNR is enabled in the binary */ + right_shift_bqs_after_bs = 1; + down_shift_bqs_after_bs = 1; + } + + IA_CSS_LOG("right_shift_bqs_after_bs=%d, down_shift_bqs_after_bs=%d", + right_shift_bqs_after_bs, down_shift_bqs_after_bs); + + /* Set the origin of the sensor data area on the internal frame at shading correction. */ + { + unsigned int bs_frac = bds_frac_acc; /* scaling factor 1.0 in fixed point */ + unsigned int bs_out, bs_in; /* scaling ratio in fixed point */ + + bs_out = bs_hor_ratio_out * bs_frac; + bs_in = bs_hor_ratio_in * bs_frac; + sensor_data_origin_x_bqs_on_internal + = ((left_padding_adjusted_bqs + right_shift_bqs_before_bs) * bs_out + bs_in/2) / bs_in + + right_shift_bqs_after_bs; /* "+ bs_in/2": rounding */ + + bs_out = bs_ver_ratio_out * bs_frac; + bs_in = bs_ver_ratio_in * bs_frac; + sensor_data_origin_y_bqs_on_internal + = ((top_padding_bqs + down_shift_bqs_before_bs) * bs_out + bs_in/2) / bs_in + + down_shift_bqs_after_bs; /* "+ bs_in/2": rounding */ + } + + scr->bayer_scale_hor_ratio_in = (uint32_t)bs_hor_ratio_in; + scr->bayer_scale_hor_ratio_out = (uint32_t)bs_hor_ratio_out; + scr->bayer_scale_ver_ratio_in = (uint32_t)bs_ver_ratio_in; + scr->bayer_scale_ver_ratio_out = (uint32_t)bs_ver_ratio_out; + scr->sensor_data_origin_x_bqs_on_internal = (uint32_t)sensor_data_origin_x_bqs_on_internal; + scr->sensor_data_origin_y_bqs_on_internal = (uint32_t)sensor_data_origin_y_bqs_on_internal; + + IA_CSS_LOG("sc_requirements: %d, %d, %d, %d, %d, %d", + scr->bayer_scale_hor_ratio_in, scr->bayer_scale_hor_ratio_out, + scr->bayer_scale_ver_ratio_in, scr->bayer_scale_ver_ratio_out, + scr->sensor_data_origin_x_bqs_on_internal, scr->sensor_data_origin_y_bqs_on_internal); + + IA_CSS_LEAVE_ERR_PRIVATE(err); return err; +#else /* !defined(IS_ISP_2500_SYSTEM) */ + (void)binary; + (void)required_bds_factor; + (void)stream_config; + (void)scr; + IA_CSS_ERROR("IA_CSS_SHADING_CORRECTION_TYPE_1 not supported in ISP_2500_SYSTEM"); + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_NOT_SUPPORTED); + return IA_CSS_ERR_NOT_SUPPORTED; +#endif /* !defined(IS_ISP_2500_SYSTEM) */ } /* Get the shading information of Shading Correction Type 1. */ @@ -257,45 +357,175 @@ static enum ia_css_err ia_css_binary_get_shading_info_type_1(const struct ia_css_binary *binary, /* [in] */ unsigned int required_bds_factor, /* [in] */ const struct ia_css_stream_config *stream_config, /* [in] */ - struct ia_css_shading_info *info) /* [out] */ + struct ia_css_shading_info *shading_info, /* [out] */ + struct ia_css_pipe_config *pipe_config) /* [out] */ { +#if !defined(IS_ISP_2500_SYSTEM) enum ia_css_err err; - struct sh_css_shading_table_bayer_origin_compute_results res; + struct sh_css_binary_sc_requirements scr; + struct ia_css_shading_info default_shading_info_type_1 = DEFAULT_SHADING_INFO_TYPE_1; + + uint32_t in_width_bqs, in_height_bqs, internal_width_bqs, internal_height_bqs; + uint32_t num_hor_grids, num_ver_grids, bqs_per_grid_cell, tbl_width_bqs, tbl_height_bqs; + uint32_t sensor_org_x_bqs_on_internal, sensor_org_y_bqs_on_internal, sensor_width_bqs, sensor_height_bqs; + uint32_t sensor_center_x_bqs_on_internal, sensor_center_y_bqs_on_internal; + uint32_t left, right, upper, lower; + uint32_t adjust_left, adjust_right, adjust_upper, adjust_lower, adjust_width_bqs, adjust_height_bqs; + uint32_t internal_org_x_bqs_on_tbl, internal_org_y_bqs_on_tbl; + uint32_t sensor_org_x_bqs_on_tbl, sensor_org_y_bqs_on_tbl; assert(binary != NULL); - assert(info != NULL); + assert(stream_config != NULL); + assert(shading_info != NULL); + assert(pipe_config != NULL); - info->type = IA_CSS_SHADING_CORRECTION_TYPE_1; - - info->info.type_1.enable = binary->info->sp.enable.sc; - info->info.type_1.num_hor_grids = binary->sctbl_width_per_color; - info->info.type_1.num_ver_grids = binary->sctbl_height; - info->info.type_1.bqs_per_grid_cell = (1 << binary->deci_factor_log2); + IA_CSS_ENTER_PRIVATE("binary=%p, required_bds_factor=%d, stream_config=%p", + binary, required_bds_factor, stream_config); /* Initialize by default values. */ - info->info.type_1.bayer_scale_hor_ratio_in = 1; - info->info.type_1.bayer_scale_hor_ratio_out = 1; - info->info.type_1.bayer_scale_ver_ratio_in = 1; - info->info.type_1.bayer_scale_ver_ratio_out = 1; - info->info.type_1.sc_bayer_origin_x_bqs_on_shading_table = 0; - info->info.type_1.sc_bayer_origin_y_bqs_on_shading_table = 0; - - err = ia_css_binary_compute_shading_table_bayer_origin( - binary, - required_bds_factor, - stream_config, - &res); - if (err != IA_CSS_SUCCESS) + *shading_info = default_shading_info_type_1; + + err = sh_css_binary_get_sc_requirements(binary, required_bds_factor, stream_config, &scr); + if (err != IA_CSS_SUCCESS) { + IA_CSS_LEAVE_ERR_PRIVATE(err); return err; + } + + IA_CSS_LOG("binary: id=%d, sctbl=%dx%d, deci=%d", + binary->info->sp.id, binary->sctbl_width_per_color, binary->sctbl_height, binary->deci_factor_log2); + IA_CSS_LOG("binary: in=%dx%d, in_padded_w=%d, int=%dx%d, int_padded_w=%d, out=%dx%d, out_padded_w=%d", + binary->in_frame_info.res.width, binary->in_frame_info.res.height, binary->in_frame_info.padded_width, + binary->internal_frame_info.res.width, binary->internal_frame_info.res.height, + binary->internal_frame_info.padded_width, + binary->out_frame_info[0].res.width, binary->out_frame_info[0].res.height, + binary->out_frame_info[0].padded_width); + + /* Set the input size from sensor, which includes left/top crop size. */ + in_width_bqs = _ISP_BQS(binary->in_frame_info.res.width); + in_height_bqs = _ISP_BQS(binary->in_frame_info.res.height); + + /* Frame size internally used in ISP, including sensor data and padding. + * This is the frame size, to which the shading correction is applied. + */ + internal_width_bqs = _ISP_BQS(binary->internal_frame_info.res.width); + internal_height_bqs = _ISP_BQS(binary->internal_frame_info.res.height); - info->info.type_1.bayer_scale_hor_ratio_in = res.bayer_scale_hor_ratio_in; - info->info.type_1.bayer_scale_hor_ratio_out = res.bayer_scale_hor_ratio_out; - info->info.type_1.bayer_scale_ver_ratio_in = res.bayer_scale_ver_ratio_in; - info->info.type_1.bayer_scale_ver_ratio_out = res.bayer_scale_ver_ratio_out; - info->info.type_1.sc_bayer_origin_x_bqs_on_shading_table = res.sc_bayer_origin_x_bqs_on_shading_table; - info->info.type_1.sc_bayer_origin_y_bqs_on_shading_table = res.sc_bayer_origin_y_bqs_on_shading_table; + /* Shading table. */ + num_hor_grids = binary->sctbl_width_per_color; + num_ver_grids = binary->sctbl_height; + bqs_per_grid_cell = (1 << binary->deci_factor_log2); + tbl_width_bqs = (num_hor_grids - 1) * bqs_per_grid_cell; + tbl_height_bqs = (num_ver_grids - 1) * bqs_per_grid_cell; + IA_CSS_LOG("tbl_width_bqs=%d, tbl_height_bqs=%d", tbl_width_bqs, tbl_height_bqs); + + /* Real sensor data area on the internal frame at shading correction. + * Filters and scaling are applied to the internal frame before shading correction, depending on the binary. + */ + sensor_org_x_bqs_on_internal = scr.sensor_data_origin_x_bqs_on_internal; + sensor_org_y_bqs_on_internal = scr.sensor_data_origin_y_bqs_on_internal; + { + unsigned int bs_frac = 8; /* scaling factor 1.0 in fixed point (8 == FRAC_ACC macro in ISP) */ + unsigned int bs_out, bs_in; /* scaling ratio in fixed point */ + + bs_out = scr.bayer_scale_hor_ratio_out * bs_frac; + bs_in = scr.bayer_scale_hor_ratio_in * bs_frac; + sensor_width_bqs = (in_width_bqs * bs_out + bs_in/2) / bs_in; /* "+ bs_in/2": rounding */ + + bs_out = scr.bayer_scale_ver_ratio_out * bs_frac; + bs_in = scr.bayer_scale_ver_ratio_in * bs_frac; + sensor_height_bqs = (in_height_bqs * bs_out + bs_in/2) / bs_in; /* "+ bs_in/2": rounding */ + } + + /* Center of the sensor data on the internal frame at shading correction. */ + sensor_center_x_bqs_on_internal = sensor_org_x_bqs_on_internal + sensor_width_bqs / 2; + sensor_center_y_bqs_on_internal = sensor_org_y_bqs_on_internal + sensor_height_bqs / 2; + + /* Size of left/right/upper/lower sides of the sensor center on the internal frame. */ + left = sensor_center_x_bqs_on_internal; + right = internal_width_bqs - sensor_center_x_bqs_on_internal; + upper = sensor_center_y_bqs_on_internal; + lower = internal_height_bqs - sensor_center_y_bqs_on_internal; + + /* Align the size of left/right/upper/lower sides to a multiple of the grid cell size. */ + adjust_left = CEIL_MUL(left, bqs_per_grid_cell); + adjust_right = CEIL_MUL(right, bqs_per_grid_cell); + adjust_upper = CEIL_MUL(upper, bqs_per_grid_cell); + adjust_lower = CEIL_MUL(lower, bqs_per_grid_cell); + + /* Shading table should cover the adjusted frame size. */ + adjust_width_bqs = adjust_left + adjust_right; + adjust_height_bqs = adjust_upper + adjust_lower; + + IA_CSS_LOG("adjust_width_bqs=%d, adjust_height_bqs=%d", adjust_width_bqs, adjust_height_bqs); + + if (adjust_width_bqs > tbl_width_bqs || adjust_height_bqs > tbl_height_bqs) { + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INTERNAL_ERROR); + return IA_CSS_ERR_INTERNAL_ERROR; + } + + /* Origin of the internal frame on the shading table. */ + internal_org_x_bqs_on_tbl = adjust_left - left; + internal_org_y_bqs_on_tbl = adjust_upper - upper; + + /* Origin of the real sensor data area on the shading table. */ + sensor_org_x_bqs_on_tbl = internal_org_x_bqs_on_tbl + sensor_org_x_bqs_on_internal; + sensor_org_y_bqs_on_tbl = internal_org_y_bqs_on_tbl + sensor_org_y_bqs_on_internal; + + /* The shading information necessary as API is stored in the shading_info. */ + shading_info->info.type_1.num_hor_grids = num_hor_grids; + shading_info->info.type_1.num_ver_grids = num_ver_grids; + shading_info->info.type_1.bqs_per_grid_cell = bqs_per_grid_cell; + + shading_info->info.type_1.bayer_scale_hor_ratio_in = scr.bayer_scale_hor_ratio_in; + shading_info->info.type_1.bayer_scale_hor_ratio_out = scr.bayer_scale_hor_ratio_out; + shading_info->info.type_1.bayer_scale_ver_ratio_in = scr.bayer_scale_ver_ratio_in; + shading_info->info.type_1.bayer_scale_ver_ratio_out = scr.bayer_scale_ver_ratio_out; + + shading_info->info.type_1.isp_input_sensor_data_res_bqs.width = in_width_bqs; + shading_info->info.type_1.isp_input_sensor_data_res_bqs.height = in_height_bqs; + + shading_info->info.type_1.sensor_data_res_bqs.width = sensor_width_bqs; + shading_info->info.type_1.sensor_data_res_bqs.height = sensor_height_bqs; + + shading_info->info.type_1.sensor_data_origin_bqs_on_sctbl.x = (int32_t)sensor_org_x_bqs_on_tbl; + shading_info->info.type_1.sensor_data_origin_bqs_on_sctbl.y = (int32_t)sensor_org_y_bqs_on_tbl; + + /* The shading information related to ISP (but, not necessary as API) is stored in the pipe_config. */ + pipe_config->internal_frame_origin_bqs_on_sctbl.x = (int32_t)internal_org_x_bqs_on_tbl; + pipe_config->internal_frame_origin_bqs_on_sctbl.y = (int32_t)internal_org_y_bqs_on_tbl; + + IA_CSS_LOG("shading_info: grids=%dx%d, cell=%d, scale=%d,%d,%d,%d, input=%dx%d, data=%dx%d, origin=(%d,%d)", + shading_info->info.type_1.num_hor_grids, + shading_info->info.type_1.num_ver_grids, + shading_info->info.type_1.bqs_per_grid_cell, + shading_info->info.type_1.bayer_scale_hor_ratio_in, + shading_info->info.type_1.bayer_scale_hor_ratio_out, + shading_info->info.type_1.bayer_scale_ver_ratio_in, + shading_info->info.type_1.bayer_scale_ver_ratio_out, + shading_info->info.type_1.isp_input_sensor_data_res_bqs.width, + shading_info->info.type_1.isp_input_sensor_data_res_bqs.height, + shading_info->info.type_1.sensor_data_res_bqs.width, + shading_info->info.type_1.sensor_data_res_bqs.height, + shading_info->info.type_1.sensor_data_origin_bqs_on_sctbl.x, + shading_info->info.type_1.sensor_data_origin_bqs_on_sctbl.y); + + IA_CSS_LOG("pipe_config: origin=(%d,%d)", + pipe_config->internal_frame_origin_bqs_on_sctbl.x, + pipe_config->internal_frame_origin_bqs_on_sctbl.y); + + IA_CSS_LEAVE_ERR_PRIVATE(err); return err; +#else /* !defined(IS_ISP_2500_SYSTEM) */ + (void)binary; + (void)required_bds_factor; + (void)stream_config; + (void)shading_info; + (void)pipe_config; + IA_CSS_ERROR("IA_CSS_SHADING_CORRECTION_TYPE_1 not supported in ISP_2500_SYSTEM"); + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_NOT_SUPPORTED); + return IA_CSS_ERR_NOT_SUPPORTED; +#endif /* !defined(IS_ISP_2500_SYSTEM) */ } enum ia_css_err @@ -303,21 +533,27 @@ ia_css_binary_get_shading_info(const struct ia_css_binary *binary, /* [in] */ enum ia_css_shading_correction_type type, /* [in] */ unsigned int required_bds_factor, /* [in] */ const struct ia_css_stream_config *stream_config, /* [in] */ - struct ia_css_shading_info *info) /* [out] */ + struct ia_css_shading_info *shading_info, /* [out] */ + struct ia_css_pipe_config *pipe_config) /* [out] */ { enum ia_css_err err; assert(binary != NULL); - assert(info != NULL); + assert(shading_info != NULL); + + IA_CSS_ENTER_PRIVATE("binary=%p, type=%d, required_bds_factor=%d, stream_config=%p", + binary, type, required_bds_factor, stream_config); if (type == IA_CSS_SHADING_CORRECTION_TYPE_1) - err = ia_css_binary_get_shading_info_type_1(binary, required_bds_factor, stream_config, info); + err = ia_css_binary_get_shading_info_type_1(binary, required_bds_factor, stream_config, + shading_info, pipe_config); /* Other function calls can be added here when other shading correction types will be added in the future. */ else - return IA_CSS_ERR_NOT_SUPPORTED; + err = IA_CSS_ERR_NOT_SUPPORTED; + IA_CSS_LEAVE_ERR_PRIVATE(err); return err; } @@ -478,6 +714,33 @@ binary_supports_output_format(const struct ia_css_binary_xinfo *info, return false; } +/* currently function is supported for 2500, can be extended to other + to projects */ +static bool +binary_supports_input_format(const struct ia_css_binary_xinfo *info, + enum ia_css_stream_format format) +{ + + assert(info != NULL); + (void)format; + +#ifdef IS_ISP_2500_SYSTEM + if (info->sp.enable.input_yuv) + return ia_css_input_yuv_supports_format(format); + else if (info->sp.enable.input_feeder) + return ia_css_input_feeder_supports_format(format); + else if (info->sp.enable.input_raw) + return ia_css_input_raw_supports_format(format); + else { + IA_CSS_ERROR("unkown input kernel"); + return false; + } +#else + return true; +#endif +} + + static bool binary_supports_vf_format(const struct ia_css_binary_xinfo *info, enum ia_css_frame_format format) @@ -590,9 +853,9 @@ binary_grid_deci_factor_log2(int width, int height) /* 3A/Shading decimation factor spcification (at August 2008) * ------------------------------------------------------------------ * [Image Width (BQ)] [Decimation Factor (BQ)] [Resulting grid cells] - * 1280 ?c 32 40 ?c - * 640 ?c 1279 16 40 ?c 80 - * ?c 639 8 ?c 80 + * from 1280 32 from 40 + * from 640 to 1279 16 from 40 to 80 + * to 639 8 to 80 * ------------------------------------------------------------------ */ /* Maximum and minimum decimation factor by the specification */ @@ -944,20 +1207,26 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo, binary->s3atbl_isp_height = 0; } +#ifndef IS_ISP_2500_SYSTEM if (info->enable.sc) { binary->sctbl_width_per_color = - _ISP_SCTBL_WIDTH_PER_COLOR(sc_3a_dis_padded_width, - s3a_log_deci); + _ISP_SCTBL_WIDTH_PER_COLOR(isp_internal_width, s3a_log_deci); binary->sctbl_aligned_width_per_color = SH_CSS_MAX_SCTBL_ALIGNED_WIDTH_PER_COLOR; binary->sctbl_height = - _ISP_SCTBL_HEIGHT(sc_3a_dis_height, s3a_log_deci); + _ISP_SCTBL_HEIGHT(isp_internal_height, s3a_log_deci); + binary->sctbl_legacy_width_per_color = + _ISP_SCTBL_LEGACY_WIDTH_PER_COLOR(sc_3a_dis_padded_width, s3a_log_deci); + binary->sctbl_legacy_height = + _ISP_SCTBL_LEGACY_HEIGHT(sc_3a_dis_height, s3a_log_deci); } else { binary->sctbl_width_per_color = 0; binary->sctbl_aligned_width_per_color = 0; binary->sctbl_height = 0; + binary->sctbl_legacy_width_per_color = 0; + binary->sctbl_legacy_height = 0; } -#ifndef IS_ISP_2500_SYSTEM + ia_css_sdis_init_info(&binary->dis, sc_3a_dis_width, sc_3a_dis_padded_width, @@ -988,13 +1257,14 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, *req_vf_info; struct ia_css_binary_xinfo *xcandidate; - bool need_ds, need_dz, need_dvs, need_xnr, need_dpc; + bool need_ds, need_dz, need_dvs, need_xnr, need_dpc, need_tnr; bool striped; bool enable_yuv_ds; bool enable_high_speed; bool enable_dvs_6axis; bool enable_reduced_pipe; bool enable_capture_pp_bli; + bool enable_luma_only; enum ia_css_err err = IA_CSS_ERR_INTERNAL_ERROR; bool continuous; unsigned int isp_pipe_version; @@ -1023,18 +1293,25 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, } if (req_bin_out_info == NULL) return IA_CSS_ERR_INTERNAL_ERROR; - req_vf_info = descr->vf_info; + + if ((descr->vf_info != NULL) && (descr->vf_info->res.width == 0)) + /* width==0 means that there is no vf pin (e.g. in SkyCam preview case) */ + req_vf_info = NULL; + else + req_vf_info = descr->vf_info; need_xnr = descr->enable_xnr; need_ds = descr->enable_fractional_ds; need_dz = false; need_dvs = false; need_dpc = descr->enable_dpc; + need_tnr = descr->enable_tnr; enable_yuv_ds = descr->enable_yuv_ds; enable_high_speed = descr->enable_high_speed; enable_dvs_6axis = descr->enable_dvs_6axis; enable_reduced_pipe = descr->enable_reduced_pipe; enable_capture_pp_bli = descr->enable_capture_pp_bli; + enable_luma_only = descr->enable_luma_only; continuous = descr->continuous; striped = descr->striped; isp_pipe_version = descr->isp_pipe_version; @@ -1262,7 +1539,13 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, binary_supports_output_format(xcandidate, req_bin_out_info->format)); continue; } - + if (!binary_supports_input_format(xcandidate, descr->stream_format)) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "ia_css_binary_find() [%d] continue: !%d\n", + __LINE__, + binary_supports_input_format(xcandidate, req_in_info->format)); + continue; + } if (xcandidate->num_output_pins > 1 && /* in case we have a second output pin, */ req_vf_info && /* and we need vf output. */ /* check if the required vf format @@ -1326,6 +1609,22 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, continue; } + if (candidate->enable.luma_only != enable_luma_only) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "ia_css_binary_find() [%d] continue: %d != %d\n", + __LINE__, candidate->enable.luma_only, + descr->enable_luma_only); + continue; + } + + if(!candidate->enable.tnr && need_tnr) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "ia_css_binary_find() [%d] continue: !%d && %d\n", + __LINE__, candidate->enable.tnr, + descr->enable_tnr); + continue; + } + /* reconfigure any variable properties of the binary */ err = ia_css_binary_fill_info(xcandidate, online, two_ppc, stream_format, req_in_info, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq.h index e44353f..6bf5747 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_BUFQ_H #define _IA_CSS_BUFQ_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq_comm.h index aa845eb..ac16226 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/interface/ia_css_bufq_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_BUFQ_COMM_H #define _IA_CSS_BUFQ_COMM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/src/bufq.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/src/bufq.c index 5b7ebf8..93c7be8 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/src/bufq.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/bufq/src/bufq.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "assert_support.h" /* assert */ #include "ia_css_buffer.h" #include "sp.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug.h index 2a47fc4..ad62fc0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_DEBUG_H_ #define _IA_CSS_DEBUG_H_ @@ -26,6 +27,9 @@ #include "ia_css_stream_public.h" #include "ia_css_metadata.h" #include "sh_css_internal.h" +#if defined(IS_ISP_2500_SYSTEM) +#include "ia_css_pipe.h" +#endif /* available levels */ /*! Level for tracing errors */ @@ -181,6 +185,13 @@ void ia_css_debug_dump_isp_state(void); */ void ia_css_debug_dump_sp_state(void); +/*! @brief Dump GAC hardware state. + * Dumps the GAC ACB hardware registers. may be useful for + * detecting a GAC which got hang. + * @return None + */ +void ia_css_debug_dump_gac_state(void); + /*! @brief Dump dma controller state. * Dumps the dma controller state to tracing output. * @return None @@ -467,5 +478,28 @@ bool ia_css_debug_mode_enable_dma_channel( */ void ia_css_debug_dump_trace(void); +/** + * @brief Program counter dumping (in loop) + * + * @param[in] id The ID of the SP + * @param[in] num_of_dumps The number of dumps + * + * @return + * - none + */ +void ia_css_debug_pc_dump(sp_ID_t id, unsigned int num_of_dumps); + +#if defined(IS_ISP_2500_SYSTEM) +/*! @brief Dump all states for ISP hang case. + * Dumps the ISP previous and current configurations + * GACs status, SP0/1 statuses. + * + * @param[in] pipe The current pipe + * + * @return None + */ +void ia_css_debug_dump_hang_status( + struct ia_css_pipe *pipe); +#endif #endif /* _IA_CSS_DEBUG_H_ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_internal.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_internal.h index f3711fb..fc689dc 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_internal.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_internal.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,4 +12,5 @@ * more details. */ + /* TO DO: Move debug related code from ia_css_internal.h in */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_pipe.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_pipe.h index aa6d8e1..3753e37 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_pipe.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/interface/ia_css_debug_pipe.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_DEBUG_PIPE_H_ #define _IA_CSS_DEBUG_PIPE_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/src/ia_css_debug.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/src/ia_css_debug.c index 90f07c4..4c05668 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/src/ia_css_debug.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/debug/src/ia_css_debug.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "debug.h" #include "memory_access.h" @@ -39,6 +40,7 @@ #include "ia_css_isp_param.h" #include "sh_css_params.h" #include "ia_css_bufq.h" +#include "ia_css_queue.h" #include "ia_css_isp_params.h" @@ -103,6 +105,8 @@ #include "gc/gc_2/ia_css_gc2.host.h" #include "ynr/ynr_2/ia_css_ynr2.host.h" +#else +#include "acc_cluster.host.h" #endif /* snprintf is a C99 feature, MS visual studio defines _snprintf */ #if defined(_MSC_VER) @@ -679,34 +683,12 @@ static void debug_print_if_state(input_formatter_state_t *state, const char *id) "Block when no request", st_block_fifo_when_no_req); #if defined(HAS_INPUT_FORMATTER_VERSION_2) - /*********************************************************** - * Hack for WHQL. - * - * AUTHOR: zhengjie.lu@intel.com - * DATE: 2013-01-16 - * TIME: 12:35 - * LOCATION: Santa Clara - * COMMENT: Print out the value of the register that tells - * whehter the IF is set to the blocked mode (i.e. "1") or - * not (i.e. "0"). - ***********************************************************/ ia_css_debug_dtrace(2, "\t\t%-32s: %d\n", "IF_BLOCKED_FIFO_NO_REQ_ADDRESS", input_formatter_reg_load(INPUT_FORMATTER0_ID, HIVE_IF_BLOCK_FIFO_NO_REQ_ADDRESS) ); - /** End of hack for WHQL ***********************************/ - - /*********************************************************** - * Hack for WHQL. - * - * AUTHOR: zhengjie.lu@intel.com - * DATE: 2013-01-23 - * TIME: 20:14 - * LOCATION: Santa Clara - * COMMENT: Print out the input switch states. - * not (i.e. "0"). - ***********************************************************/ + ia_css_debug_dtrace(2, "\t%-32s:\n", "InputSwitch State"); ia_css_debug_dtrace(2, "\t\t%-32s: %d\n", @@ -763,8 +745,6 @@ static void debug_print_if_state(input_formatter_state_t *state, const char *id) "_REG_GP_IFMT_slv_reg_srst", gp_device_reg_load(GP_DEVICE0_ID, _REG_GP_IFMT_slv_reg_srst)); - /** End of Hack for WHQL **********************************/ - #endif ia_css_debug_dtrace(2, "\tFSM Status:\n"); @@ -938,6 +918,52 @@ void ia_css_debug_dump_if_state(void) } #endif +#ifdef IS_ISP_2500_SYSTEM + +static void gac_dump_acb_regs(uint32_t acb_base) +{ + uint32_t reg = ia_css_device_load_uint32(acb_base + ACB_INPUT_FRAME_SIZE_INFO_OFFSET); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\t\tcurrent frame size: %dx%d", (reg & 0xFFFF), ((reg >> 16) & 0xFFFF)); + reg = ia_css_device_load_uint32(acb_base + ACB_STTS_CURR_ACTV_CMD_INFO_OFFSET); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\t\tcurrent CMD: %x", (reg & 0xFFFF)); + reg = ia_css_device_load_uint32(acb_base + ACB_STTS_FRAME_LOCATION_INFO_OFFSET); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\t\tcurrent pixel location: %dx%d", (reg & 0xFFFF), ((reg >> 16) & 0xFFFF)); +} + +void ia_css_debug_dump_gac_state(void) +{ + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "GAC registers dump:"); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tDPC:"); + gac_dump_acb_regs(DPC_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tBDS:"); + gac_dump_acb_regs(BDS_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tSHD:"); + gac_dump_acb_regs(SHD_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tAWB:"); + gac_dump_acb_regs(AWB_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tAWBFR:"); + gac_dump_acb_regs(AWBFR_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tAE:"); + gac_dump_acb_regs(AE_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tAF:"); + gac_dump_acb_regs(AF_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tBNR:"); + gac_dump_acb_regs(BNR_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tANR:"); + gac_dump_acb_regs(ANR_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tDM:"); + gac_dump_acb_regs(DM_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tRGBPP:"); + gac_dump_acb_regs(RGBPP_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tYUVP1:"); + gac_dump_acb_regs(YUVP1_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tDVSSTAT:"); + gac_dump_acb_regs(DVSSTAT_ACB); + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "\tYUVP2:"); + gac_dump_acb_regs(YUVP2_ACB); +} +#endif + void ia_css_debug_dump_dma_state(void) { /* note: the var below is made static as it is quite large; @@ -3006,7 +3032,7 @@ ia_css_debug_pipe_graph_dump_stage( "in", true); } - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) { + for (i = 0; i < NUM_TNR_FRAMES; i++) { if (stage->args.tnr_frames[i]) { ia_css_debug_pipe_graph_dump_frame( stage->args.tnr_frames[i], id, @@ -3167,6 +3193,8 @@ ia_css_debug_dump_pipe_config( ia_css_debug_dump_resolution(&config->capt_pp_in_res, "capt_pp_in_res"); ia_css_debug_dump_resolution(&config->vf_pp_in_res, "vf_pp_in_res"); + ia_css_debug_dump_resolution(&config->output_system_in_res, + "output_system_in_res"); ia_css_debug_dump_resolution(&config->dvs_crop_out_res, "dvs_crop_out_res"); for (i = 0; i < IA_CSS_PIPE_MAX_OUTPUT_STAGE; i++) { @@ -3509,6 +3537,71 @@ void ia_css_debug_tagger_state(void) } #endif /* defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) */ +void ia_css_debug_pc_dump(sp_ID_t id, unsigned int num_of_dumps) +{ + unsigned int pc; + unsigned int i; + hrt_data sc = sp_ctrl_load(id, SP_SC_REG); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "SP%-1d Status reg: 0x%X\n", id, sc); + sc = sp_ctrl_load(id, SP_CTRL_SINK_REG); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "SP%-1d Stall reg: 0x%X\n", id, sc); + for (i = 0; i < num_of_dumps; i++) { + pc = sp_ctrl_load(id, SP_PC_REG); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "SP%-1d PC: 0x%X\n", id, pc); + } +} + +#if defined(IS_ISP_2500_SYSTEM) +void ia_css_debug_dump_hang_status( + struct ia_css_pipe *pipe) +{ + uint32_t reg; + struct ia_css_isp_config *p_isp_config; + + ia_css_debug_trace_level = IA_CSS_DEBUG_PARAM; + + if (pipe == NULL) { + ia_css_debug_dtrace(0, "ia_css_debug_dump_hang_status(): NULL pipe"); + } + + p_isp_config = sh_css_pipe_isp_config_get(pipe); + + ia_css_debug_dtrace(0, "=>=>=>=> Current configuration"); + if (p_isp_config != NULL) { + ia_css_acc_cluster_public_cfg_dump(p_isp_config); + } else { + ia_css_debug_dtrace(0, "=>=>=>=> PTR is NULL"); + } + + ia_css_debug_dtrace(0, "=>=>=>=> GACs status"); + ia_css_debug_dump_gac_state(); + + ia_css_debug_dump_gdc_v3_state(); + ia_css_debug_dump_osys_state(); + + ia_css_debug_dtrace(0, "=>=>=>=> SP status"); + ia_css_debug_pc_dump(SP0_ID, 20); + ia_css_debug_pc_dump(SP1_ID, 20); + + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + SP0_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> SP0 streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + SP1_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> SP1 streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + ISP_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> ISP streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + MODULE_ISP_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> Module ISP streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + ACC_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> ACC streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + ACC_SP0_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> ACC to SP0 streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + ACC_SP1_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> ACC to SP1 streaming monitor status: 0x%X", reg); + reg = ia_css_device_load_uint32(GP_REGS_BASE[0] + MODULE_STREAM_MON_STAT_OFFSET); + ia_css_debug_dtrace(0, "=>=>=>=> Module streaming monitor status: 0x%X", reg); +} +#endif + #if defined(HRT_SCHED) || defined(SH_CSS_DEBUG_SPMEM_DUMP_SUPPORT) #include "spmem_dump.c" #endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/interface/ia_css_event.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/interface/ia_css_event.h index be36b39..b6dabf3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/interface/ia_css_event.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/interface/ia_css_event.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_EVENT_H #define _IA_CSS_EVENT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/src/event.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/src/event.c index b467d4d..9381640 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/src/event.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/event/src/event.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "sh_css_sp.h" #include "dma.h" /* N_DMA_CHANNEL_ID */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/interface/ia_css_eventq.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/interface/ia_css_eventq.h index c68e429..57e5f08 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/interface/ia_css_eventq.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/interface/ia_css_eventq.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_EVENTQ_H #define _IA_CSS_EVENTQ_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/src/eventq.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/src/eventq.c index 00f2faa..6f3d1ad 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/src/eventq.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/eventq/src/eventq.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #include "assert_support.h" #include "ia_css_queue.h" /* sp2host_dequeue_irq_event() */ @@ -63,6 +64,10 @@ int ia_css_eventq_send( ia_css_event_encode(tmp, 4, &sw_event); /* queue the software event (busy-waiting) */ +#ifdef IS_ISP_2500_SYSTEM + /* due to the buffer handling in Skycam we should never reach a Full queue at this point */ + error = ia_css_queue_enqueue(eventq_handle, sw_event); +#else for ( ; ; ) { error = ia_css_queue_enqueue(eventq_handle, sw_event); if (ENOBUFS != error) { @@ -73,6 +78,7 @@ int ia_css_eventq_send( /* Wait for the queue to be not full and try again*/ hrt_sleep(); } +#endif return error; } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame.h index ee0b267..ac1ab54 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,9 +12,11 @@ * more details. */ + #ifndef __IA_CSS_FRAME_H__ #define __IA_CSS_FRAME_H__ +#include #include #include #include "dma.h" @@ -138,4 +140,22 @@ void ia_css_dma_configure_from_info( struct dma_port_config *config, const struct ia_css_frame_info *info); +/** @brief Finds the cropping resolution + * This function finds the maximum cropping resolution in an input image keeping + * the aspect ratio for the given output resolution.Calculates the coordinates + * for cropping from the center and returns the starting pixel location of the + * region in the input image. Also returns the dimension of the cropping + * resolution. + * + * @param + * @param[in] in_res Resolution of input image + * @param[in] out_res Resolution of output image + * @param[out] crop_res Crop resolution of input image + * @return Returns IA_CSS_SUCCESS or IA_CSS_ERR_INVALID_ARGUMENTS on error + */ +enum ia_css_err +ia_css_frame_find_crop_resolution(const struct ia_css_resolution *in_res, + const struct ia_css_resolution *out_res, + struct ia_css_resolution *crop_res); + #endif /* __IA_CSS_FRAME_H__ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame_comm.h index 83716d5..3619859 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/interface/ia_css_frame_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_FRAME_COMM_H__ #define __IA_CSS_FRAME_COMM_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/src/frame.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/src/frame.c index f42c2d2..6260ab0 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/src/frame.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/frame/src/frame.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_frame.h" #include #include "assert_support.h" @@ -130,15 +131,15 @@ enum ia_css_err ia_css_frame_allocate(struct ia_css_frame **frame, return IA_CSS_ERR_INVALID_ARGUMENTS; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_frame_allocate() enter: width=%d, height=%d, format=%d\n", - width, height, format); + "ia_css_frame_allocate() enter: width=%d, height=%d, format=%d, padded_width=%d, raw_bit_depth=%d\n", + width, height, format, padded_width, raw_bit_depth); err = frame_allocate_with_data(frame, width, height, format, padded_width, raw_bit_depth, false); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "ia_css_frame_allocate() leave: frame=%p\n", - frame ? *frame : (void *)-1); + "ia_css_frame_allocate() leave: frame=%p, data(DDR address)=0x%x\n", + frame ? *frame : (void *)-1, frame ? (*frame)->data : (unsigned int)-1); return err; } @@ -259,8 +260,8 @@ enum ia_css_err ia_css_frame_allocate_contiguous(struct ia_css_frame **frame, ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_frame_allocate_contiguous() " - "enter: width=%d, height=%d, format=%d\n", - width, height, format); + "enter: width=%d, height=%d, format=%d, padded_width=%d, raw_bit_depth=%d\n", + width, height, format, padded_width, raw_bit_depth); err = frame_allocate_with_data(frame, width, height, format, padded_width, raw_bit_depth, true); @@ -771,6 +772,7 @@ static void frame_init_qplane6_planes(struct ia_css_frame *frame) static enum ia_css_err frame_allocate_buffer_data(struct ia_css_frame *frame) { + IA_CSS_ENTER_LEAVE_PRIVATE("frame->data_bytes=%d\n", frame->data_bytes); frame->data = mmgr_alloc_attr(frame->data_bytes, frame->contiguous ? MMGR_ATTRIBUTE_CONTIGUOUS : @@ -897,3 +899,68 @@ void ia_css_resolution_to_sp_resolution( to->width = (uint16_t)from->width; to->height = (uint16_t)from->height; } + +enum ia_css_err +ia_css_frame_find_crop_resolution(const struct ia_css_resolution *in_res, + const struct ia_css_resolution *out_res, + struct ia_css_resolution *crop_res) +{ + uint32_t wd_even_ceil, ht_even_ceil; + uint32_t in_ratio, out_ratio; + + if ((in_res == NULL) || (out_res == NULL) || (crop_res == NULL)) + return IA_CSS_ERR_INVALID_ARGUMENTS; + + IA_CSS_ENTER_PRIVATE("in(%ux%u) -> out(%ux%u)", in_res->width, + in_res->height, out_res->width, out_res->height); + + if ((in_res->width == 0) + || (in_res->height == 0) + || (out_res->width == 0) + || (out_res->height == 0)) + return IA_CSS_ERR_INVALID_ARGUMENTS; + + if ((out_res->width > in_res->width) || + (out_res->height > in_res->height)) + return IA_CSS_ERR_INVALID_ARGUMENTS; + + /* If aspect ratio (width/height) of out_res is higher than the aspect + * ratio of the in_res, then we crop vertically, otherwise we crop + * horizontally. + */ + in_ratio = in_res->width * out_res->height; + out_ratio = out_res->width * in_res->height; + + if (in_ratio == out_ratio) { + crop_res->width = in_res->width; + crop_res->height = in_res->height; + } else if (out_ratio > in_ratio) { + crop_res->width = in_res->width; + crop_res->height = ROUND_DIV(out_res->height * crop_res->width, + out_res->width); + } else { + crop_res->height = in_res->height; + crop_res->width = ROUND_DIV(out_res->width * crop_res->height, + out_res->height); + } + + /* Round new (cropped) width and height to an even number. + * binarydesc_calculate_bds_factor is such that we should consider as + * much of the input as possible. This is different only when we end up + * with an odd number in the last step. So, we take the next even number + * if it falls within the input, otherwise take the previous even no. + */ + wd_even_ceil = EVEN_CEIL(crop_res->width); + ht_even_ceil = EVEN_CEIL(crop_res->height); + if ((wd_even_ceil > in_res->width) || (ht_even_ceil > in_res->height)) { + crop_res->width = EVEN_FLOOR(crop_res->width); + crop_res->height = EVEN_FLOOR(crop_res->height); + } else { + crop_res->width = wd_even_ceil; + crop_res->height = ht_even_ceil; + } + + IA_CSS_LEAVE_PRIVATE("in(%ux%u) -> out(%ux%u)", crop_res->width, + crop_res->height, out_res->width, out_res->height); + return IA_CSS_SUCCESS; +} diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/interface/ia_css_ifmtr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/interface/ia_css_ifmtr.h index 81da1b8..61c3f31 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/interface/ia_css_ifmtr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/interface/ia_css_ifmtr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_IFMTR_H__ #define __IA_CSS_IFMTR_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/src/ifmtr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/src/ifmtr.c index 40e8ea4..a24f535 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/src/ifmtr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/ifmtr/src/ifmtr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/interface/ia_css_inputfifo.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/interface/ia_css_inputfifo.h index e04a83e..6a8a15f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/interface/ia_css_inputfifo.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/interface/ia_css_inputfifo.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_INPUTFIFO_H #define _IA_CSS_INPUTFIFO_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/src/inputfifo.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/src/inputfifo.c index ce293f0..7952b02 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/src/inputfifo.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/inputfifo/src/inputfifo.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "platform_support.h" #include "ia_css_inputfifo.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param.h index 55441ea..f9c0e54 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_ISP_PARAM_H_ #define _IA_CSS_ISP_PARAM_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param_types.h index d0d0de7..a112a01 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param_types.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/interface/ia_css_isp_param_types.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_ISP_PARAM_TYPES_H_ #define _IA_CSS_ISP_PARAM_TYPES_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/src/isp_param.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/src/isp_param.c index 0f81997..452da07 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/src/isp_param.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isp_param/src/isp_param.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "memory_access.h" #include "ia_css_pipeline.h" #include "ia_css_isp_param.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys.h index 9aaa9e4..7959434 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ISYS_H__ #define __IA_CSS_ISYS_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys_comm.h index 8df81b4..e968ec5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/interface/ia_css_isys_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_ISYS_COMM_H #define __IA_CSS_ISYS_COMM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.c index 990a3e0..ffeede2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2401 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.h index 85e7ec6..7d9a704 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/csi_rx_rmgr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __CSI_RX_RMGR_H_INCLUDED__ #define __CSI_RX_RMGR_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.c index c275139..76705c2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2401 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.h index 953dc37..b974fc4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/ibuf_ctrl_rmgr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IBUF_CTRL_RMGR_H_INCLUDED__ #define __IBUF_CTRL_RMGR_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.c index 73b35c2..8cb3424 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2401 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.h index 42eb5ba..01df296 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_dma_rmgr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_DMA_RMGR_H_INCLUDED__ #define __ISYS_DMA_RMGR_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_init.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_init.c index 2f4092a..795a08d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_init.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_init.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "input_system.h" #ifdef HAS_INPUT_SYSTEM_VERSION_2 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.c index f0ad7d7..a577884 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2401 diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.h index 4a016b7..6013127 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/isys_stream2mmio_rmgr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __ISYS_STREAM2MMIO_RMGR_H_INCLUDED__ #define __ISYS_STREAM2MMIO_RMGR_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/rx.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/rx.c index 52112df..90bd697 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/rx.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/rx.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #define __INLINE_INPUT_SYSTEM__ #include "input_system.h" #include "assert_support.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.c index 02eca52..8a13984 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "system_global.h" #ifdef USE_INPUT_SYSTEM_VERSION_2401 @@ -29,7 +30,6 @@ * Forwarded Declaration * *************************************************/ - static bool create_input_system_channel( input_system_cfg_t *cfg, bool metadata, @@ -185,6 +185,15 @@ ia_css_isys_error_t ia_css_isys_stream_create( return false; } + /* + * Early polling is required for timestamp accuracy in certain cause. + * The ISYS HW polling is started on + * ia_css_isys_stream_capture_indication() instead of + * ia_css_pipeline_sp_wait_for_isys_stream_N() as isp processing of + * capture takes longer than getting an ISYS frame + */ + isys_stream->polling_mode = isys_stream_descr->polling_mode; + /* create metadata channel */ if (isys_stream_descr->metadata.enable) { rc = create_input_system_channel(isys_stream_descr, true, &isys_stream->md_channel); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.h index a857510..7a60deb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/isys/src/virtual_isys.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __VIRTUAL_ISYS_H_INCLUDED__ #define __VIRTUAL_ISYS_H_INCLUDED__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline.h index eaa0b60..745039e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPELINE_H__ #define __IA_CSS_PIPELINE_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline_common.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline_common.h index 7edcd99..37a79e1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline_common.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/interface/ia_css_pipeline_common.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_PIPELINE_COMMON_H__ #define __IA_CSS_PIPELINE_COMMON_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/src/pipeline.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/src/pipeline.c index a66a257..a5124d1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/src/pipeline.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/pipeline/src/pipeline.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_debug.h" #include "sw_event_global.h" /* encode_sw_event */ #include "sp.h" /* cnd_sp_irq_enable() */ @@ -138,11 +139,11 @@ void ia_css_pipeline_start(enum ia_css_pipe_id pipe_id, sh_css_sp_init_pipeline(pipeline, pipe_id, pipe_num, false, false, false, true, SH_CSS_BDS_FACTOR_1_00, SH_CSS_PIPE_CONFIG_OVRD_NO_OVRD, - IA_CSS_INPUT_MODE_MEMORY, NULL, NULL + IA_CSS_INPUT_MODE_MEMORY, NULL, NULL, #if !defined(HAS_NO_INPUT_SYSTEM) - , (mipi_port_ID_t) 0 + (mipi_port_ID_t) 0, #endif - ); + NULL, NULL); ia_css_pipeline_get_sp_thread_id(pipe_num, &thread_id); if (!sh_css_sp_is_running()) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue.h index 23a3b49..dcaf1cd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_QUEUE_H #define __IA_CSS_QUEUE_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue_comm.h index da3083a..ef22c1c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/interface/ia_css_queue_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_QUEUE_COMM_H #define __IA_CSS_QUEUE_COMM_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue.c index e6b8702..2e9217b 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_queue.h" #include #include @@ -372,11 +373,15 @@ int ia_css_queue_is_empty( /* b. Operate on the queue */ *is_empty = ia_css_circbuf_desc_is_empty(&cb_desc); +/*SP queues are all in LOCAL. Hence marking this block of code as text*/ +#if defined(__SP) +#pragma hivecc section = "text" +#endif return 0; } return EINVAL; -#if defined(IS_ISP_2500_SYSTEM) && defined(__SP) +#if defined(__SP) #pragma hivecc section = "critical" #endif } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.c index df7fe86..0b50bed 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "type_support.h" #include "queue_access.h" #include "ia_css_circbuf.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.h index c2281dd..725b7016 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/queue/src/queue_access.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __QUEUE_ACCESS_H #define __QUEUE_ACCESS_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr.h index 7a01096..5d0c4eb 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_RMGR_H #define _IA_CSS_RMGR_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr_vbuf.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr_vbuf.h index a8c3c68..500e7a4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr_vbuf.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/interface/ia_css_rmgr_vbuf.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _IA_CSS_RMGR_VBUF_H #define _IA_CSS_RMGR_VBUF_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr.c index d6d8ed7..dd52ca2 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_rmgr.h" enum ia_css_err ia_css_rmgr_init(void) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr_vbuf.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr_vbuf.c index 00179a0..9a1f3ac 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr_vbuf.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/rmgr/src/rmgr_vbuf.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_rmgr.h" #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl.h index 9feba44..71ee22f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SPCTRL_H__ #define __IA_CSS_SPCTRL_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl_comm.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl_comm.h index 9b6ce63..6eb02c7 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl_comm.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/interface/ia_css_spctrl_comm.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_SPCTRL_COMM_H__ #define __IA_CSS_SPCTRL_COMM_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/src/spctrl.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/src/spctrl.c index d4eec0b..9ffba92 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/src/spctrl.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/spctrl/src/spctrl.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_types.h" #define __INLINE_SP__ #include "sp.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/tagger/interface/ia_css_tagger_common.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/tagger/interface/ia_css_tagger_common.h index 4d3633c..0075f45 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/tagger/interface/ia_css_tagger_common.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/tagger/interface/ia_css_tagger_common.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __IA_CSS_TAGGER_COMMON_H__ #define __IA_CSS_TAGGER_COMMON_H__ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/timer/src/timer.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/timer/src/timer.c index 75215fd..993602c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/timer/src/timer.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/runtime/timer/src/timer.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include /* for uint32_t */ #include "ia_css_timer.h" /*struct ia_css_clock_tick */ #include "sh_css_legacy.h" /* IA_CSS_PIPE_ID_NUM*/ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css.c index ffcd1e8..d0c7878 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + /*! \file */ #include "ia_css.h" #include "sh_css_hrt.h" /* only for file 2 MIPI */ @@ -88,7 +89,7 @@ static int thread_alive; #endif /* WITH_PC_MONITORING */ -#include"ia_css_spctrl.h" +#include "ia_css_spctrl.h" #include "ia_css_version_data.h" #include "sh_css_struct.h" #include "ia_css_bufq.h" @@ -207,6 +208,40 @@ allocate_delay_frames(struct ia_css_pipe *pipe); static enum ia_css_err sh_css_pipe_start(struct ia_css_stream *stream); +/** + * @brief Stop all "ia_css_pipe" instances in the target + * "ia_css_stream" instance. + * + * @param[in] stream Point to the target "ia_css_stream" instance. + * + * @return + * - IA_CSS_SUCCESS, if the "stop" requests have been sucessfully sent out. + * - CSS error code, otherwise. + * + * + * NOTE + * This API sends the "stop" requests to the "ia_css_pipe" + * instances in the same "ia_css_stream" instance. It will + * return without waiting for all "ia_css_pipe" instatnces + * being stopped. + */ +static enum ia_css_err +sh_css_pipes_stop(struct ia_css_stream *stream); + +/** + * @brief Check if all "ia_css_pipe" instances in the target + * "ia_css_stream" instance have stopped. + * + * @param[in] stream Point to the target "ia_css_stream" instance. + * + * @return + * - true, if all "ia_css_pipe" instances in the target "ia_css_stream" + * instance have ben stopped. + * - false, otherwise. + */ +static bool +sh_css_pipes_have_stopped(struct ia_css_stream *stream); + static enum ia_css_err ia_css_pipe_load_extension(struct ia_css_pipe *pipe, struct ia_css_fw_info *firmware); @@ -245,6 +280,15 @@ need_downscaling(const struct ia_css_resolution in_res, static bool need_capt_ldc(const struct ia_css_pipe *pipe); +#ifdef IS_ISP_2500_SYSTEM +static enum ia_css_err +check_bds_res(const struct ia_css_resolution bds_res, + const struct ia_css_resolution effective_res); +#endif + +static enum ia_css_err +check_pipe_resolutions(const struct ia_css_pipe *pipe); + static enum ia_css_err sh_css_pipe_load_binaries(struct ia_css_pipe *pipe); @@ -351,8 +395,8 @@ sh_css_hmm_buffer_record_uninit(void); static void sh_css_hmm_buffer_record_reset(struct sh_css_hmm_buffer_record *buffer_record); -static bool -sh_css_hmm_buffer_record_acquire(struct ia_css_rmgr_vbuf_handle *h_vbuf, +static struct sh_css_hmm_buffer_record +*sh_css_hmm_buffer_record_acquire(struct ia_css_rmgr_vbuf_handle *h_vbuf, enum ia_css_buffer_type type, hrt_address kernel_ptr); @@ -385,6 +429,20 @@ static enum ia_css_err sh_css_stop_sp1(void); #endif +#ifdef USE_INPUT_SYSTEM_VERSION_2401 +static enum ia_css_err +aspect_ratio_crop_init(struct ia_css_stream *curr_stream, + struct ia_css_pipe *pipes[], + bool *do_crop_status); + +static bool +aspect_ratio_crop_check(bool enabled, struct ia_css_pipe *curr_pipe); + +static enum ia_css_err +aspect_ratio_crop(struct ia_css_pipe *curr_pipe, + struct ia_css_resolution *effective_res); +#endif + static void sh_css_pipe_free_shading_table(struct ia_css_pipe *pipe) { @@ -957,6 +1015,7 @@ static bool sh_css_translate_stream_cfg_to_input_system_input_port_resolution( static bool sh_css_translate_stream_cfg_to_isys_stream_descr( struct ia_css_stream_config *stream_cfg, + bool early_polling, ia_css_isys_descr_t *isys_stream_descr, int isys_stream_idx) { @@ -971,6 +1030,16 @@ static bool sh_css_translate_stream_cfg_to_isys_stream_descr( isys_stream_descr->raw_packed = stream_cfg->pack_raw_pixels; isys_stream_descr->linked_isys_stream_id = (int8_t) stream_cfg->isys_config[isys_stream_idx].linked_isys_stream_id; + /* + * Early polling is required for timestamp accuracy in certain case. + * The ISYS HW polling is started on + * ia_css_isys_stream_capture_indication() instead of + * ia_css_pipeline_sp_wait_for_isys_stream_N() as isp processing of + * capture takes longer than getting an ISYS frame + */ + isys_stream_descr->polling_mode + = early_polling ? INPUT_SYSTEM_POLL_ON_CAPTURE_REQUEST + : INPUT_SYSTEM_POLL_ON_WAIT_FOR_FRAME; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "sh_css_translate_stream_cfg_to_isys_stream_descr() leave:\n"); @@ -1002,6 +1071,7 @@ sh_css_config_input_network(struct ia_css_stream *stream) struct ia_css_binary *binary = NULL; int i; uint32_t isys_stream_id; + bool early_polling = false; assert(stream != NULL); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, @@ -1019,6 +1089,16 @@ sh_css_config_input_network(struct ia_css_stream *stream) } } else { pipe = stream->last_pipe; + if (stream->last_pipe->config.mode == IA_CSS_PIPE_MODE_CAPTURE) { + /* + * We need to poll the ISYS HW in capture_indication itself + * for "non-continous" capture usecase for getting accurate + * isys frame capture timestamps. + * This is because the capturepipe propcessing takes longer + * to execute than the input system frame capture. + */ + early_polling = true; + } } assert(pipe != NULL); @@ -1058,6 +1138,7 @@ sh_css_config_input_network(struct ia_css_stream *stream) /* translate the stream configuration to the Input System (2401) configuration */ rc = sh_css_translate_stream_cfg_to_isys_stream_descr( &(stream->config), + early_polling, &(isys_stream_descr), i); if (stream->config.online) { @@ -1367,7 +1448,7 @@ void sh_css_binary_args_reset(struct sh_css_binary_args *args) { unsigned int i; - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) + for (i = 0; i < NUM_TNR_FRAMES; i++) args->tnr_frames[i] = NULL; for (i = 0; i < MAX_NUM_VIDEO_DELAY_FRAMES; i++) args->delay_frames[i] = NULL; @@ -1405,13 +1486,14 @@ static void start_pipe( copy_ovrd, input_mode, &me->stream->config.metadata_config, - &me->stream->info.metadata_info + &me->stream->info.metadata_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , (input_mode==IA_CSS_INPUT_MODE_MEMORY)? + (input_mode == IA_CSS_INPUT_MODE_MEMORY) ? (mipi_port_ID_t)0 : - me->stream->config.source.port.port + me->stream->config.source.port.port, #endif - ); + &me->config.internal_frame_origin_bqs_on_sctbl, + me->stream->isp_params_configs); if (me->config.mode != IA_CSS_PIPE_MODE_COPY) { struct ia_css_pipeline_stage *stage; @@ -1821,7 +1903,15 @@ ia_css_init(const struct ia_css_env *env, #if defined(HAS_SEC_SP) err = ia_css_blctrl_add_target_fw_info(&sh_css_sp1_fw, IA_CSS_SP1, get_sp_code_addr(SP1_ID)); + + if (err != IA_CSS_SUCCESS) { + IA_CSS_LEAVE_ERR(err); + return err; + } #endif + err = ia_css_blctrl_add_target_fw_info(&sh_css_sp_fw, IA_CSS_SP0, + get_sp_code_addr(SP0_ID)); + if (err != IA_CSS_SUCCESS) { IA_CSS_LEAVE_ERR(err); return err; @@ -2189,9 +2279,16 @@ create_host_pipeline(struct ia_css_stream *stream) /* No continuous frame allocation for capture pipe. It uses the * "main" pipe's frames. */ - if((pipe_id == IA_CSS_PIPE_ID_PREVIEW) || + if ((pipe_id == IA_CSS_PIPE_ID_PREVIEW) || (pipe_id == IA_CSS_PIPE_ID_VIDEO)) { - if(stream->config.continuous || pipe_id == IA_CSS_PIPE_ID_PREVIEW) { + /* About pipe_id == IA_CSS_PIPE_ID_PREVIEW && stream->config.mode != IA_CSS_INPUT_MODE_MEMORY: + * The original condition pipe_id == IA_CSS_PIPE_ID_PREVIEW is too strong. E.g. in SkyCam (with memory + * based input frames) there is no continuous mode and thus no need for allocated continuous frames + * This is not only for SkyCam but for all preview cases that use DDR based input frames. For this + * reason the stream->config.mode != IA_CSS_INPUT_MODE_MEMORY has beed added. + */ + if (stream->config.continuous || + (pipe_id == IA_CSS_PIPE_ID_PREVIEW && stream->config.mode != IA_CSS_INPUT_MODE_MEMORY)) { err = alloc_continuous_frames(main_pipe, true); if (err != IA_CSS_SUCCESS) goto ERR; @@ -2543,7 +2640,7 @@ ia_css_pipe_destroy(struct ia_css_pipe *pipe) "destroyed internal copy pipe err=%d\n", err); } } - ia_css_frame_free_multiple(NUM_VIDEO_TNR_FRAMES, pipe->pipe_settings.video.tnr_frames); + ia_css_frame_free_multiple(NUM_TNR_FRAMES, pipe->pipe_settings.video.tnr_frames); ia_css_frame_free_multiple(MAX_NUM_VIDEO_DELAY_FRAMES, pipe->pipe_settings.video.delay_frames); break; case IA_CSS_PIPE_MODE_CAPTURE: @@ -2563,10 +2660,10 @@ ia_css_pipe_destroy(struct ia_css_pipe *pipe) break; } - if (pipe->scaler_pp_lut != mmgr_NULL) { - mmgr_free(pipe->scaler_pp_lut); - pipe->scaler_pp_lut = mmgr_NULL; - } +#if !defined(IS_ISP_2500_SYSTEM) + sh_css_params_free_gdc_lut(pipe->scaler_pp_lut); + pipe->scaler_pp_lut = mmgr_NULL; +#endif my_css.active_pipes[ia_css_pipe_get_pipe_num(pipe)] = NULL; sh_css_pipe_free_shading_table(pipe); @@ -2965,6 +3062,8 @@ load_preview_binaries(struct ia_css_pipe *pipe) #endif /* preview only have 1 output pin now */ struct ia_css_frame_info *pipe_out_info = &pipe->output_info[0]; + struct ia_css_preview_settings *mycs = &pipe->pipe_settings.preview; + IA_CSS_ENTER_PRIVATE(""); assert(pipe != NULL); @@ -2977,7 +3076,7 @@ load_preview_binaries(struct ia_css_pipe *pipe) sensor = pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR; #endif - if (pipe->pipe_settings.preview.preview_binary.info) + if (mycs->preview_binary.info) return IA_CSS_SUCCESS; err = ia_css_util_check_input(&pipe->stream->config, false, false); @@ -3012,6 +3111,7 @@ load_preview_binaries(struct ia_css_pipe *pipe) prev_vf_info = pipe->vf_yuv_ds_input_info; else prev_vf_info = *pipe_out_info; + /* If vf_pp is needed, then preview must output yuv_line. * The exception is when vf_pp is manually disabled, that is only * used in combination with a pipeline extension that requires @@ -3031,20 +3131,29 @@ load_preview_binaries(struct ia_css_pipe *pipe) if (err != IA_CSS_SUCCESS) return err; err = ia_css_binary_find(&preview_descr, - &pipe->pipe_settings.preview.preview_binary); + &mycs->preview_binary); if (err != IA_CSS_SUCCESS) return err; + /* The delay latency determines the number of invalid frames after + * a stream is started. */ + pipe->num_invalid_frames = pipe->dvs_frame_delay; + pipe->info.num_invalid_frames = pipe->num_invalid_frames; + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "load_preview_binaries() num_invalid_frames=%d dvs_frame_delay=%d\n", + pipe->num_invalid_frames, pipe->dvs_frame_delay); + /* The vf_pp binary is needed when (further) YUV downscaling is required */ - need_vf_pp |= pipe->pipe_settings.preview.preview_binary.out_frame_info[0].res.width != pipe_out_info->res.width; - need_vf_pp |= pipe->pipe_settings.preview.preview_binary.out_frame_info[0].res.height != pipe_out_info->res.height; + need_vf_pp |= mycs->preview_binary.out_frame_info[0].res.width != pipe_out_info->res.width; + need_vf_pp |= mycs->preview_binary.out_frame_info[0].res.height != pipe_out_info->res.height; /* When vf_pp is needed, then the output format of the selected * preview binary must be yuv_line. If this is not the case, * then the preview binary selection is done again. */ if (need_vf_pp && - (pipe->pipe_settings.preview.preview_binary.out_frame_info[0].format != IA_CSS_FRAME_FORMAT_YUV_LINE)) { + (mycs->preview_binary.out_frame_info[0].format != IA_CSS_FRAME_FORMAT_YUV_LINE)) { /* Preview step 2 */ if (pipe->vf_yuv_ds_input_info.res.width) @@ -3065,7 +3174,7 @@ load_preview_binaries(struct ia_css_pipe *pipe) if (err != IA_CSS_SUCCESS) return err; err = ia_css_binary_find(&preview_descr, - &pipe->pipe_settings.preview.preview_binary); + &mycs->preview_binary); if (err != IA_CSS_SUCCESS) return err; } @@ -3075,10 +3184,10 @@ load_preview_binaries(struct ia_css_pipe *pipe) /* Viewfinder post-processing */ ia_css_pipe_get_vfpp_binarydesc(pipe, &vf_pp_descr, - &pipe->pipe_settings.preview.preview_binary.out_frame_info[0], + &mycs->preview_binary.out_frame_info[0], pipe_out_info); err = ia_css_binary_find(&vf_pp_descr, - &pipe->pipe_settings.preview.vf_pp_binary); + &mycs->vf_pp_binary); if (err != IA_CSS_SUCCESS) return err; } @@ -3089,14 +3198,19 @@ load_preview_binaries(struct ia_css_pipe *pipe) */ need_isp_copy_binary = !online && sensor; #else - need_isp_copy_binary = !online && !continuous; + /* About pipe->stream->config.mode == IA_CSS_INPUT_MODE_MEMORY: + * This is typical the case with SkyCam (which has no input system) but it also applies to all cases + * where the driver chooses for memory based input frames. In these cases, a copy binary (which typical + * copies sensor data to DDR) does not have much use. + */ + need_isp_copy_binary = !online && !continuous && !(pipe->stream->config.mode == IA_CSS_INPUT_MODE_MEMORY); #endif /* Copy */ if (need_isp_copy_binary) { err = load_copy_binary(pipe, - &pipe->pipe_settings.preview.copy_binary, - &pipe->pipe_settings.preview.preview_binary); + &mycs->copy_binary, + &mycs->preview_binary); if (err != IA_CSS_SUCCESS) return err; } @@ -3106,6 +3220,49 @@ load_preview_binaries(struct ia_css_pipe *pipe) pipe->shading_table = NULL; } +#if defined(IS_ISP_2500_SYSTEM) + /* SkyCam is the first and only system (at this moment) that uses TNR & DVS in preview. + * For the longer term, a (run-time) condition should be figured out that will do the job for all systems + * A possible suggestion was to look at the properties of the selected binary (i.e. does it support TNR or DVS) + */ + { + struct ia_css_frame_info tnr_info; + unsigned int i; + + err = allocate_delay_frames(pipe); + if (err != IA_CSS_SUCCESS) + return err; + + if (mycs->preview_binary.info->sp.enable.block_output) { + tnr_info = mycs->preview_binary.out_frame_info[0]; + /* Make tnr reference buffers output block height align */ + tnr_info.res.height = + CEIL_MUL(tnr_info.res.height, + mycs->preview_binary.info->sp.block.output_block_height); + } else { + tnr_info = mycs->preview_binary.internal_frame_info; + } + tnr_info.format = IA_CSS_FRAME_FORMAT_YUV_LINE; + tnr_info.raw_bit_depth = SH_CSS_TNR_BIT_DEPTH; + + for (i = 0; i < NUM_TNR_FRAMES; i++) { + if (mycs->tnr_frames[i]) { + ia_css_frame_free(mycs->tnr_frames[i]); + mycs->tnr_frames[i] = NULL; + } + err = ia_css_frame_allocate_from_info( + &mycs->tnr_frames[i], + &tnr_info); +#ifdef HRT_CSIM + ia_css_frame_zero(mycs->tnr_frames[i]); +#endif + if (err != IA_CSS_SUCCESS) + return err; + } + } +#endif /* #if defined(IS_ISP_2500_SYSTEM) */ + + return IA_CSS_SUCCESS; } @@ -3501,8 +3658,12 @@ ia_css_get_crop_offsets ( assert(pipe->stream != NULL); assert(in_frame != NULL); + IA_CSS_ENTER_PRIVATE("pipe = %p effective_wd = %u effective_ht = %u", + pipe, pipe->config.input_effective_res.width, + pipe->config.input_effective_res.height); + input_res = &pipe->stream->config.input_config.input_res; - effective_res = &pipe->stream->config.input_config.effective_res; + effective_res = &pipe->config.input_effective_res; get_pipe_extra_pixel(pipe, &extra_row, &extra_col); @@ -3535,6 +3696,8 @@ ia_css_get_crop_offsets ( in_frame->crop_info.start_column = column; in_frame->crop_info.start_line = row; + IA_CSS_LEAVE_PRIVATE("void start_col: %u start_row: %u", column, row); + return; } #endif @@ -3770,7 +3933,7 @@ static enum ia_css_err create_host_video_pipeline(struct ia_css_pipe *pipe) } if (video_stage) { int frm; - for (frm = 0; frm < NUM_VIDEO_TNR_FRAMES; frm++) { + for (frm = 0; frm < NUM_TNR_FRAMES; frm++) { video_stage->args.tnr_frames[frm] = pipe->pipe_settings.video.tnr_frames[frm]; } @@ -3962,7 +4125,7 @@ create_host_preview_pipeline(struct ia_css_pipe *pipe) if (err != IA_CSS_SUCCESS) goto ERR; in_frame = me->stages->args.out_frame[0]; - } else { + } else if (pipe->stream->config.continuous) { #ifdef USE_INPUT_SYSTEM_VERSION_2401 /* When continuous is enabled, configure in_frame with the * last pipe, which is the copy pipe. @@ -3998,6 +4161,25 @@ create_host_preview_pipeline(struct ia_css_pipe *pipe) preview_stage->args.out_vf_frame = preview_stage->args.out_frame[0]; } +#if defined(IS_ISP_2500_SYSTEM) + /* SkyCam is the first and only system (at this moment) that uses TNR & DVS in preview. + * For the longer term, a (run-time) condition should be figured out that will do the job for all systems + * A possible suggestion was to look at the properties of the selected binary (i.e. does it support TNR or DVS) + * + * Note that this code is copied (and renamed) from the create_host_video_pipeline() function + */ + { + int frm; + for (frm = 0; frm < NUM_TNR_FRAMES; frm++) { + preview_stage->args.tnr_frames[frm] = + pipe->pipe_settings.preview.tnr_frames[frm]; + } + for (frm = 0; frm < MAX_NUM_DELAY_FRAMES; frm++) { + preview_stage->args.delay_frames[frm] = + pipe->pipe_settings.preview.delay_frames[frm]; + } + } +#endif /* #if defined(IS_ISP_2500_SYSTEM) */ if (vf_pp_binary) { if (preview_binary->info->sp.pipeline.mode == IA_CSS_BINARY_MODE_COPY) in_frame = preview_stage->args.out_vf_frame; @@ -4100,11 +4282,12 @@ preview_start(struct ia_css_pipe *pipe) copy_ovrd, pipe->stream->config.mode, &pipe->stream->config.metadata_config, - &pipe->stream->info.metadata_info + &pipe->stream->info.metadata_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , pipe->stream->config.source.port.port + pipe->stream->config.source.port.port, #endif - ); + &pipe->config.internal_frame_origin_bqs_on_sctbl, + pipe->stream->isp_params_configs); /* make the preview pipe start with mem mode input, copy handles the actual mode */ @@ -4124,11 +4307,12 @@ preview_start(struct ia_css_pipe *pipe) 0, IA_CSS_INPUT_MODE_MEMORY, &pipe->stream->config.metadata_config, - &pipe->stream->info.metadata_info + &pipe->stream->info.metadata_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , (mipi_port_ID_t)0 + (mipi_port_ID_t)0, #endif - ); + &capture_pipe->config.internal_frame_origin_bqs_on_sctbl, + capture_pipe->stream->isp_params_configs); } if (acc_pipe) { @@ -4143,11 +4327,12 @@ preview_start(struct ia_css_pipe *pipe) 0, IA_CSS_INPUT_MODE_MEMORY, NULL, - NULL + NULL, #if !defined(HAS_NO_INPUT_SYSTEM) - , (mipi_port_ID_t) 0 + (mipi_port_ID_t) 0, #endif - ); + &pipe->config.internal_frame_origin_bqs_on_sctbl, + pipe->stream->isp_params_configs); } start_pipe(pipe, copy_ovrd, preview_pipe_input_mode); @@ -4314,6 +4499,12 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, ddr_buffer.kernel_ptr = HOST_ADDRESS(buffer->data.frame); ddr_buffer.payload.frame.frame_data = buffer->data.frame->data; ddr_buffer.payload.frame.flashed = 0; + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "ia_css_pipe_enqueue_buffer() buf_type=%d, data(DDR address)=0x%x\n", + buf_type, buffer->data.frame->data); + + #if CONFIG_ON_FRAME_ENQUEUE() return_err = set_config_on_frame_enqueue( &buffer->data.frame->info, @@ -4384,11 +4575,12 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, } if (return_err == IA_CSS_SUCCESS) { - bool found_record = false; - found_record = sh_css_hmm_buffer_record_acquire( + struct sh_css_hmm_buffer_record *hmm_buffer_record = NULL; + + hmm_buffer_record = sh_css_hmm_buffer_record_acquire( h_vbuf, buf_type, HOST_ADDRESS(ddr_buffer.kernel_ptr)); - if (found_record == true) { + if (hmm_buffer_record) { IA_CSS_LOG("send vbuf=0x%x", h_vbuf); } else { return_err = IA_CSS_ERR_INTERNAL_ERROR; @@ -4585,6 +4777,11 @@ ia_css_pipe_dequeue_buffer(struct ia_css_pipe *pipe, frame->data, frame->isp_config_id, thread_id); } #endif + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + "ia_css_pipe_dequeue_buffer() buf_type=%d, data(DDR address)=0x%x\n", + buf_type, buffer->data.frame->data); + break; case IA_CSS_BUFFER_TYPE_3A_STATISTICS: buffer->data.stats_3a = @@ -5057,13 +5254,188 @@ sh_css_pipe_start(struct ia_css_stream *stream) return err; } -void -sh_css_enable_cont_capt(bool enable, bool stop_copy_preview) +/** + * @brief Stop all "ia_css_pipe" instances in the target + * "ia_css_stream" instance. + * + * Refer to "Local prototypes" for more info. + */ +static enum ia_css_err +sh_css_pipes_stop(struct ia_css_stream *stream) { - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, - "sh_css_enable_cont_capt() enter: enable=%d\n", enable); -//my_css.cont_capt = enable; - my_css.stop_copy_preview = stop_copy_preview; + enum ia_css_err err = IA_CSS_SUCCESS; + struct ia_css_pipe *main_pipe; + enum ia_css_pipe_id main_pipe_id; + int i; + + assert(stream != NULL); + if (stream == NULL) { + IA_CSS_LOG("stream does NOT exist!"); + err = IA_CSS_ERR_INTERNAL_ERROR; + goto ERR; + } + + main_pipe = stream->last_pipe; + assert(main_pipe != NULL); + if (main_pipe == NULL) { + IA_CSS_LOG("main_pipe does NOT exist!"); + err = IA_CSS_ERR_INTERNAL_ERROR; + goto ERR; + } + + main_pipe_id = main_pipe->mode; + IA_CSS_ENTER_PRIVATE("main_pipe_id=%d", main_pipe_id); + + /** + * Stop all "ia_css_pipe" instances in this target + * "ia_css_stream" instance. + */ + for (i = 0; i < stream->num_pipes; i++) { + /* send the "stop" request to the "ia_css_pipe" instance */ + IA_CSS_LOG("Send the stop-request to the pipe: pipe_id=%d", + stream->pipes[i]->pipeline.pipe_id); + err = ia_css_pipeline_request_stop(&stream->pipes[i]->pipeline); + + /* + * Exit this loop if "ia_css_pipeline_request_stop()" + * returns the error code. + * + * The error code would be generated in the following + * two cases: + * (1) The Scalar Processor has already been stopped. + * (2) The "Host->SP" event queue is full. + * + * As the convention of using CSS API 2.0/2.1, such CSS + * error code would be propogated from the CSS-internal + * API returned value to the CSS API returned value. Then + * the CSS driver should capture these error code and + * handle it in the driver exception handling mechanism. + */ + if (err != IA_CSS_SUCCESS) { + goto ERR; + } + } + + /** + * In the CSS firmware use scenario "Continuous Preview" + * as well as "Continuous Video", the "ia_css_pipe" instance + * "Copy Pipe" is activated. This "Copy Pipe" is private to + * the CSS firmware so that it is not listed in the target + * "ia_css_stream" instance. + * + * We need to stop this "Copy Pipe", as well. + */ + if (main_pipe->stream->config.continuous) { + struct ia_css_pipe *copy_pipe = NULL; + + /* get the reference to "Copy Pipe" */ + if (main_pipe_id == IA_CSS_PIPE_ID_PREVIEW) + copy_pipe = main_pipe->pipe_settings.preview.copy_pipe; + else if (main_pipe_id == IA_CSS_PIPE_ID_VIDEO) + copy_pipe = main_pipe->pipe_settings.video.copy_pipe; + + /* return the error code if "Copy Pipe" does NOT exist */ + assert(copy_pipe != NULL); + if (copy_pipe == NULL) { + IA_CSS_LOG("Copy Pipe does NOT exist!"); + err = IA_CSS_ERR_INTERNAL_ERROR; + goto ERR; + } + + /* send the "stop" request to "Copy Pipe" */ + IA_CSS_LOG("Send the stop-request to the pipe: pipe_id=%d", + copy_pipe->pipeline.pipe_id); + err = ia_css_pipeline_request_stop(©_pipe->pipeline); + } + +ERR: + IA_CSS_LEAVE_ERR_PRIVATE(err); + return err; +} + +/** + * @brief Check if all "ia_css_pipe" instances in the target + * "ia_css_stream" instance have stopped. + * + * Refer to "Local prototypes" for more info. + */ +static bool +sh_css_pipes_have_stopped(struct ia_css_stream *stream) +{ + bool rval = true; + + struct ia_css_pipe *main_pipe; + enum ia_css_pipe_id main_pipe_id; + + int i; + + assert(stream != NULL); + if (stream == NULL) { + IA_CSS_LOG("stream does NOT exist!"); + rval = false; + goto RET; + } + + main_pipe = stream->last_pipe; + assert(main_pipe != NULL); + + if (main_pipe == NULL) { + IA_CSS_LOG("main_pipe does NOT exist!"); + rval = false; + goto RET; + } + + main_pipe_id = main_pipe->mode; + IA_CSS_ENTER_PRIVATE("main_pipe_id=%d", main_pipe_id); + + /** + * Check if every "ia_css_pipe" instance in this target + * "ia_css_stream" instance has stopped. + */ + for (i = 0; i < stream->num_pipes; i++) { + rval = rval && ia_css_pipeline_has_stopped(&stream->pipes[i]->pipeline); + IA_CSS_LOG("Pipe has stopped: pipe_id=%d, stopped=%d", + stream->pipes[i]->pipeline.pipe_id, + rval); + } + + /** + * In the CSS firmware use scenario "Continuous Preview" + * as well as "Continuous Video", the "ia_css_pipe" instance + * "Copy Pipe" is activated. This "Copy Pipe" is private to + * the CSS firmware so that it is not listed in the target + * "ia_css_stream" instance. + * + * We need to check if this "Copy Pipe" has stopped, as well. + */ + if (main_pipe->stream->config.continuous) { + struct ia_css_pipe *copy_pipe = NULL; + + /* get the reference to "Copy Pipe" */ + if (main_pipe_id == IA_CSS_PIPE_ID_PREVIEW) + copy_pipe = main_pipe->pipe_settings.preview.copy_pipe; + else if (main_pipe_id == IA_CSS_PIPE_ID_VIDEO) + copy_pipe = main_pipe->pipe_settings.video.copy_pipe; + + /* return if "Copy Pipe" does NOT exist */ + assert(copy_pipe != NULL); + if (copy_pipe == NULL) { + IA_CSS_LOG("Copy Pipe does NOT exist!"); + + rval = false; + goto RET; + } + + /* check if "Copy Pipe" has stopped or not */ + rval = rval && ia_css_pipeline_has_stopped(©_pipe->pipeline); + IA_CSS_LOG("Pipe has stopped: pipe_id=%d, stopped=%d", + copy_pipe->pipeline.pipe_id, + rval); + } + +RET: + IA_CSS_LEAVE_PRIVATE("rval=%d", rval); + return rval; } bool @@ -5168,13 +5540,15 @@ static enum ia_css_err sh_css_pipe_configure_output( static enum ia_css_err sh_css_pipe_get_shading_info(struct ia_css_pipe *pipe, - struct ia_css_shading_info *info) + struct ia_css_shading_info *shading_info, + struct ia_css_pipe_config *pipe_config) { enum ia_css_err err = IA_CSS_SUCCESS; struct ia_css_binary *binary = NULL; assert(pipe != NULL); - assert(info != NULL); + assert(shading_info != NULL); + assert(pipe_config != NULL); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "sh_css_pipe_get_shading_info() enter:\n"); @@ -5185,7 +5559,7 @@ sh_css_pipe_get_shading_info(struct ia_css_pipe *pipe, IA_CSS_SHADING_CORRECTION_TYPE_1, pipe->required_bds_factor, (const struct ia_css_stream_config *)&pipe->stream->config, - info); + shading_info, pipe_config); /* Other function calls can be added here when other shading correction types will be added * in the future. */ @@ -5195,7 +5569,7 @@ sh_css_pipe_get_shading_info(struct ia_css_pipe *pipe, * information. It is not a error case, and then * this function should return IA_CSS_SUCCESS. */ - memset(info, 0, sizeof(*info)); + memset(shading_info, 0, sizeof(*shading_info)); } return err; } @@ -5517,18 +5891,40 @@ static enum ia_css_err load_video_binaries(struct ia_css_pipe *pipe) return err; if (mycs->video_binary.info->sp.enable.block_output) { + unsigned int tnr_width; + unsigned int tnr_height; tnr_info = mycs->video_binary.out_frame_info[0]; + + /* Select resolution for TNR. If + * output_system_in_resolution(GDC_out_resolution) is + * being used, then select that as it will also be in resolution for + * TNR. At present, it only make sense for Skycam */ + if (pipe->config.output_system_in_res.width && pipe->config.output_system_in_res.height) { + tnr_width = pipe->config.output_system_in_res.width; + tnr_height = pipe->config.output_system_in_res.height; + } else { + tnr_width = tnr_info.res.width; + tnr_height = tnr_info.res.height; + } + + /* Make tnr reference buffers output block width(in pix) align */ + tnr_info.res.width = + CEIL_MUL(tnr_width, + (mycs->video_binary.info->sp.block.block_width * ISP_NWAY)); + tnr_info.padded_width = tnr_info.res.width; + /* Make tnr reference buffers output block height align */ tnr_info.res.height = - CEIL_MUL(tnr_info.res.height, + CEIL_MUL(tnr_height, mycs->video_binary.info->sp.block.output_block_height); } else { tnr_info = mycs->video_binary.internal_frame_info; } + tnr_info.format = IA_CSS_FRAME_FORMAT_YUV_LINE; tnr_info.raw_bit_depth = SH_CSS_TNR_BIT_DEPTH; - for (i = 0; i < NUM_VIDEO_TNR_FRAMES; i++) { + for (i = 0; i < NUM_TNR_FRAMES; i++) { if (mycs->tnr_frames[i]) { ia_css_frame_free(mycs->tnr_frames[i]); mycs->tnr_frames[i] = NULL; @@ -5542,7 +5938,7 @@ static enum ia_css_err load_video_binaries(struct ia_css_pipe *pipe) if (err != IA_CSS_SUCCESS) return err; } - + IA_CSS_LEAVE_PRIVATE(""); return IA_CSS_SUCCESS; } @@ -5559,7 +5955,6 @@ unload_video_binaries(struct ia_css_pipe *pipe) ia_css_binary_unload(&pipe->pipe_settings.video.copy_binary); ia_css_binary_unload(&pipe->pipe_settings.video.video_binary); ia_css_binary_unload(&pipe->pipe_settings.video.vf_pp_binary); - ia_css_binary_unload(&pipe->pipe_settings.video.vf_pp_binary); for (i = 0; i < pipe->pipe_settings.video.num_yuv_scaler; i++) ia_css_binary_unload(&pipe->pipe_settings.video.yuv_scaler_binary[i]); @@ -5629,11 +6024,12 @@ static enum ia_css_err video_start(struct ia_css_pipe *pipe) copy_ovrd, pipe->stream->config.mode, &pipe->stream->config.metadata_config, - &pipe->stream->info.metadata_info + &pipe->stream->info.metadata_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , pipe->stream->config.source.port.port + pipe->stream->config.source.port.port, #endif - ); + ©_pipe->config.internal_frame_origin_bqs_on_sctbl, + copy_pipe->stream->isp_params_configs); /* make the video pipe start with mem mode input, copy handles the actual mode */ @@ -5653,11 +6049,12 @@ static enum ia_css_err video_start(struct ia_css_pipe *pipe) 0, IA_CSS_INPUT_MODE_MEMORY, &pipe->stream->config.metadata_config, - &pipe->stream->info.metadata_info + &pipe->stream->info.metadata_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , (mipi_port_ID_t)0 + (mipi_port_ID_t)0, #endif - ); + &capture_pipe->config.internal_frame_origin_bqs_on_sctbl, + capture_pipe->stream->isp_params_configs); } start_pipe(pipe, copy_ovrd, video_pipe_input_mode); @@ -5764,6 +6161,10 @@ static bool need_capture_pp( IA_CSS_ENTER_LEAVE_PRIVATE(""); assert(pipe != NULL); assert(pipe->mode == IA_CSS_PIPE_ID_CAPTURE); + + /* ldc and capture_pp are not supported in the same pipeline */ + if (need_capt_ldc(pipe) == true) + return false; /* determine whether we need to use the capture_pp binary. * This is needed for: * 1. XNR or @@ -5774,6 +6175,7 @@ static bool need_capture_pp( ((pipe->out_yuv_ds_input_info.res.width != out_info->res.width) || (pipe->out_yuv_ds_input_info.res.height != out_info->res.height))) return true; + if (pipe->config.default_capture_config.enable_xnr != 0) return true; @@ -5833,8 +6235,7 @@ static enum ia_css_err load_primary_binaries( prim_out_info, capt_pp_out_info, vf_info, *vf_pp_in_info, *pipe_out_info, - *pipe_vf_out_info, *capt_pp_in_info, - capt_ldc_out_info; + *pipe_vf_out_info; #if defined(HAS_RES_MGR) struct ia_css_frame_info bds_out_info; #endif @@ -5982,15 +6383,26 @@ static enum ia_css_err load_primary_binaries( /* TODO Do we disable ldc for skycam */ need_ldc = need_capt_ldc(pipe); - + /* ldc and capt_pp are not supported in the same pipeline */ + if (need_ldc) { + struct ia_css_binary_descr capt_ldc_descr; + ia_css_pipe_get_ldc_binarydesc(pipe, + &capt_ldc_descr, &prim_out_info, + &capt_pp_out_info); + + err = ia_css_binary_find(&capt_ldc_descr, + &mycs->capture_ldc_binary); + if (err != IA_CSS_SUCCESS) { + IA_CSS_LEAVE_ERR_PRIVATE(err); + return err; + } + } else if (need_pp) { /* we build up the pipeline starting at the end */ /* Capture post-processing */ - if (need_pp) { struct ia_css_binary_descr capture_pp_descr; - capt_pp_in_info = need_ldc ? &capt_ldc_out_info : &prim_out_info; ia_css_pipe_get_capturepp_binarydesc(pipe, - &capture_pp_descr, capt_pp_in_info, + &capture_pp_descr, &prim_out_info, &capt_pp_out_info, &vf_info); #if defined(HAS_RES_MGR) bds_out_info.res = pipe->config.bayer_ds_out_res; @@ -6002,20 +6414,6 @@ static enum ia_css_err load_primary_binaries( IA_CSS_LEAVE_ERR_PRIVATE(err); return err; } - - if(need_ldc) { - struct ia_css_binary_descr capt_ldc_descr; - ia_css_pipe_get_ldc_binarydesc(pipe, - &capt_ldc_descr, &prim_out_info, - &capt_ldc_out_info); - - err = ia_css_binary_find(&capt_ldc_descr, - &mycs->capture_ldc_binary); - if (err != IA_CSS_SUCCESS) { - IA_CSS_LEAVE_ERR_PRIVATE(err); - return err; - } - } } else { prim_out_info = *pipe_out_info; } @@ -6116,6 +6514,7 @@ allocate_delay_frames(struct ia_css_pipe *pipe) enum ia_css_pipe_id mode = IA_CSS_PIPE_ID_VIDEO; struct ia_css_frame **delay_frames = NULL; + IA_CSS_ENTER_PRIVATE(""); if (pipe == NULL) { IA_CSS_ERROR("Invalid args - pipe %x", pipe); return IA_CSS_ERR_INVALID_ARGUMENTS; @@ -6157,7 +6556,7 @@ allocate_delay_frames(struct ia_css_pipe *pipe) * UUUUUU(width/2 times) VVVVVVVV..(width/2 times) * * This format is not YUV420(which has Y, U and V planes). - * Its closer to NV12, except that the UV plane has UV + * Its closer to NV12, except that the UV plane has UV * interleaving, like UVUVUVUVUVUVUVUVU... * * TODO: make this ref_frame format as a separate frame format @@ -6167,6 +6566,29 @@ allocate_delay_frames(struct ia_css_pipe *pipe) delay_frames = mycs_video->delay_frames; } break; + case IA_CSS_PIPE_ID_PREVIEW: + { + struct ia_css_preview_settings *mycs_preview = &pipe->pipe_settings.preview; + ref_info = mycs_preview->preview_binary.internal_frame_info; +#ifdef IS_ISP_2500_SYSTEM + ref_info.format = IA_CSS_FRAME_FORMAT_YUV420_16; +#else + /*The ref frame expects + * 1. Y plane + * 2. UV plane with line interleaving, like below + * UUUUUU(width/2 times) VVVVVVVV..(width/2 times) + * + * This format is not YUV420(which has Y, U and V planes). + * Its closer to NV12, except that the UV plane has UV + * interleaving, like UVUVUVUVUVUVUVUVU... + * + * TODO: make this ref_frame format as a separate frame format + */ + ref_info.format = IA_CSS_FRAME_FORMAT_NV12; +#endif + delay_frames = mycs_preview->delay_frames; + } + break; default: return IA_CSS_ERR_INVALID_ARGUMENTS; @@ -6186,11 +6608,11 @@ allocate_delay_frames(struct ia_css_pipe *pipe) err = ia_css_frame_allocate_from_info(&delay_frames[i], &ref_info); if (err != IA_CSS_SUCCESS) return err; -#ifdef HRT_CSIM +#if defined(HRT_CSIM) || defined(__SVOS__) ia_css_frame_zero(delay_frames[i]); #endif } - + IA_CSS_LEAVE_PRIVATE(""); return IA_CSS_SUCCESS; } @@ -6581,7 +7003,6 @@ static bool need_downscaling(const struct ia_css_resolution in_res, const struct ia_css_resolution out_res) { - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "need_downscaling() enter:\n"); if (in_res.width > out_res.width || in_res.height > out_res.height) return true; @@ -7739,7 +8160,7 @@ create_host_regular_capture_pipeline(struct ia_css_pipe *pipe) local_in_frame = in_frame; else local_in_frame = NULL; - if (!need_pp && (i == num_primary_stage - 1)) + if (!need_pp && (i == num_primary_stage - 1) && !need_ldc) local_out_frame = out_frame; else local_out_frame = NULL; @@ -7840,20 +8261,18 @@ create_host_regular_capture_pipeline(struct ia_css_pipe *pipe) } } - if (need_pp && current_stage) { - struct ia_css_frame *local_in_frame = NULL; - local_in_frame = current_stage->args.out_frame[0]; - - if(need_ldc) { - ia_css_pipe_util_set_output_frames(out_frames, 0, NULL); - ia_css_pipe_get_generic_stage_desc(&stage_desc, capture_ldc_binary, - out_frames, local_in_frame, NULL); - err = ia_css_pipeline_create_and_add_stage(me, - &stage_desc, - ¤t_stage); - local_in_frame = current_stage->args.out_frame[0]; - } - err = add_capture_pp_stage(pipe, me, local_in_frame, need_yuv_pp ? NULL : out_frame, + /* ldc and capture_pp not supported in same pipeline */ + if (need_ldc && current_stage) { + in_frame = current_stage->args.out_frame[0]; + ia_css_pipe_util_set_output_frames(out_frames, 0, out_frame); + ia_css_pipe_get_generic_stage_desc(&stage_desc, capture_ldc_binary, + out_frames, in_frame, NULL); + err = ia_css_pipeline_create_and_add_stage(me, + &stage_desc, + NULL); + } else if (need_pp && current_stage) { + in_frame = current_stage->args.out_frame[0]; + err = add_capture_pp_stage(pipe, me, in_frame, need_yuv_pp ? NULL : out_frame, capture_pp_binary, ¤t_stage); if (err != IA_CSS_SUCCESS) { @@ -8421,7 +8840,15 @@ void ia_css_stream_request_flash(struct ia_css_stream *stream) assert(stream != NULL); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_request_flash() enter: void\n"); - sh_css_write_host2sp_command(host2sp_cmd_start_flash); + if (sh_css_sp_is_running()) { + if (!sh_css_write_host2sp_command(host2sp_cmd_start_flash)) { + IA_CSS_ERROR("Call to 'sh-css_write_host2sp_command()' failed"); + ia_css_debug_dump_sp_sw_debug_info(); + ia_css_debug_dump_debug_info(NULL); + } + } else + IA_CSS_LOG("SP is not running!"); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_request_flash() leave: return_void\n"); } @@ -8435,7 +8862,6 @@ sh_css_init_host_sp_control_vars(void) unsigned int HIVE_ADDR_host_sp_queues_initialized; unsigned int HIVE_ADDR_sp_sleep_mode; unsigned int HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb; - unsigned int HIVE_ADDR_sp_stop_copy_preview; unsigned int HIVE_ADDR_host_sp_com; unsigned int o = offsetof(struct host_sp_communication, host2sp_command) / sizeof(int); @@ -8454,14 +8880,12 @@ sh_css_init_host_sp_control_vars(void) fw->info.sp.host_sp_queues_initialized; HIVE_ADDR_sp_sleep_mode = fw->info.sp.sleep_mode; HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb = fw->info.sp.invalidate_tlb; - HIVE_ADDR_sp_stop_copy_preview = fw->info.sp.stop_copy_preview; HIVE_ADDR_host_sp_com = fw->info.sp.host_sp_com; (void)HIVE_ADDR_ia_css_ispctrl_sp_isp_started; /* Suppres warnings in CRUN */ (void)HIVE_ADDR_sp_sleep_mode; (void)HIVE_ADDR_ia_css_dmaproxy_sp_invalidate_tlb; - (void)HIVE_ADDR_sp_stop_copy_preview; (void)HIVE_ADDR_host_sp_com; sp_dmem_store_uint32(SP0_ID, @@ -8477,9 +8901,6 @@ sh_css_init_host_sp_control_vars(void) sp_dmem_store_uint32(SP0_ID, (unsigned int)sp_address_of(ia_css_dmaproxy_sp_invalidate_tlb), (uint32_t)(false)); - sp_dmem_store_uint32(SP0_ID, - (unsigned int)sp_address_of(sp_stop_copy_preview), - my_css.stop_copy_preview?(uint32_t)(1):(uint32_t)(0)); store_sp_array_uint(host_sp_com, o, host2sp_cmd_ready); #if !defined(HAS_NO_INPUT_SYSTEM) @@ -8560,11 +8981,27 @@ enum ia_css_err ia_css_pipe_create(const struct ia_css_pipe_config *config, struct ia_css_pipe **pipe) { - if (config == NULL) + enum ia_css_err err = IA_CSS_SUCCESS; + IA_CSS_ENTER_PRIVATE("config = %p, pipe = %p", config, pipe); + + if (config == NULL) { + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INVALID_ARGUMENTS); return IA_CSS_ERR_INVALID_ARGUMENTS; - if (pipe == NULL) + } + if (pipe == NULL) { + IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INVALID_ARGUMENTS); return IA_CSS_ERR_INVALID_ARGUMENTS; - return ia_css_pipe_create_extra(config, NULL, pipe); + } + + err = ia_css_pipe_create_extra(config, NULL, pipe); + + if(err == IA_CSS_SUCCESS) { + IA_CSS_LOG("pipe created successfuly = %p", *pipe); + } + + IA_CSS_LEAVE_ERR_PRIVATE(err); + + return err; } enum ia_css_err @@ -8625,9 +9062,11 @@ ia_css_pipe_create_extra(const struct ia_css_pipe_config *config, else internal_pipe->dvs_frame_delay = 1; - /* skycam has delayed frames in capture and video */ + /* skycam has delayed frames in capture, preview and video */ #if defined(IS_ISP_2500_SYSTEM) - if (internal_pipe->config.mode != IA_CSS_PIPE_MODE_CAPTURE && internal_pipe->config.mode != IA_CSS_PIPE_MODE_VIDEO) + if (internal_pipe->config.mode != IA_CSS_PIPE_MODE_CAPTURE && + internal_pipe->config.mode != IA_CSS_PIPE_MODE_PREVIEW && + internal_pipe->config.mode != IA_CSS_PIPE_MODE_VIDEO) internal_pipe->dvs_frame_delay = 0; #else if (internal_pipe->config.mode != IA_CSS_PIPE_MODE_VIDEO) @@ -8904,6 +9343,115 @@ metadata_info_init(const struct ia_css_metadata_config *mdc, return IA_CSS_SUCCESS; } +static enum ia_css_err check_pipe_resolutions(const struct ia_css_pipe *pipe) +{ + enum ia_css_err err = IA_CSS_SUCCESS; + + IA_CSS_ENTER_PRIVATE(""); + + if (!pipe || !pipe->stream) { + IA_CSS_ERROR("null arguments"); + err = IA_CSS_ERR_INTERNAL_ERROR; + goto EXIT; + } + + if (ia_css_util_check_res(pipe->config.input_effective_res.width, + pipe->config.input_effective_res.height) != IA_CSS_SUCCESS) { + IA_CSS_ERROR("effective resolution not supported"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_resolution_is_zero(pipe->stream->config.input_config.input_res)) { + if (!ia_css_util_res_leq(pipe->config.input_effective_res, + pipe->stream->config.input_config.input_res)) { + IA_CSS_ERROR("effective resolution is larger than input resolution"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + } + if (!ia_css_util_resolution_is_even(pipe->config.output_info[0].res)) { + IA_CSS_ERROR("output resolution must be even"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_resolution_is_even(pipe->config.vf_output_info[0].res)) { + IA_CSS_ERROR("VF resolution must be even"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } +#ifdef IS_ISP_2500_SYSTEM + /* 0x0 is a valid input resolution for 240x, not for 2500 */ + if (ia_css_util_resolution_is_zero(pipe->stream->config.input_config.input_res)) { + IA_CSS_ERROR("input resolution cannot be zero"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_resolution_is_even(pipe->stream->config.input_config.input_res)) { + IA_CSS_ERROR("input resolution cannot zero"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (check_bds_res(pipe->bds_output_info.res, pipe->config.input_effective_res) != IA_CSS_SUCCESS) { + IA_CSS_ERROR("BDS resolution not supported"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_resolution_is_even(pipe->config.output_system_in_res)) { + IA_CSS_ERROR("OSYS input resolution must be even"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_resolution_is_zero(pipe->config.output_system_in_res)) { + if (!ia_css_util_res_leq(pipe->config.output_info[0].res, + pipe->config.output_system_in_res)) { + IA_CSS_ERROR("output resolution is larger than OSYS input resolution"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + } +#endif +EXIT: + IA_CSS_LEAVE_ERR_PRIVATE(err); + return err; +} + +#ifdef IS_ISP_2500_SYSTEM +static enum ia_css_err check_bds_res(const struct ia_css_resolution bds_res, + const struct ia_css_resolution effective_res) +{ + enum ia_css_err err = IA_CSS_SUCCESS; + int ver_scale_factor = effective_res.height * BDS_SCALE_RATIO_GRANULARITY / bds_res.height; + + /* Scale factor is possible */ + if ((ver_scale_factor * bds_res.height) != (effective_res.height * BDS_SCALE_RATIO_GRANULARITY)) { + IA_CSS_ERROR("scale factor is not a multiple of 1 / BDS_SCALE_RATIO_GRANULARITY"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + /* Scale factor is in range*/ + if ((ver_scale_factor > BDS_MAX_SF) || (ver_scale_factor < BDS_MIN_SF)) { + IA_CSS_ERROR("scale factor outside of valid range"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + /* Size is valid */ + if (ia_css_util_check_res(bds_res.width, bds_res.height) != IA_CSS_SUCCESS) { + IA_CSS_ERROR("BDS resolution null or uneven"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + if (!ia_css_util_res_leq(bds_res, effective_res)) { + IA_CSS_ERROR("BDS resolution greater than effective resolution"); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + goto EXIT; + } + +EXIT: + IA_CSS_LEAVE_ERR_PRIVATE(err); + return err; +} +#endif + enum ia_css_err ia_css_stream_create(const struct ia_css_stream_config *stream_config, int num_pipes, @@ -8917,7 +9465,9 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, int i, j; enum ia_css_err err = IA_CSS_ERR_INTERNAL_ERROR; struct ia_css_metadata_info md_info; - struct ia_css_resolution effective_res; +#ifdef USE_INPUT_SYSTEM_VERSION_2401 + bool aspect_ratio_crop_enabled = false; +#endif IA_CSS_ENTER("num_pipes=%d", num_pipes); ia_css_debug_dump_stream_config(stream_config, num_pipes); @@ -9094,7 +9644,18 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, IA_CSS_LOG("mode sensor/default"); } +#ifdef USE_INPUT_SYSTEM_VERSION_2401 + err = aspect_ratio_crop_init(curr_stream, + pipes, + &aspect_ratio_crop_enabled); + if (err != IA_CSS_SUCCESS) { + IA_CSS_LEAVE_ERR(err); + return err; + } +#endif + for (i = 0; i < num_pipes; i++) { + struct ia_css_resolution effective_res; curr_pipe = pipes[i]; /* set current stream */ curr_pipe->stream = curr_stream; @@ -9103,6 +9664,24 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, effective_res = curr_pipe->config.input_effective_res; if (effective_res.height == 0 || effective_res.width == 0) { effective_res = curr_pipe->stream->config.input_config.effective_res; + +#if defined(USE_INPUT_SYSTEM_VERSION_2401) + /* The aspect ratio cropping is currently only + * supported on the new input system. */ + if (aspect_ratio_crop_check(aspect_ratio_crop_enabled, curr_pipe)) { + + struct ia_css_resolution crop_res; + + err = aspect_ratio_crop(curr_pipe, &crop_res); + if (err == IA_CSS_SUCCESS) { + effective_res = crop_res; + } else { + /* in case of error fallback to default + * effective resolution from driver. */ + IA_CSS_LOG("aspect_ratio_crop() failed with err(%d)", err); + } + } +#endif curr_pipe->config.input_effective_res = effective_res; } IA_CSS_LOG("effective_res=%dx%d", @@ -9110,6 +9689,16 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, effective_res.height); } + for (i = 0; i < num_pipes; i++) { + if (pipes[i]->config.mode != IA_CSS_PIPE_MODE_ACC && + pipes[i]->config.mode != IA_CSS_PIPE_MODE_COPY) { + err = check_pipe_resolutions(pipes[i]); + if (err != IA_CSS_SUCCESS) { + goto ERR; + } + } + } + err = ia_css_stream_isp_parameters_init(curr_stream); if (err != IA_CSS_SUCCESS) goto ERR; @@ -9146,7 +9735,6 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, if (num_pipes >= 2) { curr_stream->cont_capt = true; curr_stream->disable_cont_vf = curr_stream->config.disable_cont_viewfinder; - curr_stream->stop_copy_preview = my_css.stop_copy_preview; } /* Create copy pipe here, since it may not be exposed to the driver */ @@ -9202,15 +9790,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, curr_pipe = pipes[i]; /* set current stream */ curr_pipe->stream = curr_stream; - /* take over effective info */ - - effective_res = curr_pipe->config.input_effective_res; - err = ia_css_util_check_res( - effective_res.width, - effective_res.height); - if (err != IA_CSS_SUCCESS) - goto ERR; /* sensor binning per pipe */ if (sensor_binning_changed) sh_css_pipe_free_shading_table(curr_pipe); @@ -9242,7 +9822,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, } if (!spcopyonly){ err = sh_css_pipe_get_shading_info(curr_pipe, - &pipe_info->shading_info); + &pipe_info->shading_info, &curr_pipe->config); if (err != IA_CSS_SUCCESS) goto ERR; err = sh_css_pipe_get_grid_info(curr_pipe, @@ -9353,7 +9933,9 @@ ia_css_stream_destroy(struct ia_css_stream *stream) } } } - if (stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { + if (stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR || + stream->config.mode == IA_CSS_INPUT_MODE_TPG || + stream->config.mode == IA_CSS_INPUT_MODE_PRBS) { for (i = 0; i < stream->num_pipes; i++) { struct ia_css_pipe *entry = stream->pipes[i]; /* free any mipi frames that are remaining: @@ -9552,7 +10134,8 @@ ia_css_stream_stop(struct ia_css_stream *stream) } } #endif - err = ia_css_pipeline_request_stop(&stream->last_pipe->pipeline); + + err = sh_css_pipes_stop(stream); if (err != IA_CSS_SUCCESS) return err; @@ -9569,7 +10152,7 @@ ia_css_stream_has_stopped(struct ia_css_stream *stream) bool stopped; assert(stream != NULL); - stopped = ia_css_pipeline_has_stopped(&stream->last_pipe->pipeline); + stopped = sh_css_pipes_have_stopped(stream); return stopped; } @@ -10105,7 +10688,11 @@ ia_css_stop_sp(void) } /* For now, stop whole SP */ - sh_css_write_host2sp_command(host2sp_cmd_terminate); + if (!sh_css_write_host2sp_command(host2sp_cmd_terminate)) { + IA_CSS_ERROR("Call to 'sh-css_write_host2sp_command()' failed"); + ia_css_debug_dump_sp_sw_debug_info(); + ia_css_debug_dump_debug_info(NULL); + } sh_css_sp_set_sp_running(false); timeout = SP_SHUTDOWN_TIMEOUT_US; @@ -10438,6 +11025,214 @@ ia_css_pipe_get_qos_ext_state(struct ia_css_pipe *pipe, uint32_t fw_handle, bool return err; } +enum ia_css_err +ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe, uint32_t fw_handle, + struct ia_css_isp_param_css_segments *css_seg, struct ia_css_isp_param_isp_segments *isp_seg) +{ +#ifndef HRT_CSIM + unsigned int HIVE_ADDR_sp_group; + static struct sh_css_sp_group sp_group; +#endif + static struct sh_css_sp_stage sp_stage; + static struct sh_css_isp_stage isp_stage; + const struct ia_css_fw_info *fw; + unsigned int thread_id; + struct ia_css_pipeline_stage *stage; + enum ia_css_err err = IA_CSS_SUCCESS; + int stage_num = 0; + enum ia_css_isp_memories mem; + bool enabled; + + IA_CSS_ENTER(""); + + fw = &sh_css_sp_fw; + + /* Parameter Check */ + if (pipe == NULL || pipe->stream == NULL) { + IA_CSS_ERROR("Invalid Pipe."); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + } else if (!(pipe->config.acc_extension)) { + IA_CSS_ERROR("Invalid Pipe (No Extension Firmware)."); + err = IA_CSS_ERR_INVALID_ARGUMENTS; + } else if (!sh_css_sp_is_running()) { + IA_CSS_ERROR("Leaving: queue unavailable."); + err = IA_CSS_ERR_RESOURCE_NOT_AVAILABLE; + } else { + /* Query the thread_id and stage_num corresponding to the Extension firmware */ + ia_css_pipeline_get_sp_thread_id(ia_css_pipe_get_pipe_num(pipe), &thread_id); + err = ia_css_pipeline_get_stage_from_fw(&(pipe->pipeline), fw_handle, &stage); + if (err == IA_CSS_SUCCESS) { + /* Get the Extension State */ + enabled = (SH_CSS_QOS_STAGE_IS_ENABLED(&(sh_css_sp_group.pipe[thread_id]), stage->stage_num)) ? true : false; + /* Update mapped arg only when extension stage is not enabled */ + if (enabled) { + IA_CSS_ERROR("Leaving: cannot update when stage is enabled."); + err = IA_CSS_ERR_RESOURCE_NOT_AVAILABLE; + } else { + stage_num = stage->stage_num; + +#ifndef HRT_CSIM + HIVE_ADDR_sp_group = fw->info.sp.group; + sp_dmem_load(SP0_ID, + (unsigned int)sp_address_of(sp_group), + &sp_group, sizeof(struct sh_css_sp_group)); + mmgr_load(sp_group.pipe[thread_id].sp_stage_addr[stage_num], + &sp_stage, sizeof(struct sh_css_sp_stage)); +#else + mmgr_load(sh_css_sp_group.pipe[thread_id].sp_stage_addr[stage_num], + &sp_stage, sizeof(struct sh_css_sp_stage)); +#endif + + mmgr_load(sp_stage.isp_stage_addr, + &isp_stage, sizeof(struct sh_css_isp_stage)); + + for (mem = 0; mem < N_IA_CSS_ISP_MEMORIES; mem++) { + isp_stage.mem_initializers.params[IA_CSS_PARAM_CLASS_PARAM][mem].address = + css_seg->params[IA_CSS_PARAM_CLASS_PARAM][mem].address; + isp_stage.mem_initializers.params[IA_CSS_PARAM_CLASS_PARAM][mem].size = + css_seg->params[IA_CSS_PARAM_CLASS_PARAM][mem].size; + isp_stage.binary_info.mem_initializers.params[IA_CSS_PARAM_CLASS_PARAM][mem].address = + isp_seg->params[IA_CSS_PARAM_CLASS_PARAM][mem].address; + isp_stage.binary_info.mem_initializers.params[IA_CSS_PARAM_CLASS_PARAM][mem].size = + isp_seg->params[IA_CSS_PARAM_CLASS_PARAM][mem].size; + } + + mmgr_store(sp_stage.isp_stage_addr, + &isp_stage, sizeof(struct sh_css_isp_stage)); + } + } + } + IA_CSS_LEAVE("err:%d handle:%u", err, fw_handle); + return err; +} + +#ifdef USE_INPUT_SYSTEM_VERSION_2401 +static enum ia_css_err +aspect_ratio_crop_init(struct ia_css_stream *curr_stream, + struct ia_css_pipe *pipes[], + bool *do_crop_status) +{ + enum ia_css_err err = IA_CSS_SUCCESS; + int i; + struct ia_css_pipe *curr_pipe; + uint32_t pipe_mask = 0; + + if ((curr_stream == NULL) || + (curr_stream->num_pipes == 0) || + (pipes == NULL) || + (do_crop_status == NULL)) { + err = IA_CSS_ERR_INVALID_ARGUMENTS; + IA_CSS_LEAVE_ERR(err); + return err; + } + + for (i = 0; i < curr_stream->num_pipes; i++) { + curr_pipe = pipes[i]; + pipe_mask |= (1 << curr_pipe->config.mode); + } + + *do_crop_status = + (((pipe_mask & (1 << IA_CSS_PIPE_MODE_PREVIEW)) || + (pipe_mask & (1 << IA_CSS_PIPE_MODE_VIDEO))) && + (pipe_mask & (1 << IA_CSS_PIPE_MODE_CAPTURE)) && + curr_stream->config.continuous); + return IA_CSS_SUCCESS; +} + +static bool +aspect_ratio_crop_check(bool enabled, struct ia_css_pipe *curr_pipe) +{ + bool status = false; + + if ((curr_pipe != NULL) && enabled) { + if ((curr_pipe->config.mode == IA_CSS_PIPE_MODE_PREVIEW) || + (curr_pipe->config.mode == IA_CSS_PIPE_MODE_VIDEO) || + (curr_pipe->config.mode == IA_CSS_PIPE_MODE_CAPTURE)) + status = true; + } + + return status; +} + +static enum ia_css_err +aspect_ratio_crop(struct ia_css_pipe *curr_pipe, + struct ia_css_resolution *effective_res) +{ + enum ia_css_err err = IA_CSS_SUCCESS; + struct ia_css_resolution crop_res; + struct ia_css_resolution *in_res = NULL; + struct ia_css_resolution *out_res = NULL; + bool use_bds_output_info = false; + bool use_vf_pp_in_res = false; + bool use_capt_pp_in_res = false; + + if ((curr_pipe == NULL) || + (effective_res == NULL)) { + err = IA_CSS_ERR_INVALID_ARGUMENTS; + IA_CSS_LEAVE_ERR(err); + return err; + } + + if ((curr_pipe->config.mode != IA_CSS_PIPE_MODE_PREVIEW) && + (curr_pipe->config.mode != IA_CSS_PIPE_MODE_VIDEO) && + (curr_pipe->config.mode != IA_CSS_PIPE_MODE_CAPTURE)) { + err = IA_CSS_ERR_INVALID_ARGUMENTS; + IA_CSS_LEAVE_ERR(err); + return err; + } + + use_bds_output_info = + ((curr_pipe->bds_output_info.res.width != 0) && + (curr_pipe->bds_output_info.res.height != 0)); + + use_vf_pp_in_res = + ((curr_pipe->config.vf_pp_in_res.width != 0) && + (curr_pipe->config.vf_pp_in_res.height != 0)); + + use_capt_pp_in_res = + ((curr_pipe->config.capt_pp_in_res.width != 0) && + (curr_pipe->config.capt_pp_in_res.height != 0)); + + in_res = &curr_pipe->stream->config.input_config.effective_res; + out_res = &curr_pipe->output_info[0].res; + + switch (curr_pipe->config.mode) { + case IA_CSS_PIPE_MODE_PREVIEW: + if (use_bds_output_info) + out_res = &curr_pipe->bds_output_info.res; + else if (use_vf_pp_in_res) + out_res = &curr_pipe->config.vf_pp_in_res; + break; + case IA_CSS_PIPE_MODE_VIDEO: + if (use_bds_output_info) + out_res = &curr_pipe->bds_output_info.res; + break; + case IA_CSS_PIPE_MODE_CAPTURE: + if (use_capt_pp_in_res) + out_res = &curr_pipe->config.capt_pp_in_res; + break; + case IA_CSS_PIPE_MODE_ACC: + case IA_CSS_PIPE_MODE_COPY: + case IA_CSS_PIPE_MODE_YUVPP: + default: + IA_CSS_ERROR("aspect ratio cropping invalid args: mode[%d]\n", + curr_pipe->config.mode); + assert(0); + break; + } + + err = ia_css_frame_find_crop_resolution(in_res, out_res, &crop_res); + if (err == IA_CSS_SUCCESS) { + *effective_res = crop_res; + } else { + /* in case of error fallback to default + * effective resolution from driver. */ + IA_CSS_LOG("ia_css_frame_find_crop_resolution() failed with err(%d)", err); + } + return err; +} +#endif + static void sh_css_hmm_buffer_record_init(void) { @@ -10475,14 +11270,14 @@ sh_css_hmm_buffer_record_reset(struct sh_css_hmm_buffer_record *buffer_record) buffer_record->kernel_ptr = 0; } -static bool -sh_css_hmm_buffer_record_acquire(struct ia_css_rmgr_vbuf_handle *h_vbuf, +static struct sh_css_hmm_buffer_record +*sh_css_hmm_buffer_record_acquire(struct ia_css_rmgr_vbuf_handle *h_vbuf, enum ia_css_buffer_type type, hrt_address kernel_ptr) { int i; struct sh_css_hmm_buffer_record *buffer_record = NULL; - bool found_record = false; + struct sh_css_hmm_buffer_record *out_buffer_record = NULL; assert(h_vbuf != NULL); assert((type > IA_CSS_BUFFER_TYPE_INVALID) && (type < IA_CSS_NUM_DYNAMIC_BUFFER_TYPE)); @@ -10495,13 +11290,13 @@ sh_css_hmm_buffer_record_acquire(struct ia_css_rmgr_vbuf_handle *h_vbuf, buffer_record->type = type; buffer_record->h_vbuf = h_vbuf; buffer_record->kernel_ptr = kernel_ptr; - found_record = true; + out_buffer_record = buffer_record; break; } buffer_record++; } - return found_record; + return out_buffer_record; } static struct sh_css_hmm_buffer_record diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_control.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_control.c index ec81f80..e32aab1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_control.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_control.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_control.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_defs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_defs.h index 9548829..cd05a14 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_defs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_defs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_DEFS_H_ #define _SH_CSS_DEFS_H_ @@ -138,9 +139,13 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191] #define SH_CSS_MAX_BQ_GRID_WIDTH 80 #define SH_CSS_MAX_BQ_GRID_HEIGHT 60 -/* The minimum dvs envelope is 12x12 to make sure the invalid rows/columns - that result from filter initialization are skipped. */ +/* The minimum dvs envelope is 12x12(for IPU2) and 8x8(for IPU3) to make sure the + * invalid rows/columns that result from filter initialization are skipped. */ +#if defined(IS_ISP_2500_SYSTEM) +#define SH_CSS_MIN_DVS_ENVELOPE 8U +#else #define SH_CSS_MIN_DVS_ENVELOPE 12U +#endif /* The FPGA system (vec_nelems == 16) only supports upto 5MP */ #if ISP_VEC_NELEMS == 16 @@ -193,20 +198,53 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191] #define SH_CSS_MORPH_TABLE_ELEMS_PER_DDR_WORD \ (HIVE_ISP_DDR_WORD_BYTES/SH_CSS_MORPH_TABLE_ELEM_BYTES) -#define SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR (SH_CSS_MAX_BQ_GRID_WIDTH + 1) -#define SH_CSS_MAX_SCTBL_HEIGHT_PER_COLOR (SH_CSS_MAX_BQ_GRID_HEIGHT + 1) +/* TODO: I will move macros of "*_SCTBL_*" to SC kernel. + "+ 2" should be "+ SH_CSS_SCTBL_CENTERING_MARGIN + SH_CSS_SCTBL_LAST_GRID_COUNT". (michie, Sep/23/2014) */ +#define SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR (SH_CSS_MAX_BQ_GRID_WIDTH + 2) +#define SH_CSS_MAX_SCTBL_HEIGHT_PER_COLOR (SH_CSS_MAX_BQ_GRID_HEIGHT + 2) #define SH_CSS_MAX_SCTBL_ALIGNED_WIDTH_PER_COLOR \ CEIL_MUL(SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR, ISP_VEC_NELEMS) /* Each line of this table is aligned to the maximum line width. */ #define SH_CSS_MAX_S3ATBL_WIDTH SH_CSS_MAX_BQ_GRID_WIDTH -/* The video binary supports a delay of 1 or 2 */ -#define MAX_DVS_FRAME_DELAY 2 -/* We always need one additional frame because the video binary - * reads the previous and writes the current frame concurrently */ -#define MAX_NUM_VIDEO_DELAY_FRAMES (MAX_DVS_FRAME_DELAY + 1) -#define NUM_VIDEO_TNR_FRAMES 2 +/* Video mode specific DVS define */ +/* The video binary supports a delay of 1 or 2 frames */ +#define VIDEO_FRAME_DELAY 2 +/* +1 because DVS reads the previous and writes the current frame concurrently */ +#define MAX_NUM_VIDEO_DELAY_FRAMES (VIDEO_FRAME_DELAY + 1) + +/* Preview mode specific DVS define. */ +/* In preview we only need GDC functionality (and not the DVS functionality) */ +/* The minimum number of DVS frames you need is 2, one were GDC reads from and another where GDC writes into */ +#define NUM_PREVIEW_DVS_FRAMES (2) + +/* Note that this is the define used to configure all data structures common for all modes */ +/* It should be equal or bigger to the max number of DVS frames for all possible modes */ +#define MAX_NUM_DELAY_FRAMES MAX(MAX_NUM_VIDEO_DELAY_FRAMES, NUM_PREVIEW_DVS_FRAMES) + +/* TNR is no longer exclusive to video, SkyCam preview has TNR too (same kernel as video). + * All uses the generic define NUM_TNR_FRAMES. The define NUM_VIDEO_TNR_FRAMES has been deprecated. + * + * Notes + * 1) The value depends on the used TNR kernel and is not something that depends on the mode + * and it is not something you just could choice. + * 2) For the luma only pipeline a version that supports two different sets of TNR reference frames + * is being used. + *. + */ +#define NUM_VALID_TNR_REF_FRAMES (1) /* At least one valid TNR reference frame is required */ +#define NUM_TNR_FRAMES_PER_REF_BUF_SET (2) + +/* In luma-only mode alternate illuminated frames are supported, that requires two double buffers */ +#ifdef ENABLE_LUMA_ONLY +#define NUM_TNR_REF_BUF_SETS (2) +#else +#define NUM_TNR_REF_BUF_SETS (1) +#endif + +#define NUM_TNR_FRAMES (NUM_TNR_FRAMES_PER_REF_BUF_SET * NUM_TNR_REF_BUF_SETS) + /* Rules: these implement logic shared between the host code and ISP firmware. The ISP firmware needs these rules to be applied at pre-processor time, @@ -231,14 +269,6 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191] CEIL_MUL(_ISP_MORPH_TABLE_WIDTH(width), \ SH_CSS_MORPH_TABLE_ELEMS_PER_DDR_WORD) -#define _ISP_SCTBL_WIDTH_PER_COLOR(input_width, deci_factor_log2) \ - (ISP_BQ_GRID_WIDTH(input_width, deci_factor_log2) + 1) -#define _ISP_SCTBL_HEIGHT(input_height, deci_factor_log2) \ - (ISP_BQ_GRID_HEIGHT(input_height, deci_factor_log2) + 1) -#define _ISP_SCTBL_ALIGNED_WIDTH_PER_COLOR(input_width, deci_factor_log2) \ - CEIL_MUL(_ISP_SCTBL_WIDTH_PER_COLOR(input_width, deci_factor_log2), \ - ISP_VEC_NELEMS) - /* ***************************************************************** * Statistics for 3A (Auto Focus, Auto White Balance, Auto Exposure) * *****************************************************************/ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_dvs_info.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_dvs_info.h new file mode 100644 index 0000000..27f6ef0 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_dvs_info.h @@ -0,0 +1,37 @@ +/* + * 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 __SH_CSS_DVS_INFO_H__ +#define __SH_CSS_DVS_INFO_H__ + +#include + +/* horizontal 64x64 blocks round up to DVS_BLOCKDIM_X, make even */ +#define DVS_NUM_BLOCKS_X(X) (CEIL_MUL(CEIL_DIV((X), DVS_BLOCKDIM_X), 2)) + +/* vertical 64x64 blocks round up to DVS_BLOCKDIM_Y */ +#define DVS_NUM_BLOCKS_Y(X) (CEIL_DIV((X), DVS_BLOCKDIM_Y_LUMA)) + +/* Bilinear interpolation (HRT_GDC_BLI_MODE) is the supported method currently. + * Bicubic interpolation (HRT_GDC_BCI_MODE) is not supported yet */ +#define DVS_GDC_INTERP_METHOD HRT_GDC_BLI_MODE + +#define DVS_INPUT_BYTES_PER_PIXEL (1) + +#define DVS_NUM_BLOCKS_X_CHROMA(X) (CEIL_DIV((X), DVS_BLOCKDIM_X)) + +#define DVS_NUM_BLOCKS_Y_CHROMA(X) (CEIL_DIV((X), DVS_BLOCKDIM_Y_CHROMA)) + +#endif /* __SH_CSS_DVS_INFO_H__ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.c index 153590c..a860d76 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include "platform_support.h" #include "sh_css_firmware.h" @@ -47,10 +48,10 @@ struct fw_param { /* Warning: same order as SH_CSS_BINARY_ID_* */ static struct firmware_header *firmware_header; -/* The string STR(irci_stable_candrpv_0415_20150521_0458) is a place holder +/* The string STR(irci_master_20150701_0213) is a place holder * which will be replaced with the actual RELEASE_VERSION * during package generation. Please do not modify */ -static const char *release_version = STR(irci_stable_candrpv_0415_20150521_0458); +static const char *release_version = STR(irci_master_20150701_0213); #define MAX_FW_REL_VER_NAME 300 static char FW_rel_ver_name[MAX_FW_REL_VER_NAME] = "---"; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.h index 97bdf2e..db4488c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_firmware.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_FIRMWARE_H_ #define _SH_CSS_FIRMWARE_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frac.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frac.h index 1d1771d..ca3330d 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frac.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frac.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SH_CSS_FRAC_H #define __SH_CSS_FRAC_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frame.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frame.c index ca28553..513c6e4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frame.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_frame.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_frame.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_host_data.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_host_data.c index 76ff4dc..f3e732a 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_host_data.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_host_data.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.c index 0bfebce..6711d13 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "platform_support.h" #include "sh_css_hrt.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.h index fd23ed1..7fdf7aa 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_hrt.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_HRT_H_ #define _SH_CSS_HRT_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_internal.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_internal.h index 26137ec..16411cd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_internal.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_internal.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_INTERNAL_H_ #define _SH_CSS_INTERNAL_H_ @@ -320,7 +321,7 @@ struct ia_css_isp_parameter_set_info { struct sh_css_binary_args { struct ia_css_frame *in_frame; /* input frame */ struct ia_css_frame *delay_frames[MAX_NUM_VIDEO_DELAY_FRAMES]; /* reference input frame */ - struct ia_css_frame *tnr_frames[NUM_VIDEO_TNR_FRAMES]; /* tnr frames */ + struct ia_css_frame *tnr_frames[NUM_TNR_FRAMES]; /* tnr frames */ struct ia_css_frame *out_frame[IA_CSS_BINARY_MAX_OUTPUT_PORTS]; /* output frame */ struct ia_css_frame *out_vf_frame; /* viewfinder output frame */ bool copy_vf; @@ -475,7 +476,6 @@ struct sh_css_sp_pipeline_terminal { } context; /* - * zhengjie.lu@intel.com: * TODO * - Remove "virtual_input_system_cfg" when the ISYS2401 DLI is ready. */ @@ -551,6 +551,7 @@ ia_css_metadata_free_multiple(unsigned int num_bufs, struct ia_css_metadata **bu #define SH_CSS_QOS_STAGE_ENABLE(pipe, num) ((pipe)->pipe_qos_config |= QOS_STAGE_MASK(num)) #define SH_CSS_QOS_STAGE_DISABLE(pipe, num) ((pipe)->pipe_qos_config &= ~QOS_STAGE_MASK(num)) #define SH_CSS_QOS_STAGE_IS_ENABLED(pipe, num) ((pipe)->pipe_qos_config & QOS_STAGE_MASK(num)) +#define SH_CSS_QOS_STAGE_IS_ALL_DISABLED(pipe) ((pipe)->pipe_qos_config == QOS_ALL_STAGES_DISABLED) #define SH_CSS_QOS_MODE_PIPE_ADD(mode, pipe) ((mode) |= (0x1 << (pipe)->pipe_id)) #define SH_CSS_QOS_MODE_PIPE_REMOVE(mode, pipe) ((mode) &= ~(0x1 << (pipe)->pipe_id)) #define SH_CSS_IS_QOS_ONLY_MODE(mode) ((mode) == (0x1 << IA_CSS_PIPE_ID_ACC)) @@ -607,6 +608,12 @@ struct sh_css_sp_pipeline { uint32_t raw_bit_depth; } raw; } copy; + + /* Parameters passed to Shading Correction kernel. */ + struct { + uint32_t internal_frame_origin_x_bqs_on_sctbl; /* Origin X (bqs) of internal frame on shading table */ + uint32_t internal_frame_origin_y_bqs_on_sctbl; /* Origin Y (bqs) of internal frame on shading table */ + } shading; }; /* @@ -709,13 +716,11 @@ struct sh_css_sp_stage { /* * Time: 2012-07-19, 17:40. - * Author: zhengjie.lu@intel.com * Note: Add a new data memeber "debug" in "sh_css_sp_group". This * data member is used to pass the debugging command from the * Host to the SP. * * Time: Before 2012-07-19. - * Author: unknown * Note: * Group all host initialized SP variables into this struct. * This is initialized every stage through dma. @@ -768,7 +773,12 @@ struct sh_css_config_on_frame_enqueue { */ /* Variable Sized Buffer Queue Elements */ +#if defined(IS_ISP_2500_SYSTEM) +#define IA_CSS_NUM_ELEMS_HOST2SP_BUFFER_QUEUE 5 +#else #define IA_CSS_NUM_ELEMS_HOST2SP_BUFFER_QUEUE 6 +#endif + #define IA_CSS_NUM_ELEMS_HOST2SP_PARAM_QUEUE 3 #define IA_CSS_NUM_ELEMS_HOST2SP_TAG_CMD_QUEUE 6 #if !defined(HAS_NO_INPUT_SYSTEM) @@ -790,7 +800,12 @@ struct sh_css_config_on_frame_enqueue { #define IA_CSS_NUM_ELEMS_SP2HOST_BUFFER_QUEUE 19 #define IA_CSS_NUM_ELEMS_SP2HOST_PSYS_EVENT_QUEUE 26 /* holds events for all type of buffers, hence deeper */ #else +#if defined(IS_ISP_2500_SYSTEM) +/*Skycam need to support 4 pipes with 7 queues max 2 buffers/queue and 4 simple commands per pipe*/ +#define IA_CSS_NUM_ELEMS_HOST2SP_PSYS_EVENT_QUEUE 72 +#else #define IA_CSS_NUM_ELEMS_HOST2SP_PSYS_EVENT_QUEUE 6 +#endif #define IA_CSS_NUM_ELEMS_SP2HOST_BUFFER_QUEUE 6 #define IA_CSS_NUM_ELEMS_SP2HOST_PSYS_EVENT_QUEUE 6 #endif diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_irq.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_irq.c index 37e954a..2594790 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_irq.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_irq.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_irq.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_lace_stat.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_lace_stat.c index 850aa5e..95126a5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_lace_stat.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_lace_stat.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_lace_stat.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_legacy.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_legacy.h index 0026af3..871c1a4 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_legacy.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_legacy.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_LEGACY_H_ #define _SH_CSS_LEGACY_H_ @@ -31,9 +32,9 @@ enum ia_css_pipe_id { IA_CSS_PIPE_ID_VIDEO, IA_CSS_PIPE_ID_CAPTURE, IA_CSS_PIPE_ID_YUVPP, - IA_CSS_PIPE_ID_ACC, - IA_CSS_PIPE_ID_NUM + IA_CSS_PIPE_ID_ACC }; +#define IA_CSS_PIPE_ID_NUM (IA_CSS_PIPE_ID_ACC+1) struct ia_css_pipe_extra_config { bool enable_raw_binning; @@ -73,7 +74,4 @@ enum ia_css_err sh_css_set_black_frame(struct ia_css_stream *stream, const struct ia_css_frame *raw_black_frame); -void -sh_css_enable_cont_capt(bool enable, bool stop_copy_preview); - #endif /* _SH_CSS_LEGACY_H_ */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metadata.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metadata.c index ebdf84d..200df0f 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metadata.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metadata.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_metadata.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.c index 63c4c45..d848b84 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "assert_support.h" #include "sh_css_metrics.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.h index 40840ea..7929de1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_metrics.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_METRICS_H_ #define _SH_CSS_METRICS_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.c index a1569e4..56673c5 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_mipi.h" #include "sh_css_mipi.h" #include @@ -45,6 +46,50 @@ ia_css_mipi_frame_specify(const unsigned int size_mem_words, return err; } +#if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) +/* + * Check if a source port or TPG/PRBS ID is valid + */ +static bool ia_css_mipi_is_source_port_valid(struct ia_css_pipe *pipe, + unsigned int *pport) +{ + bool ret = true; + unsigned int port = 0; + unsigned int max_ports = 0; + + switch (pipe->stream->config.mode) { + case IA_CSS_INPUT_MODE_BUFFERED_SENSOR: + port = (unsigned int) pipe->stream->config.source.port.port; + max_ports = N_CSI_PORTS; + break; + case IA_CSS_INPUT_MODE_TPG: + port = (unsigned int) pipe->stream->config.source.tpg.id; + max_ports = N_CSS_TPG_IDS; + break; + case IA_CSS_INPUT_MODE_PRBS: + port = (unsigned int) pipe->stream->config.source.prbs.id; + max_ports = N_CSS_PRBS_IDS; + break; + default: + assert(false); + ret = false; + break; + } + + if (ret) { + assert(port < max_ports); + + if (port >= max_ports) { + ret = false; + } + } + + *pport = port; + + return ret; +} +#endif + /* Assumptions: * - A line is multiple of 4 bytes = 1 word. * - Each frame has SOF and EOF (each 1 word). @@ -338,7 +383,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, struct ia_css_stream_info *info) { #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) enum ia_css_err err = IA_CSS_ERR_INTERNAL_ERROR; - unsigned int port; + unsigned int port = 0; struct ia_css_frame_info mipi_intermediate_info; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, @@ -362,16 +407,16 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, struct ia_css_stream_info *info) } #endif - if (pipe->stream->config.mode != IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { + if (!(pipe->stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_TPG || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_PRBS)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "allocate_mipi_frames(%p) exit: no buffers needed for pipe mode.\n", pipe); return IA_CSS_SUCCESS; /* AM TODO: Check */ } - port = (unsigned int) pipe->stream->config.source.port.port; - assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS) { + if (!ia_css_mipi_is_source_port_valid(pipe, &port)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "allocate_mipi_frames(%p) exit: error: port is not correct (port=%d).\n", pipe, port); @@ -490,7 +535,7 @@ free_mipi_frames(struct ia_css_pipe *pipe) { #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) enum ia_css_err err = IA_CSS_ERR_INTERNAL_ERROR; - unsigned int port; + unsigned int port = 0; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "free_mipi_frames(%p) enter:\n", pipe); @@ -504,21 +549,22 @@ free_mipi_frames(struct ia_css_pipe *pipe) return IA_CSS_ERR_INVALID_ARGUMENTS; } - if (pipe->stream->config.mode != IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { + if (!(pipe->stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_TPG || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_PRBS)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "free_mipi_frames(%p) exit: error: wrong mode.\n", pipe); return err; } - port = (unsigned int) pipe->stream->config.source.port.port; - assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS) { + if (!ia_css_mipi_is_source_port_valid(pipe, &port)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, - "free_mipi_frames(%p, %d) exit: error: pipe port is not correct.\n", + "free_mipi_frames(%p) exit: error: pipe port is not correct (port=%d).\n", pipe, port); return err; } + if (ref_count_mipi_allocation[port] > 0) { #if defined(USE_INPUT_SYSTEM_VERSION_2) assert(ref_count_mipi_allocation[port] == 1); @@ -595,7 +641,7 @@ send_mipi_frames(struct ia_css_pipe *pipe) #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) enum ia_css_err err = IA_CSS_ERR_INTERNAL_ERROR; unsigned int i; - unsigned int port; + unsigned int port = 0; IA_CSS_ENTER_PRIVATE("pipe=%d", pipe); @@ -608,16 +654,16 @@ send_mipi_frames(struct ia_css_pipe *pipe) /* multi stream video needs mipi buffers */ /* nothing to be done in other cases. */ - if (pipe->stream->config.mode != IA_CSS_INPUT_MODE_BUFFERED_SENSOR) { + if (!(pipe->stream->config.mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_TPG || + pipe->stream->config.mode == IA_CSS_INPUT_MODE_PRBS)) { IA_CSS_LOG("nothing to be done for this mode"); return IA_CSS_SUCCESS; /* TODO: AM: maybe this should be returning an error. */ } - port = (unsigned int) pipe->stream->config.source.port.port; - assert(port < N_CSI_PORTS); - if (port >= N_CSI_PORTS) { - IA_CSS_ERROR("invalid port specified (%d)", port); + if (!ia_css_mipi_is_source_port_valid(pipe, &port)) { + IA_CSS_ERROR("send_mipi_frames(%p) exit: invalid port specified (port=%d).\n", pipe, port); return err; } diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.h index 990f678..7fe9326 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mipi.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SH_CSS_MIPI_H #define __SH_CSS_MIPI_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mmu.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mmu.c index 35d2809..e6a4021 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mmu.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_mmu.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_mmu.h" #include #include "sh_css_sp.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_morph.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_morph.c index 1f4fa25..8137b25 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_morph.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_morph.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_morph.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.c index 51ef9d9..b1455cd 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "sh_css_param_dvs.h" #include #include @@ -23,6 +24,9 @@ #if defined(IS_ISP_2500_SYSTEM) #include #include +void dump_mv(struct dvs_stat_private_motion_vec *p_private_mv, + struct ia_css_dvs_stat_grid_info *cfg); +#define DVS_STAT_MV_DEBUG 0 #endif static struct ia_css_dvs_6axis_config * @@ -253,6 +257,61 @@ void copy_dvs_6axis_table(struct ia_css_dvs_6axis_config *dvs_config_dst, } #if defined(IS_ISP_2500_SYSTEM) +void dump_mv(struct dvs_stat_private_motion_vec *p_private_mv, + struct ia_css_dvs_stat_grid_info *cfg) +{ + int i, j; + + if (p_private_mv == NULL || cfg == NULL) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "dump_mv() - Wrong parameters: mv %p, cfg %p", + p_private_mv, cfg); + return; + } + + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "Level 0:\n"); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "level xPos yPos HarrisGrade xMatch yMatch MatchGrade\n"); + for (i = 0; i < cfg->grd_cfg[0].grd_cfg.grid_width; i++) { + for (j = 0; j < cfg->grd_cfg[0].grd_cfg.grid_height; j++) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "%-1d %-5d %-5d %-10d %-5d %-5d %-10d\n", + 0, + p_private_mv->dvs_mv_output_l0[i].mv_entry[i].part0.vec_fe_x_pos, + p_private_mv->dvs_mv_output_l0[j].mv_entry[i].part0.vec_fe_y_pos, + p_private_mv->dvs_mv_output_l0[j].mv_entry[i].part2.harris_grade, + p_private_mv->dvs_mv_output_l0[j].mv_entry[i].part1.vec_fm_x_pos, + p_private_mv->dvs_mv_output_l0[j].mv_entry[i].part1.vec_fm_y_pos, + p_private_mv->dvs_mv_output_l0[j].mv_entry[i].part3.match_grade); + } + } + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "Level 1:\n"); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "level xPos yPos HarrisGrade xMatch yMatch MatchGrade\n"); + for (i = 0; i < cfg->grd_cfg[1].grd_cfg.grid_width; i++) { + for (j = 0; j < cfg->grd_cfg[1].grd_cfg.grid_height; j++) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "%-1d %-5d %-5d %-10d %-5d %-5d %-10d\n", + 1, + p_private_mv->dvs_mv_output_l1[i].mv_entry[i].part0.vec_fe_x_pos, + p_private_mv->dvs_mv_output_l1[j].mv_entry[i].part0.vec_fe_y_pos, + p_private_mv->dvs_mv_output_l1[j].mv_entry[i].part2.harris_grade, + p_private_mv->dvs_mv_output_l1[j].mv_entry[i].part1.vec_fm_x_pos, + p_private_mv->dvs_mv_output_l1[j].mv_entry[i].part1.vec_fm_y_pos, + p_private_mv->dvs_mv_output_l1[j].mv_entry[i].part3.match_grade); + } + } + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "Level 2:\n"); + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "level xPos yPos HarrisGrade xMatch yMatch MatchGrade\n"); + for (i = 0; i < cfg->grd_cfg[2].grd_cfg.grid_width; i++) { + for (j = 0; j < cfg->grd_cfg[2].grd_cfg.grid_height; j++) { + ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "%-1d %-5d %-5d %-10d %-5d %-5d %-10d\n", + 2, + p_private_mv->dvs_mv_output_l2[i].mv_entry[i].part0.vec_fe_x_pos, + p_private_mv->dvs_mv_output_l2[j].mv_entry[i].part0.vec_fe_y_pos, + p_private_mv->dvs_mv_output_l2[j].mv_entry[i].part2.harris_grade, + p_private_mv->dvs_mv_output_l2[j].mv_entry[i].part1.vec_fm_x_pos, + p_private_mv->dvs_mv_output_l2[j].mv_entry[i].part1.vec_fm_y_pos, + p_private_mv->dvs_mv_output_l2[j].mv_entry[i].part3.match_grade); + } + } +} + enum ia_css_err ia_css_get_skc_dvs_statistics(struct ia_css_skc_dvs_statistics *host_stats, const struct ia_css_isp_skc_dvs_statistics *isp_stats) { @@ -302,6 +361,10 @@ enum ia_css_err ia_css_get_skc_dvs_statistics(struct ia_css_skc_dvs_statistics * /* Translate between private and public configuration */ ia_css_dvs_stat_private_to_public_cfg(&host_stats->dvs_stat_cfg, &dvs_stat_cfg); +#if DVS_STAT_MV_DEBUG + ia_css_dvs_stat_public_cfg_dump((const struct ia_css_2500_dvs_statistics_kernel_config *)&host_stats->dvs_stat_cfg); + dump_mv(dvs_stat_mv_p, &host_stats->dvs_stat_cfg); +#endif /* Translate between private and public motion vectors */ for (i = 0; i < IA_CSS_SKC_DVS_STAT_NUM_OF_LEVELS; i++) { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.h index 3b6488f..76c9604 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_dvs.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,11 +12,13 @@ * more details. */ + #ifndef _SH_CSS_PARAMS_DVS_H_ #define _SH_CSS_PARAMS_DVS_H_ #include #include +#include #include "gdc_global.h" /* gdc_warp_param_mem_t */ #define DVS_ENV_MIN_X (12) @@ -26,15 +28,6 @@ #define DVS_BLOCKDIM_Y_LUMA (64) /* Y block height*/ #define DVS_BLOCKDIM_Y_CHROMA (32) /* UV height block size is half the Y block height*/ -/* horizontal 64x64 blocks round up to DVS_BLOCKDIM_X, make even */ -#define DVS_NUM_BLOCKS_X(X) (CEIL_MUL(CEIL_DIV((X), DVS_BLOCKDIM_X), 2)) - -/* vertical 64x64 blocks round up to DVS_BLOCKDIM_Y */ -#define DVS_NUM_BLOCKS_Y(X) (CEIL_DIV((X), DVS_BLOCKDIM_Y_LUMA)) -#define DVS_NUM_BLOCKS_X_CHROMA(X) (CEIL_DIV((X), DVS_BLOCKDIM_X)) -#define DVS_NUM_BLOCKS_Y_CHROMA(X) (CEIL_DIV((X), DVS_BLOCKDIM_Y_CHROMA)) - - #define DVS_TABLE_IN_BLOCKDIM_X_LUMA(X) (DVS_NUM_BLOCKS_X(X) + 1) /* N blocks have N + 1 set of coords */ #define DVS_TABLE_IN_BLOCKDIM_X_CHROMA(X) (DVS_NUM_BLOCKS_X_CHROMA(X) + 1) #define DVS_TABLE_IN_BLOCKDIM_Y_LUMA(X) (DVS_NUM_BLOCKS_Y(X) + 1) @@ -44,7 +37,6 @@ #define DVS_ENVELOPE_Y(X) (((X) == 0) ? (DVS_ENV_MIN_Y) : (X)) #define DVS_COORD_FRAC_BITS (10) -#define DVS_INPUT_BYTES_PER_PIXEL (1) #define XMEM_ALIGN_LOG2 (5) #define DVS_6AXIS_COORDS_ELEMS CEIL_MUL(sizeof(gdc_warp_param_mem_t) \ @@ -56,10 +48,6 @@ * DVS_NUM_BLOCKS_X((binary)->out_frame_info[0].res.width) \ * DVS_NUM_BLOCKS_Y((binary)->out_frame_info[0].res.height)) -/* Bilinear interpolation (HRT_GDC_BLI_MODE) is the supported method currently. - * Bicubic interpolation (HRT_GDC_BCI_MODE) is not supported yet */ -#define DVS_GDC_INTERP_METHOD HRT_GDC_BLI_MODE - struct ia_css_dvs_6axis_config * generate_dvs_6axis_table(const struct ia_css_resolution *frame_res, const struct ia_css_resolution *dvs_offset); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.c index acc3e3b..7d0b5c3 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include #include "sh_css_param_shading.h" #include "ia_css_shading.h" @@ -196,17 +197,15 @@ crop_and_interpolate(unsigned int cropped_width, void sh_css_params_shading_id_table_generate( struct ia_css_shading_table **target_table, - const struct ia_css_binary *binary) + unsigned int table_width, + unsigned int table_height) { /* initialize table with ones, shift becomes zero */ - unsigned int i, j, table_width, table_height; + unsigned int i, j; struct ia_css_shading_table *result; assert(target_table != NULL); - assert(binary != NULL); - table_width = binary->sctbl_width_per_color; - table_height = binary->sctbl_height; result = ia_css_shading_table_alloc(table_width, table_height); if (result == NULL) { *target_table = NULL; @@ -246,7 +245,8 @@ prepare_shading_table(const struct ia_css_shading_table *in_table, assert(binary != NULL); if (!in_table) { - sh_css_params_shading_id_table_generate(target_table, binary); + sh_css_params_shading_id_table_generate(target_table, + binary->sctbl_legacy_width_per_color, binary->sctbl_legacy_height); return; } @@ -271,6 +271,15 @@ prepare_shading_table(const struct ia_css_shading_table *in_table, right_padding = (binary->internal_frame_info.res.width - binary->effective_in_frame_res.width * bds_denominator / bds_numerator - left_cropping) * bds_numerator / bds_denominator; top_padding = binary->info->sp.pipeline.top_cropping * bds_numerator / bds_denominator - binary->info->sp.pipeline.top_cropping; +#if !defined(USE_WINDOWS_BINNING_FACTOR) + /* @deprecated{This part of the code will be replaced by the code + * in the #else section below to make the calculation same across + * all platforms. + * Android and Windows platforms interpret the binning_factor parameter + * differently. In Android, the binning factor is expressed in the form + * 2^N * 2^N, whereas in Windows platform, the binning factor is N*N} + */ + /* We take into account the binning done by the sensor. We do this by cropping the non-binned part of the shading table and then increasing the size of a grid cell with this same binning factor. */ @@ -282,14 +291,23 @@ prepare_shading_table(const struct ia_css_shading_table *in_table, left_padding <<= sensor_binning; right_padding <<= sensor_binning; top_padding <<= sensor_binning; +#else + input_width *= sensor_binning; + input_height *= sensor_binning; + left_padding *= sensor_binning; + right_padding *= sensor_binning; + top_padding *= sensor_binning; +#endif /*USE_WINDOWS_BINNING_FACTOR*/ /* during simulation, the used resolution can exceed the sensor resolution, so we clip it. */ input_width = min(input_width, in_table->sensor_width); input_height = min(input_height, in_table->sensor_height); - table_width = binary->sctbl_width_per_color; - table_height = binary->sctbl_height; + /* This prepare_shading_table() function is called only in legacy API (not in new API). + Then, the legacy shading table width and height should be used. */ + table_width = binary->sctbl_legacy_width_per_color; + table_height = binary->sctbl_legacy_height; result = ia_css_shading_table_alloc(table_width, table_height); if (result == NULL) { diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.h index acc049d..abd7582 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_param_shading.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SH_CSS_PARAMS_SHADING_H #define __SH_CSS_PARAMS_SHADING_H @@ -21,7 +22,8 @@ void sh_css_params_shading_id_table_generate( struct ia_css_shading_table **target_table, - const struct ia_css_binary *binary); + unsigned int table_width, + unsigned int table_height); void prepare_shading_table(const struct ia_css_shading_table *in_table, diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.c index f71c1ad..7b39bb1 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "gdc_device.h" /* gdc_lut_store(), ... */ #include "isp.h" /* ISP_VEC_ELEMBITS */ #include "vamem.h" @@ -96,18 +97,17 @@ #include "xnr/xnr_3.0/ia_css_xnr3.host.h" - #if defined(IS_ISP_2500_SYSTEM) #include "product_specific.host.h" #include "components/ob/sc_ob_1.0/host/obgrid.host.h" #include "components/stats_3a/src/stats_3a_private.h" #include "components/acc_cluster/acc_lace_stat/lace_stat_private.h" #include "components/acc_cluster/acc_lace_stat/host/lace_stat.host.h" -#include "components/acc_cluster/gen/host/acc_cluster.host.h" #include "components/dvs/sc_dvs_1.0/host/dvs.host.h" #include #include /* Skylake kernel settings structs */ -#include /* Skylake kernel settings structs */ +#include /* Skylake kernel settings structs */ +#include "tnr/tnr3/host/ia_css_tnr3.host.h" #if defined(HAS_OUTPUT_SYSTEM) #include #endif @@ -120,7 +120,8 @@ (sizeof(char) * (binary)->in_frame_info.res.height * \ (binary)->in_frame_info.padded_width) #define SCTBL_BYTES(binary) \ - (sizeof(unsigned short) * (binary)->sctbl_height * \ + (sizeof(unsigned short) * max((binary)->sctbl_height, (binary)->sctbl_legacy_height) * \ + /* height should be the larger height between new api and legacy api */ \ (binary)->sctbl_aligned_width_per_color * IA_CSS_SC_NUM_COLORS) #if 0 #define S3ATBL_BYTES(binary) \ @@ -139,7 +140,7 @@ (binary)->morph_tbl_height) #if defined(IS_ISP_2500_SYSTEM) -struct isp_acc_param sh_css_acc_cluster_parameters_pool[SH_CSS_MAX_SP_THREADS]; +struct isp_acc_param sh_css_acc_cluster_parameters_pool[IA_CSS_PIPELINE_NUM_MAX]; #endif /* We keep a second copy of the ptr struct for the SP to access. @@ -1274,12 +1275,14 @@ sh_css_create_isp_params(struct ia_css_stream *stream, static bool sh_css_init_isp_params_from_global(struct ia_css_stream *stream, struct ia_css_isp_parameters *params, - bool use_default_config); + bool use_default_config, + struct ia_css_pipe *pipe_in); static enum ia_css_err sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, struct ia_css_isp_parameters *params, - const struct ia_css_isp_config *config); + const struct ia_css_isp_config *config, + struct ia_css_pipe *pipe_in); static enum ia_css_err sh_css_set_global_isp_config_on_pipe( @@ -1596,6 +1599,16 @@ sh_css_params_set_binning_factor(struct ia_css_stream *stream, unsigned int binn #if !defined(IS_ISP_2500_SYSTEM) static void +sh_css_update_shading_table_status(struct ia_css_pipe *pipe, + struct ia_css_isp_parameters *params) +{ + if (params && pipe && (pipe->pipe_num != params->sc_table_last_pipe_num)) { + params->sc_table_dirty = true; + params->sc_table_last_pipe_num = pipe->pipe_num; + } +} + +static void sh_css_set_shading_table(struct ia_css_stream *stream, struct ia_css_isp_parameters *params, const struct ia_css_shading_table *table) @@ -1608,9 +1621,10 @@ sh_css_set_shading_table(struct ia_css_stream *stream, if (!table->enable) table = NULL; - if (table != params->sc_table) { + if ((table != params->sc_table) || params->sc_table_dirty) { params->sc_table = table; params->sc_table_changed = true; + params->sc_table_dirty = false; /* Not very clean, this goes to sh_css.c to invalidate the * shading table for all pipes. Should replaced by a loop * and a pipe-specific call. @@ -2355,21 +2369,68 @@ ia_css_get_3a_statistics(struct ia_css_3a_statistics *host_stats, This function hnadles some of the exceptions. */ static void -ia_css_set_param_exceptions(struct ia_css_isp_parameters *params) +ia_css_set_param_exceptions(const struct ia_css_pipe *pipe, + struct ia_css_isp_parameters *params) { assert(params != NULL); + assert(pipe != NULL); + assert(pipe->mode < IA_CSS_PIPE_ID_NUM); /* Copy also to DP. Should be done by the driver. */ params->dp_config.gr = params->wb_config.gr; params->dp_config.r = params->wb_config.r; params->dp_config.b = params->wb_config.b; params->dp_config.gb = params->wb_config.gb; + if (pipe->mode < IA_CSS_PIPE_ID_NUM) { + params->pipe_dp_config[pipe->mode].gr = params->wb_config.gr; + params->pipe_dp_config[pipe->mode].r = params->wb_config.r; + params->pipe_dp_config[pipe->mode].b = params->wb_config.b; + params->pipe_dp_config[pipe->mode].gb = params->wb_config.gb; + } } #endif #if !defined(IS_ISP_2500_SYSTEM) static void +sh_css_set_dp_config(const struct ia_css_pipe *pipe, + struct ia_css_isp_parameters *params, + const struct ia_css_dp_config *config) +{ + if (config == NULL) + return; + + assert(params != NULL); + assert(pipe != NULL); + assert(pipe->mode < IA_CSS_PIPE_ID_NUM); + + IA_CSS_ENTER_PRIVATE("config=%p", config); + ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE_PRIVATE); + if (pipe->mode < IA_CSS_PIPE_ID_NUM) { + params->pipe_dp_config[pipe->mode] = *config; + params->pipe_dpc_config_changed[pipe->mode] = true; + } + IA_CSS_LEAVE_PRIVATE("void"); +} + +static void +sh_css_get_dp_config(const struct ia_css_pipe *pipe, + const struct ia_css_isp_parameters *params, + struct ia_css_dp_config *config) +{ + if (config == NULL) + return; + + assert(params != NULL); + assert(pipe != NULL); + IA_CSS_ENTER_PRIVATE("config=%p", config); + + *config = params->pipe_dp_config[pipe->mode]; + + IA_CSS_LEAVE_PRIVATE("void"); +} + +static void sh_css_set_nr_config(struct ia_css_isp_parameters *params, const struct ia_css_nr_config *config) { @@ -2679,7 +2740,7 @@ sh_css_set_global_isp_config_on_pipe( IA_CSS_ENTER_PRIVATE("stream=%p, config=%p, pipe=%p", curr_pipe, config, pipe); - err1 = sh_css_init_isp_params_from_config(curr_pipe, curr_pipe->stream->isp_params_configs, config); + err1 = sh_css_init_isp_params_from_config(curr_pipe, curr_pipe->stream->isp_params_configs, config, pipe); /* Now commit all changes to the SP */ err2 = sh_css_param_update_isp_params(curr_pipe, curr_pipe->stream->isp_params_configs, sh_css_sp_is_running(), pipe); @@ -2691,7 +2752,6 @@ sh_css_set_global_isp_config_on_pipe( * which are currently in TR phase. */ err = (err1 != IA_CSS_SUCCESS ) ? err1 : ((err2 != IA_CSS_SUCCESS) ? err2 : err); - IA_CSS_LEAVE_ERR_PRIVATE(err); return err; } @@ -2736,12 +2796,11 @@ sh_css_set_per_frame_isp_config_on_pipe( params = stream->per_frame_isp_params_configs; /* update new ISP params object with the new config */ - if (!sh_css_init_isp_params_from_global(stream, params, false)) { + if (!sh_css_init_isp_params_from_global(stream, params, false, pipe)) { err1 = IA_CSS_ERR_INVALID_ARGUMENTS; } - err2 = sh_css_init_isp_params_from_config(stream->pipes[0], params, config); - + err2 = sh_css_init_isp_params_from_config(stream->pipes[0], params, config, pipe); if (per_frame_config_created) { @@ -2774,7 +2833,8 @@ exit: static enum ia_css_err sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, struct ia_css_isp_parameters *params, - const struct ia_css_isp_config *config) + const struct ia_css_isp_config *config, + struct ia_css_pipe *pipe_in) { enum ia_css_err err = IA_CSS_SUCCESS; #if !defined(IS_ISP_2500_SYSTEM) @@ -2787,6 +2847,8 @@ sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, ia_css_set_configs(params, config); #if defined(IS_ISP_2500_SYSTEM) + /* This variable is not used */ + (void)pipe_in; err = sh_css_set_config_product_specific(pipe, config); #else @@ -2798,6 +2860,7 @@ sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, sh_css_set_pipe_dvs_6axis_config(pipe, params, config->dvs_6axis_config); sh_css_set_dz_config(params, config->dz_config); sh_css_set_motion_vector(params, config->motion_vector); + sh_css_update_shading_table_status(pipe_in, params); sh_css_set_shading_table(pipe->stream, params, config->shading_table); sh_css_set_morph_table(params, config->morph_table); sh_css_set_macc_table(params, config->macc_table); @@ -2812,6 +2875,13 @@ sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, params->output_frame = config->output_frame; params->isp_parameters_id = config->isp_config_id; + /* Currently we do not offer CSS interface to set different + * configurations for DPC, i.e. depending on DPC being enabled + * before (NORM+OBC) or after. The folllowing code to set the + * DPC configuration should be updated when this interface is made + * available */ + sh_css_set_dp_config(pipe, params, config->dp_config); + ia_css_set_param_exceptions(pipe, params); if (IA_CSS_SUCCESS == sh_css_select_dp_10bpp_config(pipe, &is_dp_10bpp)) { @@ -2827,7 +2897,6 @@ sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe, goto exit; } - ia_css_set_param_exceptions(params); exit: #endif IA_CSS_LEAVE_ERR_PRIVATE(err); @@ -2865,6 +2934,7 @@ ia_css_pipe_get_isp_config(struct ia_css_pipe *pipe, sh_css_get_ee_config(params, config->ee_config); sh_css_get_baa_config(params, config->baa_config); sh_css_get_pipe_dvs_6axis_config(pipe, params, config->dvs_6axis_config); + sh_css_get_dp_config(pipe, params, config->dp_config); sh_css_get_macc_table(params, config->macc_table); sh_css_get_gamma_table(params, config->gamma_table); sh_css_get_ctc_table(params, config->ctc_table); @@ -2902,12 +2972,7 @@ static bool realloc_isp_css_mm_buf( IA_CSS_ENTER_PRIVATE("void"); - if (!force && *curr_size >= needed_size) { - IA_CSS_LEAVE_PRIVATE("false"); - return false; - } - /* don't reallocate if single ref to buffer and same size */ - if (*curr_size == needed_size && ia_css_refcount_is_single(*curr_buf)) { + if (ia_css_refcount_is_single(*curr_buf) && !force && *curr_size >= needed_size) { IA_CSS_LEAVE_PRIVATE("false"); return false; } @@ -3183,7 +3248,7 @@ ia_css_stream_isp_parameters_init(struct ia_css_stream *stream) goto ERR; params = stream->isp_params_configs; - if (!sh_css_init_isp_params_from_global(stream, params, true)) { + if (!sh_css_init_isp_params_from_global(stream, params, true, NULL)) { /* we do not return the error immediately to enable internal * firmware feature testing */ err = IA_CSS_ERR_INVALID_ARGUMENTS; @@ -3315,7 +3380,8 @@ sh_css_create_isp_params(struct ia_css_stream *stream, static bool sh_css_init_isp_params_from_global(struct ia_css_stream *stream, struct ia_css_isp_parameters *params, - bool use_default_config) + bool use_default_config, + struct ia_css_pipe *pipe_in) { bool retval = true; #if !defined(IS_ISP_2500_SYSTEM) @@ -3325,6 +3391,11 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, #endif struct ia_css_isp_parameters *stream_params = stream->isp_params_configs; +#if defined(IS_ISP_2500_SYSTEM) + /* This variable is not used */ + (void)pipe_in; +#endif + if (!use_default_config && !stream_params) { retval = false; goto exit; @@ -3358,7 +3429,26 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, ia_css_set_tnr_config(params, &default_tnr_config); ia_css_set_ob_config(params, &default_ob_config); ia_css_set_dp_config(params, &default_dp_config); - ia_css_set_param_exceptions(params); + + for (i = 0; i < stream->num_pipes; i++) { + if (IA_CSS_SUCCESS == sh_css_select_dp_10bpp_config(stream->pipes[i], &is_dp_10bpp)) { + /* set the return value as false if both DPC and + * BDS is enabled by the user. But we do not return + * the value immediately to enable internal firmware + * feature testing. */ + if(is_dp_10bpp) { + sh_css_set_dp_config(stream->pipes[i], params, &default_dp_10bpp_config); + } else { + sh_css_set_dp_config(stream->pipes[i], params, &default_dp_config); + } + } else { + retval = false; + goto exit; + } + + ia_css_set_param_exceptions(stream->pipes[i], params); + } + ia_css_set_de_config(params, &default_de_config); ia_css_set_gc_config(params, &default_gc_config); ia_css_set_anr_config(params, &default_anr_config); @@ -3394,6 +3484,8 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, params->sc_table = NULL; params->sc_table_changed = true; + params->sc_table_dirty = false; + params->sc_table_last_pipe_num = 0; ia_css_sdis2_clear_coefficients(¶ms->dvs2_coefs); params->dvs2_coef_table_changed = true; @@ -3403,6 +3495,7 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, #else /* !defined(IS_ISP_2500_SYSTEM) */ ia_css_lin_set_default_config(¶ms->lin_2500_config); ia_css_tnr_set_default_config(¶ms->tnr_2500_config); + ia_css_tnr3_set_default_config(¶ms->tnr3_config); #endif } else @@ -3458,15 +3551,23 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, * BDS is enabled by the user. But we do not return * the value immediately to enable internal firmware * feature testing. */ - retval = !is_dp_10bpp; + if (is_dp_10bpp) { + retval = false; + } + } else { + retval = false; + goto exit; + } + if (stream->pipes[i]->mode < IA_CSS_PIPE_ID_NUM) { + sh_css_set_dp_config(stream->pipes[i], params, + &stream_params->pipe_dp_config[stream->pipes[i]->mode]); + ia_css_set_param_exceptions(stream->pipes[i], params); } else { retval = false; goto exit; } } - ia_css_set_param_exceptions(params); - params->fpn_config.data = stream_params->fpn_config.data; params->config_changed[IA_CSS_FPN_ID] = stream_params->config_changed[IA_CSS_FPN_ID]; params->fpn_config.enabled = stream_params->fpn_config.enabled; @@ -3475,17 +3576,20 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, sh_css_set_morph_table(params, stream_params->morph_table); if (stream_params->sc_table) { + sh_css_update_shading_table_status(pipe_in, params); sh_css_set_shading_table(stream, params, stream_params->sc_table); } else { params->sc_table = NULL; params->sc_table_changed = true; + params->sc_table_dirty = false; + params->sc_table_last_pipe_num = 0; } /* Only IA_CSS_PIPE_ID_VIDEO & IA_CSS_PIPE_ID_CAPTURE will support dvs_6axis_config*/ for (i = 0; i < IA_CSS_PIPE_ID_NUM; i++) { if (stream_params->pipe_dvs_6axis_config[i]) { - if (params->pipe_dvs_6axis_config[i]) { + if ( params->pipe_dvs_6axis_config[i]) { copy_dvs_6axis_table(params->pipe_dvs_6axis_config[i], stream_params->pipe_dvs_6axis_config[i]); } else { @@ -3500,7 +3604,9 @@ sh_css_init_isp_params_from_global(struct ia_css_stream *stream, ia_css_set_sdis2_config(params, &stream_params->dvs2_coefs); params->dvs2_coef_table_changed = stream_params->dvs2_coef_table_changed; params->sensor_binning = stream_params->sensor_binning; -#endif /* !defined(IS_ISP_2500_SYSTEM) */ +#else /* !defined(IS_ISP_2500_SYSTEM) */ + ia_css_set_tnr3_config(params, &stream_params->tnr3_config); +#endif } exit: @@ -3543,6 +3649,8 @@ sh_css_params_init(void) ia_css_config_ctc_table(); ia_css_config_rgb_gamma_tables(); ia_css_config_xnr_table(); +#else + ia_css_init_acc_dvs_stat_meta_data(); #endif sp_ddr_ptrs = ia_css_refcount_increment(-1, mmgr_calloc(1, @@ -3569,13 +3677,25 @@ static void host_lut_store(const void *lut) for (i = 0; i < N_GDC_ID; i++) gdc_lut_store((gdc_ID_t)i, (const int (*)[HRT_GDC_N]) lut); } + +/* Note that allocation is in ipu address space. */ +inline hrt_vaddress sh_css_params_alloc_gdc_lut(void) +{ + return mmgr_malloc(sizeof(zoom_table)); +} + +inline void sh_css_params_free_gdc_lut(hrt_vaddress addr) +{ + if (addr != mmgr_NULL) + mmgr_free(addr); +} #endif enum ia_css_err ia_css_pipe_set_bci_scaler_lut(struct ia_css_pipe *pipe, const void *lut) { enum ia_css_err err = IA_CSS_SUCCESS; - bool store = true; + bool stream_started = false; IA_CSS_ENTER("pipe=%p lut=%p", pipe, lut); if (lut == NULL || pipe == NULL) { @@ -3587,34 +3707,38 @@ enum ia_css_err ia_css_pipe_set_bci_scaler_lut(struct ia_css_pipe *pipe, #if !defined(IS_ISP_2500_SYSTEM) /* If the pipe belongs to a stream and the stream has started, it is not * safe to store lut to gdc HW. If pipe->stream is NULL, then no stream is - * created with this pipe, so it is safe to do this operation. */ + * created with this pipe, so it is safe to do this operation as long as + * ia_css_init() has been called. */ if (pipe->stream && pipe->stream->started) { - ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, "unable to set scaler lut since stream has started\n"); - store = false; + stream_started = true; err = IA_CSS_ERR_NOT_SUPPORTED; } /* Free any existing tables. */ - if (pipe->scaler_pp_lut != mmgr_NULL) { - mmgr_free(pipe->scaler_pp_lut); - pipe->scaler_pp_lut = mmgr_NULL; - } + sh_css_params_free_gdc_lut(pipe->scaler_pp_lut); + pipe->scaler_pp_lut = mmgr_NULL; - if (store) { - pipe->scaler_pp_lut = mmgr_malloc(sizeof(zoom_table)); + if (!stream_started) { + pipe->scaler_pp_lut = sh_css_params_alloc_gdc_lut(); if (pipe->scaler_pp_lut == mmgr_NULL) { - IA_CSS_LEAVE("lut(%p) err=%d", pipe->scaler_pp_lut, err); - return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; + ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR, + "unable to allocate scaler_pp_lut\n"); + err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; + } else { + gdc_lut_convert_to_isp_format((const int(*)[HRT_GDC_N])lut, + interleaved_lut_temp); + mmgr_store(pipe->scaler_pp_lut, + (int *)interleaved_lut_temp, + sizeof(zoom_table)); } - - gdc_lut_convert_to_isp_format((const int(*)[HRT_GDC_N])lut, interleaved_lut_temp); - mmgr_store(pipe->scaler_pp_lut, (int *)interleaved_lut_temp, - sizeof(zoom_table)); } +#else + NOT_USED(stream_started); #endif - IA_CSS_LEAVE("lut(%p) err=%d store(%d)", pipe->scaler_pp_lut, err, store); + IA_CSS_LEAVE("lut(%p) err=%d", pipe->scaler_pp_lut, err); return err; } @@ -3647,7 +3771,7 @@ enum ia_css_err sh_css_params_map_and_store_default_gdc_lut(void) host_lut_store((void *)zoom_table); - default_gdc_lut = mmgr_malloc(sizeof(zoom_table)); + default_gdc_lut = sh_css_params_alloc_gdc_lut(); if (default_gdc_lut == mmgr_NULL) return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; @@ -3664,10 +3788,8 @@ void sh_css_params_free_default_gdc_lut(void) { IA_CSS_ENTER_PRIVATE("void"); - if (default_gdc_lut != mmgr_NULL) { - mmgr_free(default_gdc_lut); - default_gdc_lut = mmgr_NULL; - } + sh_css_params_free_gdc_lut(default_gdc_lut); + default_gdc_lut = mmgr_NULL; IA_CSS_LEAVE_PRIVATE("void"); @@ -3775,7 +3897,6 @@ ia_css_stream_isp_parameters_uninit(struct ia_css_stream *stream) #if defined(IS_ISP_2500_SYSTEM) destroy_acc_cluster(stream); - stripe_table_release(); #endif /* Free up sc_config (temporal shading table) if it is allocated. */ @@ -4031,13 +4152,13 @@ process_kernel_parameters(unsigned int pipe_id, if (params->config_changed[IA_CSS_S3A_ID]) { ia_css_s3a_configure(raw_bit_depth); } -#endif + /* Copy stage uds parameters to config, since they can differ per stage. */ params->crop_config.crop_pos = params->uds[stage->stage_num].crop_pos; params->uds_config.crop_pos = params->uds[stage->stage_num].crop_pos; params->uds_config.uds = params->uds[stage->stage_num].uds; - +#endif /* Call parameter process functions for all kernels */ /* Skip SC, since that is called on a temp sc table */ for (param_id = 0; param_id < IA_CSS_NUM_PARAMETER_IDS; param_id++) { @@ -4097,14 +4218,11 @@ sh_css_param_update_isp_params(struct ia_css_pipe *curr_pipe, isp_pipe_version = ia_css_pipe_get_isp_pipe_version(pipe); ia_css_pipeline_get_sp_thread_id(pipe_num, &thread_id); #if defined(IS_ISP_2500_SYSTEM) - if (ia_css_pipeline_is_mapped(pipe_num) == false) { - thread_id = 0; - } - sh_css_acc_cluster_parameters = &(sh_css_acc_cluster_parameters_pool[thread_id]); + sh_css_acc_cluster_parameters = &(sh_css_acc_cluster_parameters_pool[pipe_num]); if (sh_css_acc_cluster_parameters == NULL) { return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; } - if (!pipe_in || pipe == pipe_in) { + if ((!pipe_in || pipe == pipe_in) && (pipe->config.mode != IA_CSS_PIPE_MODE_ACC)) { err = sh_css_process_acc_cluster_parameters(pipe, sh_css_acc_cluster_parameters, &acc_cluster_params_changed); if (err != IA_CSS_SUCCESS) { IA_CSS_LOG("sh_css_process_acc_cluster_parameters() returned INVALID KERNEL CONFIGURATION\n"); @@ -4180,6 +4298,8 @@ sh_css_param_update_isp_params(struct ia_css_pipe *curr_pipe, [pipeline->pipe_id][stage->stage_num][mem] = false; } } /* for */ + if (err != IA_CSS_SUCCESS) + break; #if !defined(IS_ISP_2500_SYSTEM) /* update isp_params to pipe specific copies */ if (params->isp_params_changed) { @@ -4200,8 +4320,10 @@ sh_css_param_update_isp_params(struct ia_css_pipe *curr_pipe, reallocate_buffer(&cur_map->acc_cluster_params_for_sp , &cur_map_size->acc_cluster_params_for_sp , cur_map_size->acc_cluster_params_for_sp , - true, + false, &err); + if (err != IA_CSS_SUCCESS) + break; sh_css_update_acc_cluster_params_to_ddr( cur_map->acc_cluster_params_for_sp, sh_css_acc_cluster_parameters); @@ -4402,7 +4524,8 @@ sh_css_params_write_to_ddr_internal( ia_css_shading_table_free(params->sc_config); params->sc_config = NULL; } - sh_css_params_shading_id_table_generate(¶ms->sc_config, binary); + sh_css_params_shading_id_table_generate(¶ms->sc_config, + binary->sctbl_width_per_color, binary->sctbl_height); if (params->sc_config == NULL) { IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY); return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; @@ -4456,7 +4579,22 @@ sh_css_params_write_to_ddr_internal( } } } + /* DPC configuration is made pipe specific to allow flexibility in positioning of the + * DPC kernel. The code below sets the pipe specific configuration to + * individual binaries. */ + if (params->pipe_dpc_config_changed[pipe_id] && binary->info->sp.enable.dpc) { + unsigned size = stage->binary->info->mem_offsets.offsets.param->dmem.dp.size; + + unsigned offset = stage->binary->info->mem_offsets.offsets.param->dmem.dp.offset; + if (size) { + ia_css_dp_encode((struct sh_css_isp_dp_params *) + &binary->mem_params.params[IA_CSS_PARAM_CLASS_PARAM][IA_CSS_ISP_DMEM].address[offset], + ¶ms->pipe_dp_config[pipe_id], size); + params->isp_params_changed = true; + params->isp_mem_params_changed[pipe_id][stage->stage_num][IA_CSS_ISP_DMEM] = true; + } + } if (params->config_changed[IA_CSS_MACC_ID] && binary->info->sp.enable.macc) { unsigned int i, j, idx; unsigned int idx_map[] = { @@ -4535,11 +4673,13 @@ sh_css_params_write_to_ddr_internal( /* Generate default DVS unity table on start up*/ if (params->pipe_dvs_6axis_config[pipe_id] == NULL) { - struct ia_css_resolution dvs_offset; - dvs_offset.width = + struct ia_css_resolution dvs_offset = {0, 0}; + if (binary->dvs_envelope.width || binary->dvs_envelope.height) { + dvs_offset.width = (PIX_SHIFT_FILTER_RUN_IN_X + binary->dvs_envelope.width) / 2; - dvs_offset.height = + dvs_offset.height = (PIX_SHIFT_FILTER_RUN_IN_Y + binary->dvs_envelope.height) / 2; + } params->pipe_dvs_6axis_config[pipe_id] = generate_dvs_6axis_table(&binary->out_frame_info[0].res, &dvs_offset); @@ -4723,8 +4863,8 @@ struct ia_css_shading_table *ia_css_get_shading_table(struct ia_css_stream *stre ia_css_shading_table_free(params->sc_config); params->sc_config = NULL; } - sh_css_params_shading_id_table_generate(¶ms->sc_config, binary); - + sh_css_params_shading_id_table_generate(¶ms->sc_config, + binary->sctbl_width_per_color, binary->sctbl_height); table = params->sc_config; /* The sc_config will be freed in the * ia_css_stream_isp_parameters_uninit function. */ @@ -4899,13 +5039,13 @@ free_ia_css_isp_parameter_set_info( continue; /* sanity check - ptr must be valid */ - if (!ia_css_refcount_is_valid(addrs[i])) { + if (ia_css_refcount_is_valid(addrs[i])) { + ia_css_refcount_decrement(IA_CSS_REFCOUNT_PARAM_BUFFER, addrs[i]); + } else { IA_CSS_ERROR("%s: IA_CSS_REFCOUNT_PARAM_BUFFER(0x%x) invalid arg", __func__, ptr); err = IA_CSS_ERR_INVALID_ARGUMENTS; continue; } - - ia_css_refcount_decrement(IA_CSS_REFCOUNT_PARAM_BUFFER, addrs[i]); } ia_css_refcount_decrement(IA_CSS_REFCOUNT_PARAM_SET_POOL, ptr); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.h index 8ffcbdf..037fd29 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_PARAMS_H_ #define _SH_CSS_PARAMS_H_ @@ -76,7 +77,17 @@ struct ia_css_isp_parameters { struct ia_css_cc_config rgb2yuv_cc_config; struct ia_css_tnr_config tnr_config; struct ia_css_ob_config ob_config; + /*----- DPC configuration -----*/ + /* The default DPC configuration is retained and currently set + * using the stream configuration. The code generated from genparams + * uses this configuration to set the DPC parameters per stage but this + * will be overwritten by the per pipe configuration */ struct ia_css_dp_config dp_config; + /* ------ pipe specific DPC configuration ------ */ + /* Please note that this implementation is a temporary solution and + * should be replaced by CSS per pipe configuration when the support + * is ready (HSD 1303967698)*/ + struct ia_css_dp_config pipe_dp_config[IA_CSS_PIPE_ID_NUM]; struct ia_css_nr_config nr_config; struct ia_css_ee_config ee_config; struct ia_css_de_config de_config; @@ -108,6 +119,7 @@ struct ia_css_isp_parameters { #if defined(IS_ISP_2500_SYSTEM) struct ia_css_2500_lin_kernel_config lin_2500_config; struct ia_css_2500_tnr_kernel_config tnr_2500_config; + struct ia_css_tnr3_kernel_config tnr3_config; #endif struct ia_css_dvs_6axis_config *pipe_dvs_6axis_config[IA_CSS_PIPE_ID_NUM]; /* ------ deprecated(bz675) : from ------ */ @@ -125,9 +137,18 @@ struct ia_css_isp_parameters { bool dvs2_coef_table_changed; bool morph_table_changed; bool sc_table_changed; +#if !defined(IS_ISP_2500_SYSTEM) + bool sc_table_dirty; + unsigned int sc_table_last_pipe_num; +#endif bool anr_thres_changed; /* ---- deprecated: replaced with pipe_dvs_6axis_config_changed ---- */ bool dvs_6axis_config_changed; + /* ------ pipe specific DPC configuration ------ */ + /* Please note that this implementation is a temporary solution and + * should be replaced by CSS per pipe configuration when the support + * is ready (HSD 1303967698) */ + bool pipe_dpc_config_changed[IA_CSS_PIPE_ID_NUM]; /* ------ deprecated(bz675) : from ------ */ bool shading_settings_changed; /* ------ deprecated(bz675) : to ------ */ @@ -164,6 +185,14 @@ ia_css_params_alloc_convert_sctbl( struct ia_css_isp_config * sh_css_pipe_isp_config_get(struct ia_css_pipe *pipe); +#if !defined(IS_ISP_2500_SYSTEM) +/* ipu address allocation/free for gdc lut */ +hrt_vaddress +sh_css_params_alloc_gdc_lut(void); +void +sh_css_params_free_gdc_lut(hrt_vaddress addr); +#endif + enum ia_css_err sh_css_params_map_and_store_default_gdc_lut(void); diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params_internal.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params_internal.h index baca245..f050b20 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params_internal.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_params_internal.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_PARAMS_INTERNAL_H_ #define _SH_CSS_PARAMS_INTERNAL_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_pipe.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_pipe.c index 1f57ffa..8c721ab 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_pipe.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_pipe.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_pipe.h and ia_css_pipe_public.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_properties.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_properties.c index ad46996..d66e14c 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_properties.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_properties.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_properties.h" #include #include "ia_css_types.h" diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_shading.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_shading.c index 2a2d0f4..6283226 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_shading.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_shading.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_shading.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.c index 86fe508..af3a43e 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "sh_css_sp.h" #if !defined(HAS_NO_INPUT_FORMATTER) @@ -63,7 +64,11 @@ #include "ia_css_isp_states.h" #if !defined(IS_ISP_2500_SYSTEM) /* This kernel is not used by SKC yet. */ -#include "isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h" +#include "isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h" +#endif + +#if defined(IS_ISP_2500_SYSTEM) +#include "product_specific.host.h" #endif struct sh_css_sp_group sh_css_sp_group; @@ -832,6 +837,8 @@ configure_isp_from_args( ia_css_output1_configure(binary, &args->out_vf_frame->info); ia_css_copy_output_configure(binary, args->copy_output); ia_css_output0_configure(binary, &args->out_frame[0]->info); + ia_css_sc_configure(binary, pipe->shading.internal_frame_origin_x_bqs_on_sctbl, + pipe->shading.internal_frame_origin_y_bqs_on_sctbl); #else /* Currently this is a 2500 only kernel */ ia_css_input_yuv_configure(pipe, binary, &args->in_frame->info); @@ -845,6 +852,11 @@ configure_isp_from_args( #if !defined(IS_ISP_2500_SYSTEM) ia_css_bayer_io_config(binary, args); #endif +#ifdef HAS_TNR3 + /* Remove support for TNR2 once TNR3 fully integrated */ + ia_css_tnr3_configure(binary, (const struct ia_css_frame **)args->tnr_frames); +#endif + } static void @@ -1021,16 +1033,18 @@ sh_css_sp_init_stage(struct ia_css_binary *binary, return err; #ifdef USE_INPUT_SYSTEM_VERSION_2401 - if (args->in_frame) { - pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num); - if (pipe == NULL) - return IA_CSS_ERR_INTERNAL_ERROR; - ia_css_get_crop_offsets(pipe, &args->in_frame->info); - } else if (&binary->in_frame_info) { - pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num); - if (pipe == NULL) - return IA_CSS_ERR_INTERNAL_ERROR; - ia_css_get_crop_offsets(pipe, &binary->in_frame_info); + if (stage == 0) { + if (args->in_frame) { + pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num); + if (pipe == NULL) + return IA_CSS_ERR_INTERNAL_ERROR; + ia_css_get_crop_offsets(pipe, &args->in_frame->info); + } else if (&binary->in_frame_info) { + pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num); + if (pipe == NULL) + return IA_CSS_ERR_INTERNAL_ERROR; + ia_css_get_crop_offsets(pipe, &binary->in_frame_info); + } } #else (void)pipe; /*avoid build warning*/ @@ -1193,11 +1207,13 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, enum sh_css_pipe_config_override copy_ovrd, enum ia_css_input_mode input_mode, const struct ia_css_metadata_config *md_config, - const struct ia_css_metadata_info *md_info + const struct ia_css_metadata_info *md_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , const mipi_port_ID_t port_id + const mipi_port_ID_t port_id, #endif - ) + const struct ia_css_coordinate *internal_frame_origin_bqs_on_sctbl, /* Origin of internal frame + positioned on shading table at shading correction in ISP. */ + const struct ia_css_isp_parameters *params) { /* Get first stage */ struct ia_css_pipeline_stage *stage = NULL; @@ -1315,6 +1331,20 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, } #endif + /* For the shading correction type 1 (the legacy shading table conversion in css is not used), + * the parameters are passed to the isp for the shading table centering. + */ + if (internal_frame_origin_bqs_on_sctbl != NULL && + params != NULL && params->shading_settings.enable_shading_table_conversion == 0) { + sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_x_bqs_on_sctbl + = (uint32_t)internal_frame_origin_bqs_on_sctbl->x; + sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_y_bqs_on_sctbl + = (uint32_t)internal_frame_origin_bqs_on_sctbl->y; + } else { + sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_x_bqs_on_sctbl = 0; + sh_css_sp_group.pipe[thread_id].shading.internal_frame_origin_y_bqs_on_sctbl = 0; + } + IA_CSS_LOG("pipe_id %d port_config %08x", pipe_id, sh_css_sp_group.pipe[thread_id].inout_port_config); @@ -1366,7 +1396,7 @@ sh_css_write_host2sp1_command(enum host2sp_commands host2sp_command) } #endif /* HAS_SEC_SP */ -void +bool sh_css_write_host2sp_command(enum host2sp_commands host2sp_command) { unsigned int HIVE_ADDR_host_sp_com = sh_css_sp_fw.info.sp.host_sp_com; @@ -1381,6 +1411,8 @@ sh_css_write_host2sp_command(enum host2sp_commands host2sp_command) IA_CSS_ERROR("last host command not handled by SP(%d)", last_cmd); store_sp_array_uint(host_sp_com, offset, host2sp_command); + + return (last_cmd == host2sp_cmd_ready); } enum host2sp_commands diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.h index 14d0b38..44b32ab 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_sp.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_SP_H_ #define _SH_CSS_SP_H_ @@ -62,16 +63,18 @@ sh_css_sp_init_pipeline(struct ia_css_pipeline *me, enum sh_css_pipe_config_override copy_ovrd, enum ia_css_input_mode input_mode, const struct ia_css_metadata_config *md_config, - const struct ia_css_metadata_info *md_info + const struct ia_css_metadata_info *md_info, #if !defined(HAS_NO_INPUT_SYSTEM) - , const mipi_port_ID_t port_id + const mipi_port_ID_t port_id, #endif - ); + const struct ia_css_coordinate *internal_frame_origin_bqs_on_sctbl, /* Origin of internal frame + positioned on shading table at shading correction in ISP. */ + const struct ia_css_isp_parameters *params); void sh_css_sp_uninit_pipeline(unsigned int pipe_num); -void +bool sh_css_write_host2sp_command(enum host2sp_commands host2sp_command); #if defined(HAS_SEC_SP) diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream.c index 60bddbb..567cc71 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,5 +12,6 @@ * more details. */ + /* This file will contain the code to implement the functions declared in ia_css_stream.h and associated helper functions */ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.c index 52d0a64..2aa5ace 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "sh_css_stream_format.h" #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.h index aab2b62..b8c2616 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_stream_format.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SH_CSS_STREAM_FORMAT_H #define __SH_CSS_STREAM_FORMAT_H diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_struct.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_struct.h index 3e5052d..aecbdc6 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_struct.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_struct.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef __SH_CSS_STRUCT_H #define __SH_CSS_STRUCT_H @@ -44,7 +45,6 @@ struct sh_css { void (*free)(void *ptr); void (*flush)(struct ia_css_acc_fw *fw); bool check_system_idle; - bool stop_copy_preview; unsigned int num_cont_raw_frames; #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) unsigned int num_mipi_frames[N_CSI_PORTS]; diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_uds.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_uds.h index 5ded3a1..2bcd589 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_uds.h +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_uds.h @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #ifndef _SH_CSS_UDS_H_ #define _SH_CSS_UDS_H_ diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_version.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_version.c index 7197f2f..9143178 100644 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_version.c +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css/sh_css_version.c @@ -1,6 +1,6 @@ /* * Support for Intel Camera Imaging ISP subsystem. - * Copyright (c) 2015, Intel Corporation. + * 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, @@ -12,6 +12,7 @@ * more details. */ + #include "ia_css_version.h" #include "ia_css_version_data.h" #include diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/sp_hrt.h deleted file mode 120000 index 19c96f8..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/var.h deleted file mode 120000 index 3a9c17b..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2400_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h deleted file mode 120000 index 51621c9..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/var.h deleted file mode 120000 index 1714a3e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_csi2p_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/sp_hrt.h deleted file mode 120000 index ad362a7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/var.h deleted file mode 120000 index e4918d5..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/css_2401_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2600_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2600_config.h deleted file mode 120000 index 4f08876..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2600_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2600_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2601_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2601_config.h deleted file mode 120000 index dd0478e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/hive_isp_css_include/host/isp2601_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2601_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 120000 index f130ad1..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 120000 index cce0a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 120000 index 106d93c..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 120000 index ed21313..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h deleted file mode 120000 index 170b295..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h deleted file mode 120000 index 9888a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h deleted file mode 120000 index c4f8da7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h deleted file mode 120000 index d533bf0..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h deleted file mode 120000 index f1d7034a..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h deleted file mode 120000 index 41fb58e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 120000 index 3e948ab..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 120000 index e469112..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c new file mode 120000 index 0000000..d92a368 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h new file mode 120000 index 0000000..7f60681 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h new file mode 120000 index 0000000..e59a110 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h new file mode 120000 index 0000000..c8ed858 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h new file mode 120000 index 0000000..fa50f0f --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h new file mode 120000 index 0000000..55e1d49 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h new file mode 120000 index 0000000..05d3613 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h new file mode 120000 index 0000000..50d7235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h new file mode 120000 index 0000000..f72b125 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h new file mode 120000 index 0000000..58ea786 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c new file mode 120000 index 0000000..ff5e095 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h new file mode 120000 index 0000000..e1eee12 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h new file mode 120000 index 0000000..e350ed1 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h new file mode 120000 index 0000000..0ab5235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c deleted file mode 120000 index 113b2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h deleted file mode 120000 index b3b9808..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h deleted file mode 120000 index 29fc2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h deleted file mode 120000 index cf285a4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h new file mode 120000 index 0000000..2e79117 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/sh_css_dvs_info.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/sh_css_dvs_info.h new file mode 120000 index 0000000..590d898 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2400b0_v21_build/css/sh_css_dvs_info.h @@ -0,0 +1 @@ +../../css/sh_css_dvs_info.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/sp_hrt.h deleted file mode 120000 index 19c96f8..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/var.h deleted file mode 120000 index 3a9c17b..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2400_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h deleted file mode 120000 index 51621c9..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/var.h deleted file mode 120000 index 1714a3e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_csi2p_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/sp_hrt.h deleted file mode 120000 index ad362a7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/var.h deleted file mode 120000 index e4918d5..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/css_2401_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2600_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2600_config.h deleted file mode 120000 index 4f08876..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2600_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2600_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2601_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2601_config.h deleted file mode 120000 index dd0478e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/hive_isp_css_include/host/isp2601_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2601_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 120000 index f130ad1..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 120000 index cce0a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 120000 index 106d93c..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 120000 index ed21313..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h deleted file mode 120000 index 170b295..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h deleted file mode 120000 index 9888a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h deleted file mode 120000 index c4f8da7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h deleted file mode 120000 index d533bf0..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h deleted file mode 120000 index f1d7034a..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h deleted file mode 120000 index 41fb58e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 120000 index 3e948ab..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 120000 index e469112..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c new file mode 120000 index 0000000..d92a368 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h new file mode 120000 index 0000000..7f60681 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h new file mode 120000 index 0000000..e59a110 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h new file mode 120000 index 0000000..c8ed858 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h new file mode 120000 index 0000000..fa50f0f --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h new file mode 120000 index 0000000..55e1d49 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h new file mode 120000 index 0000000..05d3613 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h new file mode 120000 index 0000000..50d7235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h new file mode 120000 index 0000000..f72b125 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h new file mode 120000 index 0000000..58ea786 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c new file mode 120000 index 0000000..ff5e095 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h new file mode 120000 index 0000000..e1eee12 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h new file mode 120000 index 0000000..e350ed1 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h new file mode 120000 index 0000000..0ab5235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c deleted file mode 120000 index 113b2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h deleted file mode 120000 index b3b9808..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h deleted file mode 120000 index 29fc2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h deleted file mode 120000 index cf285a4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h new file mode 120000 index 0000000..2e79117 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/sh_css_dvs_info.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/sh_css_dvs_info.h new file mode 120000 index 0000000..590d898 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_legacy_v21_build/css/sh_css_dvs_info.h @@ -0,0 +1 @@ +../../css/sh_css_dvs_info.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/sp_hrt.h deleted file mode 120000 index 19c96f8..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/var.h deleted file mode 120000 index 3a9c17b..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2400_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2400_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h deleted file mode 120000 index 51621c9..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/var.h deleted file mode 120000 index 1714a3e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_csi2p_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_csi2p_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/sp_hrt.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/sp_hrt.h deleted file mode 120000 index ad362a7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/sp_hrt.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/sp_hrt.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/var.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/var.h deleted file mode 120000 index e4918d5..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/css_2401_system/hrt/var.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/css_2401_system/hrt/var.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2600_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2600_config.h deleted file mode 120000 index 4f08876..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2600_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2600_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2601_config.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2601_config.h deleted file mode 120000 index dd0478e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/hive_isp_css_include/host/isp2601_config.h +++ /dev/null @@ -1 +0,0 @@ -../../../../css/hive_isp_css_include/host/isp2601_config.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c deleted file mode 120000 index f130ad1..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h deleted file mode 120000 index cce0a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h deleted file mode 120000 index 106d93c..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h deleted file mode 120000 index ed21313..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h deleted file mode 120000 index 170b295..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h deleted file mode 120000 index 9888a93..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/common/ia_css_common_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h deleted file mode 120000 index c4f8da7..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h deleted file mode 120000 index d533bf0..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h deleted file mode 120000 index f1d7034a..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h deleted file mode 120000 index 41fb58e..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h deleted file mode 120000 index 3e948ab..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h deleted file mode 120000 index e469112..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../../css/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c new file mode 120000 index 0000000..d92a368 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h new file mode 120000 index 0000000..7f60681 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h new file mode 120000 index 0000000..e59a110 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h new file mode 120000 index 0000000..c8ed858 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h new file mode 120000 index 0000000..fa50f0f --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h new file mode 120000 index 0000000..55e1d49 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h new file mode 120000 index 0000000..05d3613 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h new file mode 120000 index 0000000..50d7235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h new file mode 120000 index 0000000..f72b125 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h new file mode 120000 index 0000000..58ea786 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c new file mode 120000 index 0000000..ff5e095 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h new file mode 120000 index 0000000..e1eee12 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h new file mode 120000 index 0000000..e350ed1 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h new file mode 120000 index 0000000..0ab5235 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c deleted file mode 120000 index 113b2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.c +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.c \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h deleted file mode 120000 index b3b9808..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf.host.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf.host.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h deleted file mode 120000 index 29fc2c3..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_param.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_param.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h deleted file mode 120000 index cf285a4..0000000 --- a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/pdaf/ia_css_pdaf_types.h +++ /dev/null @@ -1 +0,0 @@ -../../../../../css/isp/kernels/pdaf/ia_css_pdaf_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h new file mode 120000 index 0000000..2e79117 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h @@ -0,0 +1 @@ +../../../../../../css/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h \ No newline at end of file diff --git a/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/sh_css_dvs_info.h b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/sh_css_dvs_info.h new file mode 120000 index 0000000..590d898 --- /dev/null +++ b/drivers/external_drivers/camera/drivers/media/pci/atomisp2/css2401a0_v21_build/css/sh_css_dvs_info.h @@ -0,0 +1 @@ +../../css/sh_css_dvs_info.h \ No newline at end of file -- 1.9.1