More atomisp fixes and cleanups
Subsystems (4)
v2 cover More atomisp fixes and cleanups
The first 20 patches on this series were already submitted, but I forgot to c/c linux-media. So, I'm just resending, without any changes. Most of them are working at the memory management abstraction, cleaning it, removing abstraction layers and getting rid of legacy stuff.
Patch 20 contains an important bug fix: the logic which configures the hardware pipelines add some "delay frames" that are NULL, causing the driver to crash when userspace selects a resolution different than the sensor resolution.
The other patches are other random cleanups, fixes and removal of some abstraction layers,.
-
It took me a lot of time debugging the OOPS, due to all the weirdness and abstractions with the mm/ allocation, plus the 4+ abstraction layers that it takes for the driver to actually do something.
We should try to get rid of at least some of the layers as soon as possible, as it takes a lot of time to debug certain things with all those layers.
Mauro Carvalho Chehab (35):
media: atomisp: simplify hive_isp_css_mm_hrt wrapper
media: atomisp: get rid of the hrt/hive_isp_css_mm_hrt abstraction
layer
media: atomisp: reduce abstraction at ia_css_memory_access
media: atomisp: go one step further to drop ia_css_memory_access.c
media: atomisp: get rid of mmgr_load and mmgr_store
media: atomisp: get rid of unused memory_realloc code
media: atomisp: change the type returned by mmgr alloc
media: atomisp: get rid of memory_access.c
media: atomisp: hmm_bo: untag user pointers
media: atomisp: add debug message to help debugging hmm code
media: atomisp: use Yocto Aero default hmm pool sizes
media: atomisp: get rid of a warning message
media: atomisp: fix driver caps
media: atomisp: use pin_user_pages() for memory allocation
media: atomisp: add debug for hmm alloc
media: atomisp: improve warning for IRQ enable function
media: atomisp: add debug functions for received events
media: atomisp: add more comments about frame allocation
media: atomisp: remove kvmalloc/kvcalloc abstractions
media: atomisp: avoid OOPS due to non-existing ref_frames
media: atomisp: avoid an extra memset() when alloc memory
media: atomisp: remove some trivial wrappers from compat css20
media: atomisp: do another round of coding style cleanup
media: atomisp: get rid of non-Linux error codes
media: atomisp: get rid of an error abstraction layer
media: atomisp: don't cause a warn if probe failed
media: atomisp: get rid of a bunch of other wrappers
media: atomisp: get rid of system_types.h
media: atomisp: provide more details about the firmware binaries
media: atomisp: print firmware data during load
media: atomisp: allow passing firmware name at modprobe time
media: atomisp: add a debug message at hmm free
media: atomisp: add some debug messages when binaries are used
media: atomisp: get rid of set_fs() dirty hacks
media: atomisp: add SPDX headers
Nathan Chancellor (6):
media: atomisp: Clean up if block in sh_css_sp_init_stage
media: atomisp: Remove second increment of count in
atomisp_subdev_probe
media: atomisp: Remove unnecessary NULL checks in
ia_css_pipe_load_extension
media: atomisp: Remove unnecessary NULL check in atomisp_param
media: atomisp: Avoid overflow in compute_blending
media: atomisp: Remove binary_supports_input_format
drivers/staging/media/atomisp/Kconfig | 1 + drivers/staging/media/atomisp/Makefile | 9 +- drivers/staging/media/atomisp/TODO | 7 +- drivers/staging/media/atomisp/i2c/Kconfig | 3 +- .../media/atomisp/i2c/atomisp-gc0310.c | 2 +- .../media/atomisp/i2c/atomisp-gc2235.c | 1 + .../atomisp/i2c/atomisp-libmsrlisthelper.c | 1 + .../media/atomisp/i2c/atomisp-lm3554.c | 1 + .../media/atomisp/i2c/atomisp-mt9m114.c | 1 + .../media/atomisp/i2c/atomisp-ov2680.c | 3 +- .../media/atomisp/i2c/atomisp-ov2722.c | 1 + drivers/staging/media/atomisp/i2c/gc0310.h | 1 + drivers/staging/media/atomisp/i2c/gc2235.h | 1 + drivers/staging/media/atomisp/i2c/mt9m114.h | 1 + drivers/staging/media/atomisp/i2c/ov2680.h | 3 + drivers/staging/media/atomisp/i2c/ov2722.h | 1 + .../staging/media/atomisp/i2c/ov5693/Kconfig | 1 + .../staging/media/atomisp/i2c/ov5693/ad5823.h | 1 + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 5 +- .../staging/media/atomisp/i2c/ov5693/ov5693.h | 1 + .../staging/media/atomisp/include/hmm/hmm.h | 8 +- .../media/atomisp/include/hmm/hmm_bo.h | 12 +- .../media/atomisp/include/hmm/hmm_common.h | 1 + .../media/atomisp/include/hmm/hmm_pool.h | 1 + .../media/atomisp/include/linux/atomisp.h | 5 +- .../include/linux/atomisp_gmin_platform.h | 1 + .../atomisp/include/linux/atomisp_platform.h | 1 + .../atomisp/include/linux/libmsrlisthelper.h | 1 + .../media/atomisp/include/media/lm3554.h | 1 + .../media/atomisp/include/mmu/isp_mmu.h | 1 + .../media/atomisp/include/mmu/sh_mmu_mrfld.h | 1 + .../staging/media/atomisp/pci/atomisp-regs.h | 1 + .../staging/media/atomisp/pci/atomisp_acc.c | 32 +- .../staging/media/atomisp/pci/atomisp_acc.h | 1 + .../staging/media/atomisp/pci/atomisp_cmd.c | 178 +- .../staging/media/atomisp/pci/atomisp_cmd.h | 1 + .../media/atomisp/pci/atomisp_common.h | 1 + .../media/atomisp/pci/atomisp_compat.h | 90 +- .../media/atomisp/pci/atomisp_compat_css20.c | 508 ++---- .../media/atomisp/pci/atomisp_compat_css20.h | 19 +- .../atomisp/pci/atomisp_compat_ioctl32.c | 90 +- .../atomisp/pci/atomisp_compat_ioctl32.h | 1 + .../staging/media/atomisp/pci/atomisp_csi2.c | 5 +- .../staging/media/atomisp/pci/atomisp_csi2.h | 1 + .../media/atomisp/pci/atomisp_dfs_tables.h | 1 + .../staging/media/atomisp/pci/atomisp_drvfs.c | 6 +- .../staging/media/atomisp/pci/atomisp_drvfs.h | 1 + .../staging/media/atomisp/pci/atomisp_file.c | 8 +- .../staging/media/atomisp/pci/atomisp_file.h | 1 + .../staging/media/atomisp/pci/atomisp_fops.c | 9 +- .../staging/media/atomisp/pci/atomisp_fops.h | 1 + .../media/atomisp/pci/atomisp_gmin_platform.c | 6 +- .../media/atomisp/pci/atomisp_helper.h | 1 + .../media/atomisp/pci/atomisp_internal.h | 1 + .../staging/media/atomisp/pci/atomisp_ioctl.c | 73 +- .../staging/media/atomisp/pci/atomisp_ioctl.h | 1 + .../media/atomisp/pci/atomisp_subdev.c | 9 +- .../media/atomisp/pci/atomisp_subdev.h | 1 + .../media/atomisp/pci/atomisp_tables.h | 1 + .../staging/media/atomisp/pci/atomisp_tpg.c | 1 + .../staging/media/atomisp/pci/atomisp_tpg.h | 1 + .../media/atomisp/pci/atomisp_trace_event.h | 1 + .../staging/media/atomisp/pci/atomisp_v4l2.c | 79 +- .../staging/media/atomisp/pci/atomisp_v4l2.h | 1 + .../base/circbuf/interface/ia_css_circbuf.h | 1 + .../circbuf/interface/ia_css_circbuf_comm.h | 1 + .../circbuf/interface/ia_css_circbuf_desc.h | 1 + .../atomisp/pci/base/circbuf/src/circbuf.c | 1 + .../base/refcount/interface/ia_css_refcount.h | 18 +- .../atomisp/pci/base/refcount/src/refcount.c | 34 +- drivers/staging/media/atomisp/pci/bits.h | 1 + .../pipe/interface/ia_css_pipe_binarydesc.h | 17 +- .../pipe/interface/ia_css_pipe_stagedesc.h | 1 + .../camera/pipe/interface/ia_css_pipe_util.h | 1 + .../pci/camera/pipe/src/pipe_binarydesc.c | 29 +- .../pci/camera/pipe/src/pipe_stagedesc.c | 1 + .../atomisp/pci/camera/pipe/src/pipe_util.c | 1 + .../pci/camera/util/interface/ia_css_util.h | 22 +- .../media/atomisp/pci/camera/util/src/util.c | 68 +- .../staging/media/atomisp/pci/cell_params.h | 1 + .../css_2400_system/hive/ia_css_isp_configs.c | 1 + .../css_2400_system/hive/ia_css_isp_params.c | 1 + .../css_2400_system/hive/ia_css_isp_states.c | 3 +- .../hrt/hive_isp_css_irq_types_hrt.h | 1 + .../hrt/isp2400_mamoiada_params.h | 1 + .../pci/css_2401_system/csi_rx_global.h | 1 + .../css_2401_system/hive/ia_css_isp_configs.c | 2 +- .../css_2401_system/hive/ia_css_isp_params.c | 1 + .../css_2401_system/hive/ia_css_isp_states.c | 3 +- .../atomisp/pci/css_2401_system/host/csi_rx.c | 1 + .../pci/css_2401_system/host/csi_rx_local.h | 1 + .../pci/css_2401_system/host/csi_rx_private.h | 1 + .../pci/css_2401_system/host/ibuf_ctrl.c | 1 + .../css_2401_system/host/ibuf_ctrl_local.h | 1 + .../css_2401_system/host/ibuf_ctrl_private.h | 1 + .../pci/css_2401_system/host/isys_dma.c | 1 + .../pci/css_2401_system/host/isys_dma_local.h | 1 + .../css_2401_system/host/isys_dma_private.h | 1 + .../pci/css_2401_system/host/isys_irq.c | 1 + .../pci/css_2401_system/host/isys_irq_local.h | 1 + .../css_2401_system/host/isys_irq_private.h | 1 + .../css_2401_system/host/isys_stream2mmio.c | 1 + .../host/isys_stream2mmio_local.h | 1 + .../host/isys_stream2mmio_private.h | 1 + .../pci/css_2401_system/host/pixelgen_local.h | 1 + .../css_2401_system/host/pixelgen_private.h | 1 + .../hrt/PixelGen_SysBlock_defs.h | 1 + .../pci/css_2401_system/hrt/ibuf_cntrl_defs.h | 1 + .../hrt/mipi_backend_common_defs.h | 1 + .../css_2401_system/hrt/mipi_backend_defs.h | 1 + .../pci/css_2401_system/hrt/rx_csi_defs.h | 1 + .../css_2401_system/hrt/stream2mmio_defs.h | 1 + .../pci/css_2401_system/ibuf_ctrl_global.h | 1 + .../pci/css_2401_system/isys_dma_global.h | 2 + .../pci/css_2401_system/isys_irq_global.h | 1 + .../css_2401_system/isys_stream2mmio_global.h | 1 + .../pci/css_2401_system/pixelgen_global.h | 1 + .../pci/css_receiver_2400_common_defs.h | 1 + .../atomisp/pci/css_receiver_2400_defs.h | 1 + drivers/staging/media/atomisp/pci/css_trace.h | 2 +- drivers/staging/media/atomisp/pci/defs.h | 1 + .../staging/media/atomisp/pci/dma_v2_defs.h | 1 + .../staging/media/atomisp/pci/gdc_v2_defs.h | 1 + .../staging/media/atomisp/pci/gp_timer_defs.h | 1 + .../media/atomisp/pci/gpio_block_defs.h | 1 + .../pci/hive_isp_css_2401_irq_types_hrt.h | 1 + .../pci/hive_isp_css_common/debug_global.h | 1 + .../pci/hive_isp_css_common/dma_global.h | 1 + .../hive_isp_css_common/event_fifo_global.h | 1 + .../hive_isp_css_common/fifo_monitor_global.h | 1 + .../pci/hive_isp_css_common/gdc_global.h | 1 + .../hive_isp_css_common/gp_device_global.h | 1 + .../pci/hive_isp_css_common/gp_timer_global.h | 1 + .../pci/hive_isp_css_common/gpio_global.h | 1 + .../pci/hive_isp_css_common/hmem_global.h | 1 + .../pci/hive_isp_css_common/host/debug.c | 17 +- .../hive_isp_css_common/host/debug_local.h | 1 + .../hive_isp_css_common/host/debug_private.h | 11 +- .../pci/hive_isp_css_common/host/dma.c | 1 + .../pci/hive_isp_css_common/host/dma_local.h | 1 + .../hive_isp_css_common/host/dma_private.h | 1 + .../pci/hive_isp_css_common/host/event_fifo.c | 1 + .../host/event_fifo_local.h | 1 + .../host/event_fifo_private.h | 1 + .../hive_isp_css_common/host/fifo_monitor.c | 1 + .../host/fifo_monitor_local.h | 1 + .../host/fifo_monitor_private.h | 1 + .../pci/hive_isp_css_common/host/gdc.c | 1 + .../pci/hive_isp_css_common/host/gdc_local.h | 1 + .../hive_isp_css_common/host/gdc_private.h | 1 + .../pci/hive_isp_css_common/host/gp_device.c | 1 + .../host/gp_device_local.h | 1 + .../host/gp_device_private.h | 1 + .../pci/hive_isp_css_common/host/gp_timer.c | 1 + .../hive_isp_css_common/host/gp_timer_local.h | 1 + .../host/gp_timer_private.h | 1 + .../pci/hive_isp_css_common/host/gpio_local.h | 1 + .../hive_isp_css_common/host/gpio_private.h | 1 + .../pci/hive_isp_css_common/host/hmem.c | 1 + .../pci/hive_isp_css_common/host/hmem_local.h | 1 + .../hive_isp_css_common/host/hmem_private.h | 1 + .../host/input_formatter.c | 1 + .../host/input_formatter_local.h | 1 + .../host/input_formatter_private.h | 1 + .../hive_isp_css_common/host/input_system.c | 1 + .../pci/hive_isp_css_common/host/irq.c | 1 + .../pci/hive_isp_css_common/host/irq_local.h | 1 + .../hive_isp_css_common/host/irq_private.h | 1 + .../pci/hive_isp_css_common/host/isp.c | 1 + .../pci/hive_isp_css_common/host/isp_local.h | 1 + .../hive_isp_css_common/host/isp_private.h | 1 + .../pci/hive_isp_css_common/host/mmu.c | 1 + .../pci/hive_isp_css_common/host/mmu_local.h | 1 + .../atomisp/pci/hive_isp_css_common/host/sp.c | 1 + .../pci/hive_isp_css_common/host/sp_local.h | 1 + .../pci/hive_isp_css_common/host/sp_private.h | 1 + .../pci/hive_isp_css_common/host/timed_ctrl.c | 1 + .../host/timed_ctrl_local.h | 1 + .../host/timed_ctrl_private.h | 1 + .../hive_isp_css_common/host/vamem_local.h | 1 + .../pci/hive_isp_css_common/host/vmem.c | 1 + .../pci/hive_isp_css_common/host/vmem_local.h | 1 + .../hive_isp_css_common/host/vmem_private.h | 1 + .../input_formatter_global.h | 3 +- .../pci/hive_isp_css_common/irq_global.h | 3 +- .../pci/hive_isp_css_common/isp_global.h | 3 +- .../pci/hive_isp_css_common/mmu_global.h | 1 + .../pci/hive_isp_css_common/sp_global.h | 3 +- .../hive_isp_css_common/timed_ctrl_global.h | 1 + .../pci/hive_isp_css_common/vamem_global.h | 1 + .../pci/hive_isp_css_common/vmem_global.h | 1 + .../media/atomisp/pci/hive_isp_css_defs.h | 1 + .../pci/hive_isp_css_include/assert_support.h | 1 + .../pci/hive_isp_css_include/bitop_support.h | 1 + .../atomisp/pci/hive_isp_css_include/csi_rx.h | 1 + .../atomisp/pci/hive_isp_css_include/debug.h | 1 + .../device_access/device_access.h | 3 +- .../atomisp/pci/hive_isp_css_include/dma.h | 1 + .../pci/hive_isp_css_include/error_support.h | 39 - .../pci/hive_isp_css_include/event_fifo.h | 1 + .../pci/hive_isp_css_include/fifo_monitor.h | 1 + .../pci/hive_isp_css_include/gdc_device.h | 1 + .../pci/hive_isp_css_include/gp_device.h | 1 + .../pci/hive_isp_css_include/gp_timer.h | 1 + .../atomisp/pci/hive_isp_css_include/gpio.h | 1 + .../atomisp/pci/hive_isp_css_include/hmem.h | 1 + .../hive_isp_css_include/host/csi_rx_public.h | 1 + .../hive_isp_css_include/host/debug_public.h | 8 +- .../hive_isp_css_include/host/dma_public.h | 3 +- .../host/event_fifo_public.h | 3 +- .../host/fifo_monitor_public.h | 3 +- .../hive_isp_css_include/host/gdc_public.h | 1 + .../host/gp_device_public.h | 3 +- .../host/gp_timer_public.h | 3 +- .../hive_isp_css_include/host/gpio_public.h | 3 +- .../hive_isp_css_include/host/hmem_public.h | 1 + .../host/ibuf_ctrl_public.h | 1 + .../host/input_formatter_public.h | 3 +- .../hive_isp_css_include/host/irq_public.h | 3 +- .../hive_isp_css_include/host/isp_public.h | 3 +- .../host/isys_dma_public.h | 3 +- .../host/isys_irq_public.h | 1 + .../hive_isp_css_include/host/isys_public.h | 1 + .../host/isys_stream2mmio_public.h | 1 + .../hive_isp_css_include/host/mmu_public.h | 3 +- .../host/pixelgen_public.h | 1 + .../pci/hive_isp_css_include/host/sp_public.h | 3 +- .../hive_isp_css_include/host/tag_public.h | 1 + .../host/timed_ctrl_public.h | 3 +- .../hive_isp_css_include/host/vamem_public.h | 1 + .../hive_isp_css_include/host/vmem_public.h | 1 + .../pci/hive_isp_css_include/ibuf_ctrl.h | 1 + .../hive_isp_css_include/input_formatter.h | 1 + .../pci/hive_isp_css_include/input_system.h | 1 + .../atomisp/pci/hive_isp_css_include/irq.h | 1 + .../atomisp/pci/hive_isp_css_include/isp.h | 1 + .../pci/hive_isp_css_include/isys_dma.h | 1 + .../pci/hive_isp_css_include/isys_irq.h | 1 + .../hive_isp_css_include/isys_stream2mmio.h | 1 + .../pci/hive_isp_css_include/math_support.h | 1 + .../memory_access/memory_access.h | 174 -- .../pci/hive_isp_css_include/memory_realloc.h | 38 - .../pci/hive_isp_css_include/misc_support.h | 1 + .../pci/hive_isp_css_include/mmu_device.h | 1 + .../pci/hive_isp_css_include/pixelgen.h | 1 + .../hive_isp_css_include/platform_support.h | 1 + .../pci/hive_isp_css_include/print_support.h | 1 + .../atomisp/pci/hive_isp_css_include/queue.h | 1 + .../pci/hive_isp_css_include/resource.h | 1 + .../atomisp/pci/hive_isp_css_include/sp.h | 1 + .../pci/hive_isp_css_include/string_support.h | 18 +- .../pci/hive_isp_css_include/system_types.h | 24 - .../atomisp/pci/hive_isp_css_include/tag.h | 1 + .../pci/hive_isp_css_include/timed_ctrl.h | 1 + .../pci/hive_isp_css_include/type_support.h | 1 + .../atomisp/pci/hive_isp_css_include/vamem.h | 1 + .../atomisp/pci/hive_isp_css_include/vmem.h | 1 + .../hive_isp_css_shared/host/queue_local.h | 1 + .../hive_isp_css_shared/host/queue_private.h | 1 + .../pci/hive_isp_css_shared/host/tag.c | 1 + .../pci/hive_isp_css_shared/host/tag_local.h | 1 + .../hive_isp_css_shared/host/tag_private.h | 1 + .../pci/hive_isp_css_shared/queue_global.h | 1 + .../pci/hive_isp_css_shared/sw_event_global.h | 1 + .../pci/hive_isp_css_shared/tag_global.h | 1 + ...hive_isp_css_streaming_to_mipi_types_hrt.h | 1 + .../staging/media/atomisp/pci/hive_types.h | 4 +- drivers/staging/media/atomisp/pci/hmm/hmm.c | 40 +- .../staging/media/atomisp/pci/hmm/hmm_bo.c | 154 +- .../media/atomisp/pci/hmm/hmm_dynamic_pool.c | 1 + .../media/atomisp/pci/hmm/hmm_reserved_pool.c | 1 + .../pci/hrt/hive_isp_css_custom_host_hrt.h | 1 + .../atomisp/pci/hrt/hive_isp_css_mm_hrt.c | 124 -- .../atomisp/pci/hrt/hive_isp_css_mm_hrt.h | 57 - drivers/staging/media/atomisp/pci/ia_css.h | 1 + drivers/staging/media/atomisp/pci/ia_css_3a.h | 3 +- .../media/atomisp/pci/ia_css_acc_types.h | 7 +- .../staging/media/atomisp/pci/ia_css_buffer.h | 1 + .../media/atomisp/pci/ia_css_control.h | 17 +- .../media/atomisp/pci/ia_css_device_access.c | 3 +- .../media/atomisp/pci/ia_css_device_access.h | 3 +- .../staging/media/atomisp/pci/ia_css_dvs.h | 5 +- .../staging/media/atomisp/pci/ia_css_env.h | 1 + .../staging/media/atomisp/pci/ia_css_err.h | 22 +- .../media/atomisp/pci/ia_css_event_public.h | 19 +- .../media/atomisp/pci/ia_css_firmware.h | 7 +- .../staging/media/atomisp/pci/ia_css_frac.h | 1 + .../media/atomisp/pci/ia_css_frame_format.h | 1 + .../media/atomisp/pci/ia_css_frame_public.h | 17 +- .../media/atomisp/pci/ia_css_host_data.h | 1 + .../media/atomisp/pci/ia_css_input_port.h | 1 + .../staging/media/atomisp/pci/ia_css_irq.h | 9 +- .../media/atomisp/pci/ia_css_isp_configs.h | 1 + .../media/atomisp/pci/ia_css_isp_params.h | 1 + .../media/atomisp/pci/ia_css_isp_states.h | 3 +- .../media/atomisp/pci/ia_css_memory_access.c | 85 - .../media/atomisp/pci/ia_css_metadata.h | 1 + .../staging/media/atomisp/pci/ia_css_mipi.h | 7 +- .../staging/media/atomisp/pci/ia_css_mmu.h | 1 + .../media/atomisp/pci/ia_css_mmu_private.h | 1 + .../staging/media/atomisp/pci/ia_css_morph.h | 1 + .../staging/media/atomisp/pci/ia_css_pipe.h | 5 +- .../media/atomisp/pci/ia_css_pipe_public.h | 73 +- .../staging/media/atomisp/pci/ia_css_prbs.h | 1 + .../media/atomisp/pci/ia_css_properties.h | 1 + .../media/atomisp/pci/ia_css_shading.h | 1 + .../staging/media/atomisp/pci/ia_css_stream.h | 3 +- .../media/atomisp/pci/ia_css_stream_format.h | 1 + .../media/atomisp/pci/ia_css_stream_public.h | 71 +- .../staging/media/atomisp/pci/ia_css_timer.h | 5 +- .../staging/media/atomisp/pci/ia_css_tpg.h | 1 + .../staging/media/atomisp/pci/ia_css_types.h | 2 +- .../media/atomisp/pci/ia_css_version.h | 3 +- .../media/atomisp/pci/ia_css_version_data.h | 1 + drivers/staging/media/atomisp/pci/if_defs.h | 1 + .../pci/input_formatter_subsystem_defs.h | 1 + .../media/atomisp/pci/input_selector_defs.h | 1 + .../atomisp/pci/input_switch_2400_defs.h | 1 + .../atomisp/pci/input_system_ctrl_defs.h | 1 + .../media/atomisp/pci/input_system_defs.h | 1 + .../media/atomisp/pci/input_system_global.h | 1 + .../media/atomisp/pci/input_system_local.h | 1 + .../media/atomisp/pci/input_system_private.h | 1 + .../media/atomisp/pci/input_system_public.h | 1 + .../media/atomisp/pci/irq_controller_defs.h | 1 + .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 1 + .../pci/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 1 + .../isp/kernels/aa/aa_2/ia_css_aa2_param.h | 1 + .../isp/kernels/aa/aa_2/ia_css_aa2_types.h | 1 + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 1 + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 1 + .../kernels/anr/anr_1.0/ia_css_anr_param.h | 1 + .../kernels/anr/anr_1.0/ia_css_anr_types.h | 1 + .../isp/kernels/anr/anr_2/ia_css_anr2.host.c | 1 + .../isp/kernels/anr/anr_2/ia_css_anr2.host.h | 1 + .../isp/kernels/anr/anr_2/ia_css_anr2_param.h | 3 +- .../anr/anr_2/ia_css_anr2_table.host.c | 1 + .../anr/anr_2/ia_css_anr2_table.host.h | 1 + .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 1 + .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 2 +- .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.h | 1 + .../pci/isp/kernels/bh/bh_2/ia_css_bh_param.h | 1 + .../pci/isp/kernels/bh/bh_2/ia_css_bh_types.h | 1 + .../pci/isp/kernels/bnlm/ia_css_bnlm.host.c | 3 +- .../pci/isp/kernels/bnlm/ia_css_bnlm.host.h | 1 + .../pci/isp/kernels/bnlm/ia_css_bnlm_param.h | 1 + .../pci/isp/kernels/bnlm/ia_css_bnlm_types.h | 1 + .../kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 1 + .../kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 1 + .../kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 1 + .../kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 1 + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 1 + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 1 + .../kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 1 + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 1 + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 1 + .../kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 1 + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 1 + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 1 + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 1 + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 1 + .../conversion_1.0/ia_css_conversion.host.c | 1 + .../conversion_1.0/ia_css_conversion.host.h | 1 + .../conversion_1.0/ia_css_conversion_param.h | 1 + .../conversion_1.0/ia_css_conversion_types.h | 1 + .../copy_output_1.0/ia_css_copy_output.host.c | 1 + .../copy_output_1.0/ia_css_copy_output.host.h | 1 + .../ia_css_copy_output_param.h | 1 + .../kernels/crop/crop_1.0/ia_css_crop.host.c | 1 + .../kernels/crop/crop_1.0/ia_css_crop.host.h | 1 + .../kernels/crop/crop_1.0/ia_css_crop_param.h | 1 + .../kernels/crop/crop_1.0/ia_css_crop_types.h | 1 + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 1 + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 1 + .../kernels/csc/csc_1.0/ia_css_csc_param.h | 1 + .../kernels/csc/csc_1.0/ia_css_csc_types.h | 1 + .../kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 1 + .../kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 1 + .../kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 1 + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 1 + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 1 + .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 1 + .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 1 + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 1 + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 1 + .../kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 1 + .../ctc/ctc_1.0/ia_css_ctc_table.host.c | 1 + .../ctc/ctc_1.0/ia_css_ctc_table.host.h | 1 + .../kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 1 + .../isp/kernels/de/de_1.0/ia_css_de.host.c | 1 + .../isp/kernels/de/de_1.0/ia_css_de.host.h | 1 + .../isp/kernels/de/de_1.0/ia_css_de_param.h | 1 + .../isp/kernels/de/de_1.0/ia_css_de_types.h | 1 + .../pci/isp/kernels/de/de_2/ia_css_de2.host.c | 1 + .../pci/isp/kernels/de/de_2/ia_css_de2.host.h | 1 + .../isp/kernels/de/de_2/ia_css_de2_param.h | 1 + .../isp/kernels/de/de_2/ia_css_de2_types.h | 1 + .../isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 1 + .../isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 1 + .../isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 1 + .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 1 + .../pci/isp/kernels/dpc2/ia_css_dpc2.host.c | 1 + .../pci/isp/kernels/dpc2/ia_css_dpc2.host.h | 1 + .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 1 + .../pci/isp/kernels/dpc2/ia_css_dpc2_types.h | 1 + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 14 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 5 +- .../kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 1 + .../kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 1 + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 1 + .../isp/kernels/eed1_8/ia_css_eed1_8.host.h | 1 + .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 1 + .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 1 + .../kernels/fc/fc_1.0/ia_css_formats.host.c | 1 + .../kernels/fc/fc_1.0/ia_css_formats.host.h | 1 + .../kernels/fc/fc_1.0/ia_css_formats_param.h | 1 + .../kernels/fc/fc_1.0/ia_css_formats_types.h | 1 + .../fixedbds_1.0/ia_css_fixedbds_param.h | 1 + .../fixedbds_1.0/ia_css_fixedbds_types.h | 1 + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 1 + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 1 + .../kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 1 + .../kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 1 + .../isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 1 + .../isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 1 + .../isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 1 + .../kernels/gc/gc_1.0/ia_css_gc_table.host.c | 1 + .../kernels/gc/gc_1.0/ia_css_gc_table.host.h | 1 + .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 1 + .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 1 + .../pci/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 1 + .../isp/kernels/gc/gc_2/ia_css_gc2_param.h | 1 + .../kernels/gc/gc_2/ia_css_gc2_table.host.c | 1 + .../kernels/gc/gc_2/ia_css_gc2_table.host.h | 1 + .../isp/kernels/gc/gc_2/ia_css_gc2_types.h | 1 + .../pci/isp/kernels/hdr/ia_css_hdr.host.c | 1 + .../pci/isp/kernels/hdr/ia_css_hdr.host.h | 1 + .../pci/isp/kernels/hdr/ia_css_hdr_param.h | 1 + .../pci/isp/kernels/hdr/ia_css_hdr_types.h | 1 + .../bayer_io_ls/ia_css_bayer_io.host.c | 1 + .../bayer_io_ls/ia_css_bayer_io.host.h | 1 + .../bayer_io_ls/ia_css_bayer_io_param.h | 1 + .../bayer_io_ls/ia_css_bayer_io_types.h | 1 + .../common/ia_css_common_io_param.h | 1 + .../common/ia_css_common_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 + .../iterator_1.0/ia_css_iterator.host.c | 5 +- .../iterator_1.0/ia_css_iterator.host.h | 3 +- .../iterator_1.0/ia_css_iterator_param.h | 1 + .../macc/macc1_5/ia_css_macc1_5.host.c | 1 + .../macc/macc1_5/ia_css_macc1_5.host.h | 1 + .../macc/macc1_5/ia_css_macc1_5_param.h | 3 +- .../macc/macc1_5/ia_css_macc1_5_table.host.c | 1 + .../macc/macc1_5/ia_css_macc1_5_table.host.h | 1 + .../macc/macc1_5/ia_css_macc1_5_types.h | 1 + .../kernels/macc/macc_1.0/ia_css_macc.host.c | 1 + .../kernels/macc/macc_1.0/ia_css_macc.host.h | 1 + .../kernels/macc/macc_1.0/ia_css_macc_param.h | 1 + .../macc/macc_1.0/ia_css_macc_table.host.c | 1 + .../macc/macc_1.0/ia_css_macc_table.host.h | 1 + .../kernels/macc/macc_1.0/ia_css_macc_types.h | 1 + .../kernels/norm/norm_1.0/ia_css_norm.host.c | 1 + .../kernels/norm/norm_1.0/ia_css_norm.host.h | 1 + .../kernels/norm/norm_1.0/ia_css_norm_param.h | 1 + .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.c | 1 + .../pci/isp/kernels/ob/ob2/ia_css_ob2.host.h | 1 + .../pci/isp/kernels/ob/ob2/ia_css_ob2_param.h | 1 + .../pci/isp/kernels/ob/ob2/ia_css_ob2_types.h | 1 + .../isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 1 + .../isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 1 + .../isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 1 + .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 1 + .../output/output_1.0/ia_css_output.host.c | 1 + .../output/output_1.0/ia_css_output.host.h | 1 + .../output/output_1.0/ia_css_output_param.h | 1 + .../output/output_1.0/ia_css_output_types.h | 1 + .../qplane/qplane_2/ia_css_qplane.host.c | 1 + .../qplane/qplane_2/ia_css_qplane.host.h | 1 + .../qplane/qplane_2/ia_css_qplane_param.h | 1 + .../qplane/qplane_2/ia_css_qplane_types.h | 1 + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 1 + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 1 + .../kernels/raw/raw_1.0/ia_css_raw_param.h | 1 + .../kernels/raw/raw_1.0/ia_css_raw_types.h | 1 + .../raw_aa_binning_1.0/ia_css_raa.host.c | 2 +- .../raw_aa_binning_1.0/ia_css_raa.host.h | 1 + .../isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 14 +- .../isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 1 + .../kernels/ref/ref_1.0/ia_css_ref_param.h | 5 +- .../kernels/ref/ref_1.0/ia_css_ref_state.h | 1 + .../kernels/ref/ref_1.0/ia_css_ref_types.h | 1 + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 1 + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 1 + .../kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 1 + .../kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 1 + .../isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 1 + .../isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 1 + .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 1 + .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 1 + .../sdis/common/ia_css_sdis_common.host.h | 5 +- .../sdis/common/ia_css_sdis_common_types.h | 1 + .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 28 +- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 3 +- .../kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 1 + .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 18 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.h | 3 +- .../kernels/sdis/sdis_2/ia_css_sdis2_types.h | 1 + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 1 + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 1 + .../kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 1 + .../kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 1 + .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 1 + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 1 + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 1 + .../kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 3 +- .../kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 1 + .../kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 1 + .../kernels/uds/uds_1.0/ia_css_uds_param.h | 1 + .../isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 25 +- .../isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 5 +- .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 1 + .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 1 + .../isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 1 + .../isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 1 + .../isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 1 + .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 1 + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 1 + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 1 + .../kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 1 + .../xnr/xnr_1.0/ia_css_xnr_table.host.c | 1 + .../xnr/xnr_1.0/ia_css_xnr_table.host.h | 1 + .../kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 1 + .../kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 3 +- .../kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 1 + .../kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 1 + .../kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 1 + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 1 + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 1 + .../kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 1 + .../kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 1 + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 1 + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 1 + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 1 + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 1 + .../pci/isp/modes/interface/input_buf.isp.h | 1 + .../pci/isp/modes/interface/isp_const.h | 1 + .../pci/isp/modes/interface/isp_types.h | 1 + .../atomisp/pci/isp2400_input_system_global.h | 1 + .../atomisp/pci/isp2400_input_system_local.h | 1 + .../pci/isp2400_input_system_private.h | 1 + .../atomisp/pci/isp2400_input_system_public.h | 1 + .../media/atomisp/pci/isp2400_support.h | 1 + .../media/atomisp/pci/isp2400_system_global.h | 1 + .../media/atomisp/pci/isp2400_system_local.h | 6 + .../atomisp/pci/isp2401_input_system_global.h | 1 + .../atomisp/pci/isp2401_input_system_local.h | 1 + .../pci/isp2401_input_system_private.h | 1 + .../atomisp/pci/isp2401_mamoiada_params.h | 1 + .../media/atomisp/pci/isp2401_system_global.h | 1 + .../media/atomisp/pci/isp2401_system_local.h | 6 + .../media/atomisp/pci/isp_acquisition_defs.h | 1 + .../media/atomisp/pci/isp_capture_defs.h | 1 + .../media/atomisp/pci/memory_realloc.c | 81 - .../staging/media/atomisp/pci/mmu/isp_mmu.c | 1 + .../media/atomisp/pci/mmu/sh_mmu_mrfld.c | 4 +- drivers/staging/media/atomisp/pci/mmu_defs.h | 1 + .../runtime/binary/interface/ia_css_binary.h | 15 +- .../atomisp/pci/runtime/binary/src/binary.c | 137 +- .../pci/runtime/bufq/interface/ia_css_bufq.h | 33 +- .../runtime/bufq/interface/ia_css_bufq_comm.h | 1 + .../media/atomisp/pci/runtime/bufq/src/bufq.c | 92 +- .../runtime/debug/interface/ia_css_debug.h | 5 +- .../debug/interface/ia_css_debug_internal.h | 1 + .../debug/interface/ia_css_debug_pipe.h | 1 + .../pci/runtime/debug/src/ia_css_debug.c | 6 +- .../runtime/event/interface/ia_css_event.h | 1 + .../atomisp/pci/runtime/event/src/event.c | 3 +- .../runtime/eventq/interface/ia_css_eventq.h | 9 +- .../atomisp/pci/runtime/eventq/src/eventq.c | 5 +- .../runtime/frame/interface/ia_css_frame.h | 11 +- .../frame/interface/ia_css_frame_comm.h | 5 +- .../atomisp/pci/runtime/frame/src/frame.c | 154 +- .../runtime/ifmtr/interface/ia_css_ifmtr.h | 3 +- .../atomisp/pci/runtime/ifmtr/src/ifmtr.c | 29 +- .../inputfifo/interface/ia_css_inputfifo.h | 1 + .../pci/runtime/inputfifo/src/inputfifo.c | 1 + .../isp_param/interface/ia_css_isp_param.h | 7 +- .../interface/ia_css_isp_param_types.h | 1 + .../pci/runtime/isp_param/src/isp_param.c | 32 +- .../pci/runtime/isys/interface/ia_css_isys.h | 13 +- .../runtime/isys/interface/ia_css_isys_comm.h | 1 + .../pci/runtime/isys/src/csi_rx_rmgr.c | 13 +- .../pci/runtime/isys/src/csi_rx_rmgr.h | 1 + .../pci/runtime/isys/src/ibuf_ctrl_rmgr.c | 1 + .../pci/runtime/isys/src/ibuf_ctrl_rmgr.h | 1 + .../pci/runtime/isys/src/isys_dma_rmgr.c | 1 + .../pci/runtime/isys/src/isys_dma_rmgr.h | 1 + .../atomisp/pci/runtime/isys/src/isys_init.c | 1 + .../runtime/isys/src/isys_stream2mmio_rmgr.c | 1 + .../runtime/isys/src/isys_stream2mmio_rmgr.h | 1 + .../media/atomisp/pci/runtime/isys/src/rx.c | 21 +- .../pci/runtime/isys/src/virtual_isys.c | 1 + .../pci/runtime/isys/src/virtual_isys.h | 1 + .../pipeline/interface/ia_css_pipeline.h | 29 +- .../interface/ia_css_pipeline_common.h | 1 + .../pci/runtime/pipeline/src/pipeline.c | 89 +- .../runtime/queue/interface/ia_css_queue.h | 31 +- .../queue/interface/ia_css_queue_comm.h | 1 + .../atomisp/pci/runtime/queue/src/queue.c | 45 +- .../pci/runtime/queue/src/queue_access.c | 28 +- .../pci/runtime/queue/src/queue_access.h | 4 +- .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 3 +- .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 8 +- .../media/atomisp/pci/runtime/rmgr/src/rmgr.c | 11 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 17 +- .../runtime/spctrl/interface/ia_css_spctrl.h | 11 +- .../spctrl/interface/ia_css_spctrl_comm.h | 1 + .../atomisp/pci/runtime/spctrl/src/spctrl.c | 42 +- .../tagger/interface/ia_css_tagger_common.h | 1 + .../atomisp/pci/runtime/timer/src/timer.c | 7 +- .../pci/scalar_processor_2400_params.h | 1 + drivers/staging/media/atomisp/pci/sh_css.c | 1621 ++++++++--------- .../staging/media/atomisp/pci/sh_css_defs.h | 4 +- .../media/atomisp/pci/sh_css_dvs_info.h | 1 + .../media/atomisp/pci/sh_css_firmware.c | 120 +- .../media/atomisp/pci/sh_css_firmware.h | 9 +- .../staging/media/atomisp/pci/sh_css_frac.h | 1 + .../media/atomisp/pci/sh_css_host_data.c | 5 +- .../staging/media/atomisp/pci/sh_css_hrt.c | 5 +- .../staging/media/atomisp/pci/sh_css_hrt.h | 3 +- .../media/atomisp/pci/sh_css_internal.h | 85 +- .../staging/media/atomisp/pci/sh_css_legacy.h | 7 +- .../media/atomisp/pci/sh_css_metadata.c | 1 + .../media/atomisp/pci/sh_css_metrics.c | 10 +- .../media/atomisp/pci/sh_css_metrics.h | 1 + .../staging/media/atomisp/pci/sh_css_mipi.c | 65 +- .../staging/media/atomisp/pci/sh_css_mipi.h | 9 +- .../staging/media/atomisp/pci/sh_css_mmu.c | 2 +- .../staging/media/atomisp/pci/sh_css_morph.c | 1 + .../media/atomisp/pci/sh_css_param_dvs.c | 46 +- .../media/atomisp/pci/sh_css_param_dvs.h | 1 + .../media/atomisp/pci/sh_css_param_shading.c | 8 +- .../media/atomisp/pci/sh_css_param_shading.h | 1 + .../staging/media/atomisp/pci/sh_css_params.c | 730 ++++---- .../staging/media/atomisp/pci/sh_css_params.h | 17 +- .../atomisp/pci/sh_css_params_internal.h | 1 + .../staging/media/atomisp/pci/sh_css_pipe.c | 1 + .../media/atomisp/pci/sh_css_properties.c | 1 + .../media/atomisp/pci/sh_css_shading.c | 1 + drivers/staging/media/atomisp/pci/sh_css_sp.c | 130 +- drivers/staging/media/atomisp/pci/sh_css_sp.h | 1 + .../staging/media/atomisp/pci/sh_css_stream.c | 1 + .../media/atomisp/pci/sh_css_stream_format.c | 1 + .../media/atomisp/pci/sh_css_stream_format.h | 1 + .../staging/media/atomisp/pci/sh_css_struct.h | 6 +- .../staging/media/atomisp/pci/sh_css_uds.h | 1 + .../media/atomisp/pci/sh_css_version.c | 7 +- .../staging/media/atomisp/pci/str2mem_defs.h | 1 + .../atomisp/pci/streaming_to_mipi_defs.h | 1 + .../staging/media/atomisp/pci/system_global.h | 1 + .../staging/media/atomisp/pci/system_local.h | 1 + .../media/atomisp/pci/timed_controller_defs.h | 1 + drivers/staging/media/atomisp/pci/version.h | 1 + 666 files changed, 3311 insertions(+), 3748 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h delete mode 100644 drivers/staging/media/atomisp/pci/ia_css_memory_access.c delete mode 100644 drivers/staging/media/atomisp/pci/memory_realloc.c
Signature · 1 line
2.26.2
PATCH v2 1/41 media: atomisp: simplify hive_isp_css_mm_hrt wrapper
The code there is a wrapper for hmm/ wrapper. Simplify it, and get rid of ION-specific code.
--- drivers/staging/media/atomisp/Makefile | 5 -- .../media/atomisp/include/hmm/hmm_bo.h | 9 --- .../staging/media/atomisp/pci/atomisp_acc.c | 2 +- .../staging/media/atomisp/pci/atomisp_ioctl.c | 35 --------- .../media/atomisp/pci/atomisp_subdev.c | 5 -- .../atomisp/pci/hrt/hive_isp_css_mm_hrt.c | 77 +++---------------- .../atomisp/pci/hrt/hive_isp_css_mm_hrt.h | 12 --- .../media/atomisp/pci/ia_css_memory_access.c | 1 - 8 files changed, 13 insertions(+), 133 deletions(-)
drivers/staging/media/atomisp/Makefile +0 -5
@@ -327,11 +327,6 @@ INCLUDES_cht += \ # -I$(atomisp)/pci/css_2401_system/hrt/ \ # -I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \ - -ifeq ($(CONFIG_ION),y) -INCLUDES += -I$(srctree)/drivers/staging/android/ion -endif - DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__ #DEFINES += -DUSE_DYNAMIC_BIN #DEFINES += -DISP_POWER_GATING
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +0 -9
@@ -77,9 +77,6 @@ enum hmm_bo_type {HMM_BO_PRIVATE ,HMM_BO_SHARE ,HMM_BO_USER , -#ifdef CONFIG_ION -HMM_BO_ION , -#endif HMM_BO_LAST, };
@@ -111,9 +108,6 @@ struct hmm_bo_device {/* list lock is used to protect the entire_bo_list */ spinlock_t list_lock; -#ifdef CONFIG_ION -struct ion_client *iclient; -#endif int flag;/* linked list for entire buffer object */
@@ -142,9 +136,6 @@ struct hmm_buffer_object {struct hmm_page_object *page_obj;/* physical pages */ int from_highmem;int mmap_count; -#ifdef CONFIG_ION -struct ion_handle *ihandle; -#endif int status;int mem_type;void *vmap_addr;/* kernel virtual address by vmap */
drivers/staging/media/atomisp/pci/atomisp_acc.c +1 -1
@@ -355,7 +355,7 @@ int atomisp_acc_map(struct atomisp_sub_device *asd, struct atomisp_acc_map *map) pgnr =DIV_ROUND_UP (map->length,PAGE_SIZE ); cssptr =hrt_isp_css_mm_alloc_user_ptr (map->length, map->user_ptr, - pgnr,HRT_USR_PTR , + pgnr, (map->flags &ATOMISP_MAP_FLAG_CACHED )); }else {/* Allocate private buffer. */
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +0 -35
@@ -1205,41 +1205,6 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) } attributes.pgnr = pgnr; - attributes.type =HRT_USR_PTR ; -#ifdef CONFIG_ION -if (!atomisp_hw_is_isp2401) { -if (buf->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE_ION ) - attributes.type =HRT_USR_ION ; - }else { -if (buf->type ==V4L2_BUF_TYPE_VIDEO_CAPTURE_ION ) { - attributes.type =HRT_USR_ION ; -if (asd->ion_dev_fd->val !=ION_FD_UNSET ) { -dev_dbg (isp->dev,"ION buffer queued, share_fd=%lddev_fd=%d.\n" , - buf->m.userptr, asd->ion_dev_fd->val); -/* -* Make sure the shared fd we just got -* from user space isn't larger than -* the space we have for it. -*/ -if ((buf->m.userptr & - (ATOMISP_ION_DEVICE_FD_MASK )) !=0 ) { -dev_err (isp->dev, -"Error: v4l2 buffer fd:0X%0lX > 0XFFFF.\n" , - buf->m.userptr); - ret = -EINVAL ; - goto error; - } - buf->m.userptr |= asd->ion_dev_fd->val << -ATOMISP_ION_DEVICE_FD_OFFSET ; - }else { -dev_err (isp->dev,"v4l2 buffer type is ION, \ -but no dev fd set from userspace.\n" ); - ret = -EINVAL ; - goto error; - } - } - } -#endif ret =atomisp_css_frame_map (&handle, &frame_info, (void __user *)buf->m.userptr,0 , &attributes);
drivers/staging/media/atomisp/pci/atomisp_subdev.c +0 -5
@@ -1223,11 +1223,6 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd) asd->select_isp_version =v4l2_ctrl_new_custom (&asd->ctrl_handler, &ctrl_select_isp_version,NULL ); -#if 0 /* #ifdef CONFIG_ION */ - asd->ion_dev_fd =v4l2_ctrl_new_custom (&asd->ctrl_handler, - &ctrl_ion_dev_fd, -NULL ); -#endif }/* Make controls visible on subdev as well. */
drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c +12 -65
97 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h +0 -12
@@ -25,27 +25,15 @@#define HRT_BUF_FLAG_CACHED BIT(0) -enum hrt_userptr_type { -HRT_USR_PTR =0 , -#ifdef CONFIG_ION -HRT_USR_ION , -#endif -}; -struct hrt_userbuffer_attr { -enum hrt_userptr_type type;unsigned int pgnr; }; -void hrt_isp_css_mm_set_user_ptr (void __user *userptr, -unsigned int num_pages,enum hrt_userptr_type ); -/* Allocate memory, returns a virtual address */ ia_css_ptr hrt_isp_css_mm_alloc (size_t bytes);ia_css_ptr hrt_isp_css_mm_alloc_user_ptr (size_t bytes,const void __user *userptr,unsigned int num_pages, -enum hrt_userptr_type ,bool cached);ia_css_ptr hrt_isp_css_mm_alloc_cached (size_t bytes);
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +0 -1
@@ -80,6 +80,5 @@ mmgr_mmap(const void __user *ptr, const size_t size,return hrt_isp_css_mm_alloc_user_ptr ( size, ptr, userbuffer_attr->pgnr, - userbuffer_attr->type, attribute &HRT_BUF_FLAG_CACHED ); }
Signature · 1 line
2.26.2
PATCH v2 2/41 media: atomisp: get rid of the hrt/hive_isp_css_mm_hrt abstraction layer
In reply to Mauro Carvalho ChehabSimplify the code by removing this extra memory management abstraction layer.
--- drivers/staging/media/atomisp/Makefile | 1 - .../staging/media/atomisp/pci/atomisp_acc.c | 24 ++++--- .../staging/media/atomisp/pci/atomisp_cmd.c | 2 +- .../media/atomisp/pci/atomisp_compat.h | 2 +- .../media/atomisp/pci/atomisp_compat_css20.c | 6 +- .../staging/media/atomisp/pci/atomisp_fops.c | 2 - .../staging/media/atomisp/pci/atomisp_ioctl.c | 7 +- .../staging/media/atomisp/pci/atomisp_v4l2.c | 2 - .../memory_access/memory_access.h | 2 +- .../atomisp/pci/hrt/hive_isp_css_mm_hrt.c | 71 ------------------- .../atomisp/pci/hrt/hive_isp_css_mm_hrt.h | 45 ------------ .../media/atomisp/pci/ia_css_frame_public.h | 2 +- .../media/atomisp/pci/ia_css_memory_access.c | 43 ++++++----- .../atomisp/pci/runtime/frame/src/frame.c | 4 +- 14 files changed, 50 insertions(+), 163 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c delete mode 100644 drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h
drivers/staging/media/atomisp/Makefile +0 -1
@@ -53,7 +53,6 @@ atomisp-objs += \ pci/hmm/hmm_dynamic_pool.o \ pci/hmm/hmm.o \ pci/hmm/hmm_reserved_pool.o \ - pci/hrt/hive_isp_css_mm_hrt.o \ pci/ia_css_device_access.o \ pci/ia_css_memory_access.o \ pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \
drivers/staging/media/atomisp/pci/atomisp_acc.c +15 -9
@@ -28,7 +28,6 @@#include "atomisp_compat.h" #include "atomisp_cmd.h" -#include "hrt/hive_isp_css_mm_hrt.h" #include "memory_access/memory_access.h" #include "ia_css.h"
@@ -353,16 +352,23 @@ int atomisp_acc_map(struct atomisp_sub_device *asd, struct atomisp_acc_map *map) } pgnr =DIV_ROUND_UP (map->length,PAGE_SIZE ); - cssptr =hrt_isp_css_mm_alloc_user_ptr (map->length, - map->user_ptr, - pgnr, - (map->flags &ATOMISP_MAP_FLAG_CACHED )); +if (pgnr < ((PAGE_ALIGN (map->length)) >>PAGE_SHIFT )) { +dev_err (atomisp_dev, +"user space memory size is less than the expected size..\n" ); +return -ENOMEM ; + }else if (pgnr > ((PAGE_ALIGN (map->length)) >>PAGE_SHIFT )) { +dev_err (atomisp_dev, +"user space memory size is large than the expected size..\n" ); +return -ENOMEM ; + } + + cssptr =hmm_alloc (map->length,HMM_BO_USER ,0 , map->user_ptr, + map->flags &ATOMISP_MAP_FLAG_CACHED ); + }else {/* Allocate private buffer. */ -if (map->flags &ATOMISP_MAP_FLAG_CACHED ) - cssptr =hrt_isp_css_mm_calloc_cached (map->length); -else - cssptr =hrt_isp_css_mm_calloc (map->length); + cssptr =hmm_alloc (map->length,HMM_BO_PRIVATE ,0 ,NULL , + map->flags &ATOMISP_MAP_FLAG_CACHED ); }if (!cssptr)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +1 -1
@@ -44,7 +44,7 @@#include "atomisp_subdev.h" #include "atomisp_dfs_tables.h" -#include "hrt/hive_isp_css_mm_hrt.h" +#include <hmm/hmm.h> #include "sh_css_hrt.h" #include "sh_css_defs.h"
drivers/staging/media/atomisp/pci/atomisp_compat.h +1 -1
@@ -261,7 +261,7 @@ void atomisp_css_frame_free(struct ia_css_frame *frame);int atomisp_css_frame_map (struct ia_css_frame **frame,const struct ia_css_frame_info *info,const void __user *data,uint16_t attribute, -void *context); +unsigned int pgnr);int atomisp_css_set_black_frame (struct atomisp_sub_device *asd,const struct ia_css_frame *raw_black_frame);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +2 -4
@@ -32,8 +32,6 @@#include "atomisp_ioctl.h" #include "atomisp_acc.h" -#include "hrt/hive_isp_css_mm_hrt.h" -#include <asm/intel-mid.h> #include "ia_css_debug.h"
@@ -2187,9 +2185,9 @@ void atomisp_css_frame_free(struct ia_css_frame *frame)int atomisp_css_frame_map (struct ia_css_frame **frame,const struct ia_css_frame_info *info,const void __user *data,uint16_t attribute, -void *context) +unsigned int pgnr) { -if (ia_css_frame_map (frame, info, data, attribute, context) +if (ia_css_frame_map (frame, info, data, attribute, pgnr) !=IA_CSS_SUCCESS )return -ENOMEM ;
drivers/staging/media/atomisp/pci/atomisp_fops.c +0 -2
@@ -34,8 +34,6 @@#include "atomisp-regs.h" #include "hmm/hmm.h" -#include "hrt/hive_isp_css_mm_hrt.h" -#include "type_support.h" #include "device_access/device_access.h" #include "memory_access/memory_access.h"
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +1 -6
@@ -39,8 +39,6 @@#include "device_access.h" #include "irq.h" -#include "hrt/hive_isp_css_mm_hrt.h" -static const char *DRIVER ="atomisp" ;/* max size 15 */ static const char *CARD ="ATOM ISP" ;/* max size 31 */
@@ -1183,8 +1181,6 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)* address and reprograme out page table properly */ if (buf->memory ==V4L2_MEMORY_USERPTR ) { -struct hrt_userbuffer_attr attributes; - vb = pipe->capq.bufs[buf->index]; vm_mem = vb->priv;if (!vm_mem) {
@@ -1204,10 +1200,9 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) goto error; } - attributes.pgnr = pgnr; ret =atomisp_css_frame_map (&handle, &frame_info, (void __user *)buf->m.userptr, -0 , &attributes); +0 , pgnr);if (ret) {dev_err (isp->dev,"Failed to map user buffer\n" ); goto error;
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -2
@@ -42,8 +42,6 @@#include "hmm/hmm.h" #include "atomisp_trace_event.h" -#include "hrt/hive_isp_css_mm_hrt.h" -#include "device_access.h" /* Timeouts to wait for all subdevs to be registered */
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h +1 -1
@@ -140,7 +140,7 @@ hrt_vaddress mmgr_mmap(const void __user *ptr, const size_t size, u16 attribute, - void *context); + unsigned int pgnr);/*! Zero initialise an allocation in memory
drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.c deleted +0 -71
71 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hrt/hive_isp_css_mm_hrt.h deleted +0 -45
45 lines not on this page · raw message
drivers/staging/media/atomisp/pci/ia_css_frame_public.h +1 -1
@@ -336,7 +336,7 @@ ia_css_frame_map(struct ia_css_frame **frame,const struct ia_css_frame_info *info, const void __user *data, u16 attribute, - void *context); + unsigned int pgnr);/* @brief Unmap a CSS frame structure. *
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +26 -17
64 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +2 -2
@@ -152,7 +152,7 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame,const struct ia_css_frame_info *info, const void __user *data, u16 attribute, - void *context) + unsigned int pgnr) { enum ia_css_err err = IA_CSS_SUCCESS;struct ia_css_frame *me;
@@ -169,7 +169,7 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame,/* use mmgr_mmap to map */ me->data = (ia_css_ptr )mmgr_mmap (data, me->data_bytes, - attribute, context); + attribute, pgnr);if (me->data == mmgr_NULL) err =IA_CSS_ERR_INVALID_ARGUMENTS ; }
Signature · 1 line
2.26.2
PATCH v2 3/41 media: atomisp: reduce abstraction at ia_css_memory_access
In reply to Mauro Carvalho ChehabYet another memory abstraction layer. Getting rid of this may be a little trickier, but let's reduce it to a minimal.
--- .../staging/media/atomisp/include/hmm/hmm.h | 3 - .../memory_access/memory_access.h | 61 +------------------ drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- .../media/atomisp/pci/ia_css_memory_access.c | 45 +------------- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../media/atomisp/pci/memory_realloc.c | 3 +- .../pci/runtime/debug/src/ia_css_debug.c | 2 +- .../atomisp/pci/runtime/frame/src/frame.c | 23 ++++--- .../pci/runtime/isp_param/src/isp_param.c | 2 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 2 +- .../media/atomisp/pci/sh_css_firmware.c | 2 +- .../staging/media/atomisp/pci/sh_css_params.c | 41 +++++++------ 14 files changed, 51 insertions(+), 143 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +0 -3
@@ -28,9 +28,6 @@#include "hmm/hmm_pool.h" #include "ia_css_types.h" -#define HMM_CACHED true -#define HMM_UNCACHED false -int hmm_pool_register (unsigned int pool_size,enum hmm_pool_type pool_type);void hmm_pool_unregister (enum hmm_pool_type pool_type);
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h +2 -59
77 lines not on this page · raw message
drivers/staging/media/atomisp/pci/hmm/hmm.c +1 -1
@@ -193,7 +193,7 @@ int hmm_init(void)* at the beginning, to avoid hmm_alloc return 0 in the * further allocation. */ - dummy_ptr =hmm_alloc (1 ,HMM_BO_PRIVATE ,0 ,NULL ,HMM_UNCACHED ); + dummy_ptr =hmm_alloc (1 ,HMM_BO_PRIVATE ,0 ,NULL , false);if (!ret) { ret = sysfs_create_group(&atomisp_dev->kobj,
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +2 -43
70 lines not on this page · raw message
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +1 -1
@@ -329,7 +329,7 @@ ia_css_isp_dvs_statistics_allocate( HIVE_ISP_DDR_WORD_BYTES); me->size = hor_size + ver_size; - me->data_ptr =mmgr_malloc (me->size); + me->data_ptr =mmgr_alloc_attr (me->size,0 );if (me->data_ptr == mmgr_NULL) goto err; me->hor_size = hor_size;
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +1 -1
@@ -295,7 +295,7 @@ ia_css_isp_dvs2_statistics_allocate( * grid->aligned_height *IA_CSS_DVS2_NUM_COEF_TYPES ; me->size =2 * size; - me->data_ptr =mmgr_malloc (me->size); + me->data_ptr =mmgr_alloc_attr (me->size,0 );if (me->data_ptr == mmgr_NULL) goto err; me->hor_proj = me->data_ptr;
drivers/staging/media/atomisp/pci/memory_realloc.c +1 -2
@@ -32,12 +32,11 @@ bool reallocate_buffer( enum ia_css_err *err) {bool ret; -u16 mmgr_attribute =MMGR_ATTRIBUTE_DEFAULT ;IA_CSS_ENTER_PRIVATE ("void" ); ret =realloc_isp_css_mm_buf (curr_buf, - curr_size, needed_size, force, err, mmgr_attribute); + curr_size, needed_size, force, err,0 );IA_CSS_LEAVE_PRIVATE ("ret=%d" , ret);return ret;
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +1 -1
@@ -2490,7 +2490,7 @@ void ia_css_debug_dump_perf_counters(void)void sh_css_init_ddr_debug_queue (void ) {hrt_vaddress ddr_debug_queue_addr = -mmgr_malloc (sizeof (debug_data_ddr_t)); +mmgr_alloc_attr (sizeof (debug_data_ddr_t),0 );const struct ia_css_fw_info *fw;unsigned int HIVE_ADDR_debug_buffer_ddr_address;
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +16 -7
@@ -19,6 +19,7 @@#include "isp.h" #include "sh_css_internal.h" #include "memory_access.h" +#include "atomisp_internal.h" #define NV12_TILEY_TILE_WIDTH 128#define NV12_TILEY_TILE_HEIGHT 32
@@ -96,7 +97,7 @@ ia_css_elems_bytes_from_info(void ia_css_frame_zero (struct ia_css_frame *frame) {assert (frame); -mmgr_clear (frame->data, frame->data_bytes); +hmm_set (frame->data,0 , frame->data_bytes); } enum ia_css_err ia_css_frame_allocate_from_info(struct ia_css_frame **frame,
@@ -166,10 +167,19 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame,return err;if (err ==IA_CSS_SUCCESS ) { -/* use mmgr_mmap to map */ - me->data = (ia_css_ptr )mmgr_mmap (data, - me->data_bytes, - attribute, pgnr); +if (pgnr < ((PAGE_ALIGN (me->data_bytes)) >>PAGE_SHIFT )) { +dev_err (atomisp_dev, +"user space memory size is less than the expected size..\n" ); +return -ENOMEM ; + }else if (pgnr > ((PAGE_ALIGN (me->data_bytes)) >>PAGE_SHIFT )) { +dev_err (atomisp_dev, +"user space memory size is large than the expected size..\n" ); +return -ENOMEM ; + } + +return hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data, + attribute &MMGR_ATTRIBUTE_CACHED ); +if (me->data == mmgr_NULL) err =IA_CSS_ERR_INVALID_ARGUMENTS ; }
@@ -789,8 +799,7 @@ static enum ia_css_err frame_allocate_buffer_data(struct ia_css_frame *frame)#endif frame->data =mmgr_alloc_attr (frame->data_bytes, frame->contiguous ? -MMGR_ATTRIBUTE_CONTIGUOUS : -MMGR_ATTRIBUTE_DEFAULT ); +MMGR_ATTRIBUTE_CONTIGUOUS :0 );if (frame->data == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +1 -1
@@ -127,7 +127,7 @@ ia_css_isp_param_allocate_isp_parameters( goto cleanup; }if (pclass !=IA_CSS_PARAM_CLASS_PARAM ) { - css_params->params[pclass][mem].address =mmgr_malloc (size); + css_params->params[pclass][mem].address =mmgr_alloc_attr (size,0 );if (!css_params->params[pclass][mem].address) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto cleanup;
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +2 -2
@@ -17,7 +17,7 @@#include <type_support.h> #include <assert_support.h> #include <platform_support.h> /* memset */ -#include <memory_access.h> /* mmmgr_malloc, mhmm_free */ +#include <memory_access.h> /* mmmgr_alloc_attr */ #include <ia_css_debug.h> /*
@@ -297,7 +297,7 @@ void ia_css_rmgr_acq_vbuf(struct ia_css_rmgr_vbuf_pool *pool, }if ((*handle)->vptr ==0x0 ) {/* we need to allocate */ - (*handle)->vptr =mmgr_malloc ((*handle)->size); + (*handle)->vptr =mmgr_alloc_attr ((*handle)->size,0 ); }else {/* we popped a buffer */ return ;
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +1 -1
@@ -63,7 +63,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id,* Data used to be stored separately, because of access alignment constraints, * fix the FW generation instead */ - code_addr =mmgr_malloc (spctrl_cfg->code_size); + code_addr =mmgr_alloc_attr (spctrl_cfg->code_size,0 );if (code_addr == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;mmgr_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size);
drivers/staging/media/atomisp/pci/sh_css_firmware.c +1 -1
@@ -322,7 +322,7 @@ void sh_css_unload_firmware(void)hrt_vaddress sh_css_load_blob (const unsigned char *blob,unsigned int size) { -hrt_vaddress target_addr =mmgr_malloc (size); +hrt_vaddress target_addr =mmgr_alloc_attr (size,0 );/* this will allocate memory aligned to a DDR word boundary which is required for the CSS DMA to read the instructions. */
drivers/staging/media/atomisp/pci/sh_css_params.c +21 -20
112 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 4/41 media: atomisp: go one step further to drop ia_css_memory_access.c
In reply to Mauro Carvalho ChehabMove the attrs handling into hmm, simplifying even further what the ia_css_memory_access.c file does.
Yet, the returned type for ia_css_memory_access.c is an integer, instead of a pointer.
--- .../staging/media/atomisp/include/hmm/hmm.h | 3 ++- .../media/atomisp/include/linux/atomisp.h | 2 ++ .../memory_access/memory_access.h | 3 --- drivers/staging/media/atomisp/pci/hmm/hmm.c | 11 ++++++++-- .../media/atomisp/pci/ia_css_memory_access.c | 21 +------------------ .../atomisp/pci/runtime/frame/src/frame.c | 4 ++-- .../staging/media/atomisp/pci/sh_css_params.c | 8 +++---- 7 files changed, 20 insertions(+), 32 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm.h +2 -1
@@ -35,7 +35,8 @@ int hmm_init(void);void hmm_cleanup (void );ia_css_ptr hmm_alloc (size_t bytes,enum hmm_bo_type type, -int from_highmem,const void __user *userptr,bool cached); +int from_highmem,const void __user *userptr, +const uint16_t attrs);void hmm_free (ia_css_ptr ptr);int hmm_load (ia_css_ptr virt,void *data,unsigned int bytes);int hmm_store (ia_css_ptr virt,const void *data,unsigned int bytes);
drivers/staging/media/atomisp/include/linux/atomisp.h +2 -0
@@ -917,6 +917,8 @@ struct atomisp_acc_map {#define ATOMISP_MAP_FLAG_NOFLUSH 0x0001/* Do not flush cache */ #define ATOMISP_MAP_FLAG_CACHED 0x0002/* Enable cache */ +#define ATOMISP_MAP_FLAG_CONTIGUOUS 0x0004 +#define ATOMISP_MAP_FLAG_CLEARED 0x0008struct atomisp_acc_state {__u32 flags;/* Flags, see list below */
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h +0 -3
@@ -76,9 +76,6 @@* within the allocation referencable from the * returned pointer/address. */ -#define MMGR_ATTRIBUTE_CACHED 0x0001 -#define MMGR_ATTRIBUTE_CONTIGUOUS 0x0002 -#define MMGR_ATTRIBUTE_CLEARED 0x0008#define mmgr_NULL ((hrt_vaddress)0)#define mmgr_EXCEPTION ((hrt_vaddress)-1)
drivers/staging/media/atomisp/pci/hmm/hmm.c +9 -2
@@ -193,7 +193,7 @@ int hmm_init(void)* at the beginning, to avoid hmm_alloc return 0 in the * further allocation. */ - dummy_ptr =hmm_alloc (1 ,HMM_BO_PRIVATE ,0 ,NULL , false); + dummy_ptr =hmm_alloc (1 ,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (!ret) { ret = sysfs_create_group(&atomisp_dev->kobj,
@@ -219,12 +219,16 @@ void hmm_cleanup(void) }ia_css_ptr hmm_alloc (size_t bytes,enum hmm_bo_type type, -int from_highmem,const void __user *userptr,bool cached) +int from_highmem,const void __user *userptr, +const uint16_t attrs) {unsigned int pgnr;struct hmm_buffer_object *bo; +bool cached = attrs &ATOMISP_MAP_FLAG_CACHED ;int ret; +WARN_ON (attrs &ATOMISP_MAP_FLAG_CONTIGUOUS ); +/* * Check if we are initialized. In the ideal world we wouldn't need * this but we can tackle it once the driver is a lot cleaner
@@ -258,6 +262,9 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, hmm_mem_stat.tol_cnt += pgnr; +if (attrs &ATOMISP_MAP_FLAG_CLEARED ) +hmm_set (bo->start,0 , bytes); +return bo->start; bind_err:
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +1 -20
@@ -12,30 +12,11 @@* more details. */ -#include <type_support.h> -#include <system_types.h> -#include <assert_support.h> #include <memory_access.h> -#include <ia_css_env.h> - -#include "atomisp_internal.h" hrt_vaddress mmgr_alloc_attr (const size_t size,const uint16_t attrs) { -ia_css_ptr data; - -WARN_ON (attrs &MMGR_ATTRIBUTE_CONTIGUOUS ); - - data =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL , - attrs &MMGR_ATTRIBUTE_CACHED ); - -if (!data) -return 0 ; - -if (attrs &MMGR_ATTRIBUTE_CLEARED ) -hmm_set (data,0 , size); - -return (ia_css_ptr )data; +return hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL , attrs); }void mmgr_load (const hrt_vaddress vaddr,void *data,const size_t size)
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +2 -2
@@ -178,7 +178,7 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame, }return hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data, - attribute &MMGR_ATTRIBUTE_CACHED ); + attribute &ATOMISP_MAP_FLAG_CACHED );if (me->data == mmgr_NULL) err =IA_CSS_ERR_INVALID_ARGUMENTS ;
@@ -799,7 +799,7 @@ static enum ia_css_err frame_allocate_buffer_data(struct ia_css_frame *frame)#endif frame->data =mmgr_alloc_attr (frame->data_bytes, frame->contiguous ? -MMGR_ATTRIBUTE_CONTIGUOUS :0 ); +ATOMISP_MAP_FLAG_CONTIGUOUS :0 );if (frame->data == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
drivers/staging/media/atomisp/pci/sh_css_params.c +4 -4
@@ -3267,11 +3267,11 @@ sh_css_params_init(void) { xmem_sp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 ,mmgr_alloc_attr (sizeof (struct sh_css_sp_stage ), -MMGR_ATTRIBUTE_CLEARED )); +ATOMISP_MAP_FLAG_CLEARED )); xmem_isp_stage_ptrs[p][i] =ia_css_refcount_increment (-1 ,mmgr_alloc_attr (sizeof (struct sh_css_sp_stage ), -MMGR_ATTRIBUTE_CLEARED )); +ATOMISP_MAP_FLAG_CLEARED ));if ((xmem_sp_stage_ptrs[p][i] == mmgr_NULL) || (xmem_isp_stage_ptrs[p][i] == mmgr_NULL)) {
@@ -3290,10 +3290,10 @@ sh_css_params_init(void) { sp_ddr_ptrs =ia_css_refcount_increment (-1 ,mmgr_alloc_attr (CEIL_MUL (sizeof (struct sh_css_ddr_address_map ),HIVE_ISP_DDR_WORD_BYTES ), -MMGR_ATTRIBUTE_CLEARED )); +ATOMISP_MAP_FLAG_CLEARED )); xmem_sp_group_ptrs =ia_css_refcount_increment (-1 ,mmgr_alloc_attr (sizeof (struct sh_css_sp_group ), -MMGR_ATTRIBUTE_CLEARED )); +ATOMISP_MAP_FLAG_CLEARED ));if ((sp_ddr_ptrs == mmgr_NULL) || (xmem_sp_group_ptrs == mmgr_NULL))
Signature · 1 line
2.26.2
PATCH v2 5/41 media: atomisp: get rid of mmgr_load and mmgr_store
In reply to Mauro Carvalho ChehabThose functions are just wrappers for hmm_load/hmm_store.
--- .../pci/hive_isp_css_common/host/debug.c | 8 +++--- .../hive_isp_css_common/host/debug_private.h | 8 +++--- .../memory_access/memory_access.h | 20 ------------- drivers/staging/media/atomisp/pci/hmm/hmm.c | 18 +++++++++++- .../media/atomisp/pci/ia_css_memory_access.c | 13 --------- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 2 +- .../pci/runtime/isp_param/src/isp_param.c | 2 +- .../pci/runtime/queue/src/queue_access.c | 8 +++--- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 2 +- drivers/staging/media/atomisp/pci/sh_css.c | 12 ++++---- .../media/atomisp/pci/sh_css_firmware.c | 2 +- .../staging/media/atomisp/pci/sh_css_params.c | 28 +++++++++---------- 13 files changed, 54 insertions(+), 71 deletions(-)
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c +4 -4
@@ -48,13 +48,13 @@ void debug_buffer_ddr_init(const hrt_vaddress addr)u32 tail =0 ;/* set the ddr queue */ debug_buffer_ddr_address = addr; -mmgr_store (addr +DEBUG_DATA_BUF_MODE_DDR_ADDR , +hmm_store (addr +DEBUG_DATA_BUF_MODE_DDR_ADDR , &mode,sizeof (debug_buf_mode_t)); -mmgr_store (addr +DEBUG_DATA_HEAD_DDR_ADDR , +hmm_store (addr +DEBUG_DATA_HEAD_DDR_ADDR , &head,sizeof (uint32_t )); -mmgr_store (addr +DEBUG_DATA_TAIL_DDR_ADDR , +hmm_store (addr +DEBUG_DATA_TAIL_DDR_ADDR , &tail,sizeof (uint32_t )); -mmgr_store (addr +DEBUG_DATA_ENABLE_DDR_ADDR , +hmm_store (addr +DEBUG_DATA_ENABLE_DDR_ADDR , &enable,sizeof (uint32_t ));/* set the local copy */
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h +4 -4
@@ -101,22 +101,22 @@ STORAGE_CLASS_DEBUG_C void debug_synch_queue_ddr(void) {u32 remote_tail; -mmgr_load (debug_buffer_ddr_address +DEBUG_DATA_TAIL_DDR_ADDR , &remote_tail, +hmm_load (debug_buffer_ddr_address +DEBUG_DATA_TAIL_DDR_ADDR , &remote_tail,sizeof (uint32_t ));/* We could move the remote head after the upload, but we would have to limit the upload w.r.t. the local head. This is easier */ if (remote_tail > debug_data_ptr->tail) {size_t delta = remote_tail - debug_data_ptr->tail; -mmgr_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR + +hmm_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR + debug_data_ptr->tail *sizeof (uint32_t ), (void *)&debug_data_ptr->buf[debug_data_ptr->tail], delta *sizeof (uint32_t )); }else if (remote_tail < debug_data_ptr->tail) {size_t delta =DEBUG_BUF_SIZE - debug_data_ptr->tail; -mmgr_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR + +hmm_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR + debug_data_ptr->tail *sizeof (uint32_t ), (void *)&debug_data_ptr->buf[debug_data_ptr->tail], delta *sizeof (uint32_t )); -mmgr_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR , +hmm_load (debug_buffer_ddr_address +DEBUG_DATA_BUF_DDR_ADDR , (void *)&debug_data_ptr->buf[0 ], remote_tail *sizeof (uint32_t )); }/* else we are up to date */
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h +0 -20
@@ -91,24 +91,4 @@hrt_vaddress mmgr_alloc_attr (const size_t size,const uint16_t attribute); -/*! Read an array of bytes from a virtual memory address - -\param vaddr[in] Address of an allocation -\param data[out] pointer to the destination array -\param size[in] number of bytes to read - -\return none -*/ -void mmgr_load (const hrt_vaddress vaddr,void *data,const size_t size); - -/*! 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 - -\return none -*/ -void mmgr_store (const hrt_vaddress vaddr,const void *data,const size_t size); -#endif /* __MEMORY_ACCESS_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/hmm/hmm.c +17 -1
@@ -403,9 +403,14 @@ static int load_and_flush(ia_css_ptr virt, void *data, unsigned int bytes)/* Read function in ISP memory management */ int hmm_load (ia_css_ptr virt,void *data,unsigned int bytes) { +if (!virt) { +dev_warn (atomisp_dev, +"hmm_store: address is NULL\n" ); +return -EINVAL ; + }if (!data) {dev_err (atomisp_dev, -"hmm_load NULL argument\n" ); +"hmm_store: data is a NULL argument\n" );return -EINVAL ; }return load_and_flush (virt, data, bytes);
@@ -425,6 +430,17 @@ int hmm_store(ia_css_ptr virt, const void *data, unsigned int bytes)char *src, *des;int ret; +if (!virt) { +dev_warn (atomisp_dev, +"hmm_store: address is NULL\n" ); +return -EINVAL ; + } +if (!data) { +dev_err (atomisp_dev, +"hmm_store: data is a NULL argument\n" ); +return -EINVAL ; + } + bo =hmm_bo_device_search_in_range (&bo_device, virt); ret =hmm_check_bo (bo, virt);if (ret)
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +0 -13
@@ -18,16 +18,3 @@ hrt_vaddress mmgr_alloc_attr(const size_t size, const uint16_t attrs) {return hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL , attrs); } - -void mmgr_load (const hrt_vaddress vaddr,void *data,const size_t size) -{ -if (vaddr && data) -hmm_load (vaddr, data, size); -} - -void -mmgr_store (const hrt_vaddress vaddr,const void *data,const size_t size) -{ -if (vaddr && data) -hmm_store (vaddr, data, size); -}
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +1 -1
@@ -249,7 +249,7 @@ ia_css_get_dvs_statistics( map =ia_css_isp_dvs_statistics_map_allocate (isp_stats,NULL );if (map) { -mmgr_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size); +hmm_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size);ia_css_translate_dvs_statistics (host_stats, map);ia_css_isp_dvs_statistics_map_free (map); }else
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +1 -1
@@ -189,7 +189,7 @@ ia_css_get_dvs2_statistics( map =ia_css_isp_dvs_statistics_map_allocate (isp_stats,NULL );if (map) { -mmgr_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size); +hmm_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size);ia_css_translate_dvs2_statistics (host_stats, map);ia_css_isp_dvs_statistics_map_free (map); }else
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +1 -1
@@ -194,7 +194,7 @@ ia_css_isp_param_copy_isp_mem_if_to_ddr(return IA_CSS_ERR_INTERNAL_ERROR ;if (!size)continue ; -mmgr_store (ddr_mem_ptr, host_mem_ptr, size); +hmm_store (ddr_mem_ptr, host_mem_ptr, size); }return IA_CSS_SUCCESS ; }
drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c +4 -4
@@ -63,7 +63,7 @@ int ia_css_queue_load( }else if (rdesc->location ==IA_CSS_QUEUE_LOC_HOST ) {/* doing DMA transfer of entire structure */ -mmgr_load (rdesc->desc.remote.cb_desc_addr, +hmm_load (rdesc->desc.remote.cb_desc_addr, (void *)cb_desc,sizeof (ia_css_circbuf_desc_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {
@@ -110,7 +110,7 @@ int ia_css_queue_store( cb_desc->step); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_HOST ) {/* doing DMA transfer of entire structure */ -mmgr_store (rdesc->desc.remote.cb_desc_addr, +hmm_store (rdesc->desc.remote.cb_desc_addr, (void *)cb_desc,sizeof (ia_css_circbuf_desc_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {
@@ -136,7 +136,7 @@ int ia_css_queue_item_load( item, sizeof(ia_css_circbuf_elem_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_HOST ) { -mmgr_load (rdesc->desc.remote.cb_elems_addr +hmm_load (rdesc->desc.remote.cb_elems_addr + position *sizeof (ia_css_circbuf_elem_t), (void *)item,sizeof (ia_css_circbuf_elem_t));
@@ -163,7 +163,7 @@ int ia_css_queue_item_store( item, sizeof(ia_css_circbuf_elem_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_HOST ) { -mmgr_store (rdesc->desc.remote.cb_elems_addr +hmm_store (rdesc->desc.remote.cb_elems_addr + position *sizeof (ia_css_circbuf_elem_t), (void *)item,sizeof (ia_css_circbuf_elem_t));
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +1 -1
@@ -66,7 +66,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id, code_addr =mmgr_alloc_attr (spctrl_cfg->code_size,0 );if (code_addr == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; -mmgr_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size); +hmm_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size);if (sizeof (hrt_vaddress) >sizeof (hrt_data)) { ia_css_debug_dtrace(IA_CSS_DEBUG_ERROR,
drivers/staging/media/atomisp/pci/sh_css.c +6 -6
@@ -4312,7 +4312,7 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe,return IA_CSS_ERR_INTERNAL_ERROR ; } -mmgr_store (h_vbuf->vptr, +hmm_store (h_vbuf->vptr, (void *)(&ddr_buffer),sizeof (struct sh_css_hmm_buffer )); if ((buf_type == IA_CSS_BUFFER_TYPE_3A_STATISTICS)
@@ -4471,7 +4471,7 @@ ia_css_pipe_dequeue_buffer(struct ia_css_pipe *pipe, ddr_buffer_addr, buf_type);if (hmm_buffer_record) {/* valid hmm_buffer_record found. Save the kernel_ptr -* for validation after performing mmgr_load. The +* for validation after performing hmm_load. The * vbuf handle and buffer_record can be released. */ kernel_ptr = hmm_buffer_record->kernel_ptr;
@@ -4484,7 +4484,7 @@ ia_css_pipe_dequeue_buffer(struct ia_css_pipe *pipe,return IA_CSS_ERR_INTERNAL_ERROR ; } -mmgr_load (ddr_buffer_addr, +hmm_load (ddr_buffer_addr, &ddr_buffer,sizeof (struct sh_css_hmm_buffer ));
@@ -10849,10 +10849,10 @@ ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe,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], +hmm_load (sp_group.pipe[thread_id].sp_stage_addr[stage_num], &sp_stage,sizeof (struct sh_css_sp_stage )); -mmgr_load (sp_stage.isp_stage_addr, +hmm_load (sp_stage.isp_stage_addr, &isp_stage,sizeof (struct sh_css_isp_stage ));for (mem =0 ; mem <N_IA_CSS_ISP_MEMORIES ; mem++) {
@@ -10868,7 +10868,7 @@ ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe, isp_seg->params[IA_CSS_PARAM_CLASS_PARAM ][mem].size; } -mmgr_store (sp_stage.isp_stage_addr, +hmm_store (sp_stage.isp_stage_addr, &isp_stage,sizeof (struct sh_css_isp_stage )); } }
drivers/staging/media/atomisp/pci/sh_css_firmware.c +1 -1
@@ -328,6 +328,6 @@ sh_css_load_blob(const unsigned char *blob, unsigned int size)assert (blob);if (target_addr) -mmgr_store (target_addr, blob, size); +hmm_store (target_addr, blob, size);return target_addr; }
drivers/staging/media/atomisp/pci/sh_css_params.c +14 -14
@@ -1521,7 +1521,7 @@ sh_css_set_black_frame(struct ia_css_stream *stream,int ofs = y * width + x;for (k =0 ; k <ISP_VEC_NELEMS ; k +=2 ) { -mmgr_load (ptr, (void *)(&data),sizeof (int )); +hmm_load (ptr, (void *)(&data),sizeof (int )); params->fpn_config.data[ofs +2 * k] = (short )(data &0xFFFF ); params->fpn_config.data[ofs + 2 * k + 2] =
@@ -1529,7 +1529,7 @@ sh_css_set_black_frame(struct ia_css_stream *stream, ptr +=sizeof (int );/* byte system address */ }for (k =0 ; k <ISP_VEC_NELEMS ; k +=2 ) { -mmgr_load (ptr, (void *)(&data),sizeof (int )); +hmm_load (ptr, (void *)(&data),sizeof (int )); params->fpn_config.data[ofs +2 * k +1 ] = (short )(data &0xFFFF ); params->fpn_config.data[ofs + 2 * k + 3] =
@@ -1620,7 +1620,7 @@ ia_css_params_store_ia_css_host_data(IA_CSS_ENTER_PRIVATE ("" ); -mmgr_store (ddr_addr, +hmm_store (ddr_addr, (void *)(data->address), (size_t )data->size);
@@ -2133,7 +2133,7 @@ ia_css_get_3a_statistics(struct ia_css_3a_statistics *host_stats, map =ia_css_isp_3a_statistics_map_allocate (isp_stats,NULL );if (map) { -mmgr_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size); +hmm_load (isp_stats->data_ptr, map->data_ptr, isp_stats->size);ia_css_translate_3a_statistics (host_stats, map);ia_css_isp_3a_statistics_map_free (map); }else
@@ -3368,7 +3368,7 @@ enum ia_css_err ia_css_pipe_set_bci_scaler_lut(struct ia_css_pipe *pipe, }else {gdc_lut_convert_to_isp_format ((const int (*)[HRT_GDC_N ])lut, interleaved_lut_temp); -mmgr_store (pipe->scaler_pp_lut, +hmm_store (pipe->scaler_pp_lut, (int *)interleaved_lut_temp,sizeof (zoom_table)); }
@@ -3411,7 +3411,7 @@ enum ia_css_err sh_css_params_map_and_store_default_gdc_lut(void)gdc_lut_convert_to_isp_format ((const int (*)[HRT_GDC_N ])zoom_table, interleaved_lut_temp); -mmgr_store (default_gdc_lut, (int *)interleaved_lut_temp, +hmm_store (default_gdc_lut, (int *)interleaved_lut_temp,sizeof (zoom_table));IA_CSS_LEAVE_PRIVATE ("lut(%u) err=%d" , default_gdc_lut, err);
@@ -3656,7 +3656,7 @@ static void sh_css_update_isp_params_to_ddr(assert (params); -mmgr_store (ddr_ptr, ¶ms->uds, size); +hmm_store (ddr_ptr, ¶ms->uds, size);IA_CSS_LEAVE_PRIVATE ("void" ); }
@@ -3672,7 +3672,7 @@ static void sh_css_update_isp_mem_params_to_ddr( params =ia_css_isp_param_get_mem_init (&binary->mem_params,IA_CSS_PARAM_CLASS_PARAM , mem); -mmgr_store (ddr_mem_ptr, params->address, size); +hmm_store (ddr_mem_ptr, params->address, size);IA_CSS_LEAVE_PRIVATE ("void" ); }
@@ -4176,7 +4176,7 @@ sh_css_params_write_to_ddr_internal(IA_CSS_LEAVE_ERR_PRIVATE (err);return err; } -mmgr_store (ddr_map->macc_tbl, +hmm_store (ddr_map->macc_tbl, converted_macc_table.data,sizeof (converted_macc_table.data)); }
@@ -4461,7 +4461,7 @@ struct ia_css_shading_table *ia_css_get_shading_table(struct ia_css_streamhrt_vaddress sh_css_store_sp_group_to_ddr (void ) {IA_CSS_ENTER_LEAVE_PRIVATE ("void" ); -mmgr_store (xmem_sp_group_ptrs, +hmm_store (xmem_sp_group_ptrs, &sh_css_sp_group,sizeof (struct sh_css_sp_group ));return xmem_sp_group_ptrs;
@@ -4472,7 +4472,7 @@ hrt_vaddress sh_css_store_sp_stage_to_ddr( unsigned int stage) {IA_CSS_ENTER_LEAVE_PRIVATE ("void" ); -mmgr_store (xmem_sp_stage_ptrs[pipe][stage], +hmm_store (xmem_sp_stage_ptrs[pipe][stage], &sh_css_sp_stage,sizeof (struct sh_css_sp_stage ));return xmem_sp_stage_ptrs[pipe][stage];
@@ -4483,7 +4483,7 @@ hrt_vaddress sh_css_store_isp_stage_to_ddr( unsigned int stage) {IA_CSS_ENTER_LEAVE_PRIVATE ("void" ); -mmgr_store (xmem_isp_stage_ptrs[pipe][stage], +hmm_store (xmem_isp_stage_ptrs[pipe][stage], &sh_css_isp_stage,sizeof (struct sh_css_isp_stage ));return xmem_isp_stage_ptrs[pipe][stage];
@@ -4545,7 +4545,7 @@ static enum ia_css_err write_ia_css_isp_parameter_set_info_to_ddr( mmgr_alloc_attr(sizeof(struct ia_css_isp_parameter_set_info), 0)); succ = (*out != mmgr_NULL);if (succ) -mmgr_store (*out, +hmm_store (*out, me,sizeof (struct ia_css_isp_parameter_set_info ));else err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -4574,7 +4574,7 @@ free_ia_css_isp_parameter_set_info(return err; } -mmgr_load (ptr, &isp_params_info.mem_map,sizeof (struct sh_css_ddr_address_map )); +hmm_load (ptr, &isp_params_info.mem_map,sizeof (struct sh_css_ddr_address_map ));/* copy map using size info */ for (i =0 ; i < (sizeof (struct sh_css_ddr_address_map_size ) /sizeof (size_t )); i++)
Signature · 1 line
2.26.2
PATCH v2 6/41 media: atomisp: get rid of unused memory_realloc code
In reply to Mauro Carvalho ChehabThe code for it is commented out, probably because it is broken or uneeded for the driver to work. So, let's get rid of it.
--- drivers/staging/media/atomisp/Makefile | 1 - .../pci/hive_isp_css_include/memory_realloc.h | 38 --------- .../media/atomisp/pci/memory_realloc.c | 80 ------------------- .../staging/media/atomisp/pci/sh_css_params.c | 4 +- 4 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h delete mode 100644 drivers/staging/media/atomisp/pci/memory_realloc.c
drivers/staging/media/atomisp/Makefile +0 -1
@@ -115,7 +115,6 @@ atomisp-objs += \ pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.o \ pci/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.o \ pci/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.o \ - pci/memory_realloc.o \ pci/mmu/isp_mmu.o \ pci/mmu/sh_mmu_mrfld.o \ pci/runtime/binary/src/binary.o \
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_realloc.h deleted +0 -38
@@ -1,38 +0,0 @@ -/** -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 __MEMORY_REALLOC_H_INCLUDED__ -#define __MEMORY_REALLOC_H_INCLUDED__ - -/*! -* \brief -* Define the internal reallocation of private css memory -* -*/ - -#include <type_support.h> -/* -* User provided file that defines the (sub)system address types: -* - hrt_vaddress a type that can hold the (sub)system virtual address range -*/ -#include "system_types.h" -#include "ia_css_err.h" - -bool reallocate_buffer ( -hrt_vaddress *curr_buf, -size_t *curr_size, -size_t needed_size, -bool force, -enum ia_css_err *err); - -#endif /*__MEMORY_REALLOC_H_INCLUDED__*/
drivers/staging/media/atomisp/pci/memory_realloc.c deleted +0 -80
80 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_params.c +1 -3
@@ -46,9 +46,7 @@#include "ia_css_pipeline.h" #include "ia_css_debug.h" #include "memory_access.h" -#if 0 /* FIXME */ -#include "memory_realloc.h" -#endif +#include "ia_css_isp_param.h" #include "ia_css_isp_params.h" #include "ia_css_mipi.h"
Signature · 1 line
2.26.2
PATCH v2 7/41 media: atomisp: change the type returned by mmgr alloc
In reply to Mauro Carvalho ChehabThe mmgr alloc code returns a different type than hmm, due to some abstraction layer.
Change the driver to use just one type to represent the hmm memory.
--- .../base/refcount/interface/ia_css_refcount.h | 13 ++-- .../atomisp/pci/base/refcount/src/refcount.c | 14 ++-- .../pci/hive_isp_css_common/host/debug.c | 4 +- .../hive_isp_css_include/host/debug_public.h | 5 +- .../memory_access/memory_access.h | 10 +-- .../staging/media/atomisp/pci/hive_types.h | 3 - .../media/atomisp/pci/ia_css_memory_access.c | 2 +- .../staging/media/atomisp/pci/ia_css_pipe.h | 2 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 2 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 2 +- .../kernels/ref/ref_1.0/ia_css_ref_param.h | 4 +- .../kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 2 +- .../pci/runtime/debug/src/ia_css_debug.c | 2 +- .../frame/interface/ia_css_frame_comm.h | 4 +- .../isp_param/interface/ia_css_isp_param.h | 2 +- .../pci/runtime/isp_param/src/isp_param.c | 4 +- .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 3 +- .../runtime/spctrl/interface/ia_css_spctrl.h | 2 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 10 +-- drivers/staging/media/atomisp/pci/sh_css.c | 8 +- .../media/atomisp/pci/sh_css_firmware.c | 4 +- .../media/atomisp/pci/sh_css_firmware.h | 2 +- .../media/atomisp/pci/sh_css_internal.h | 76 +++++++++---------- .../staging/media/atomisp/pci/sh_css_params.c | 76 +++++++++---------- .../staging/media/atomisp/pci/sh_css_params.h | 12 +-- drivers/staging/media/atomisp/pci/sh_css_sp.c | 4 +- .../staging/media/atomisp/pci/sh_css_struct.h | 2 +- 27 files changed, 137 insertions(+), 137 deletions(-)
drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h +7 -6
@@ -18,8 +18,9 @@#include <type_support.h> #include <system_types.h> #include <ia_css_err.h> +#include <ia_css_types.h> -typedef void (*clear_func )(hrt_vaddress ptr); +typedef void (*clear_func )(ia_css_ptr ptr);/*! \brief Function for initializing refcount list *
@@ -38,9 +39,9 @@ void ia_css_refcount_uninit(void);* * \param[in] id ID of the object. * \param[in] ptr Data of the object (ptr). -* \return hrt_vaddress (saved address) +* \return ia_css_ptr (saved address) */ -hrt_vaddress ia_css_refcount_increment (s32 id,hrt_vaddress ptr); +ia_css_ptr ia_css_refcount_increment (s32 id,ia_css_ptr ptr);/*! \brief Function for decrease reference by 1. *
@@ -50,7 +51,7 @@ hrt_vaddress ia_css_refcount_increment(s32 id, hrt_vaddress ptr);* - true, if it is successful. * - false, otherwise. */ -bool ia_css_refcount_decrement (s32 id,hrt_vaddress ptr); +bool ia_css_refcount_decrement (s32 id,ia_css_ptr ptr);/*! \brief Function to check if reference count is 1. *
@@ -59,7 +60,7 @@ bool ia_css_refcount_decrement(s32 id, hrt_vaddress ptr);* - true, if it is successful. * - false, otherwise. */ -bool ia_css_refcount_is_single (hrt_vaddress ptr); +bool ia_css_refcount_is_single (ia_css_ptr ptr);/*! \brief Function to clear reference list objects. *
@@ -78,6 +79,6 @@ void ia_css_refcount_clear(s32 id,* - true, if valid * - false, if invalid */ -bool ia_css_refcount_is_valid (hrt_vaddress ptr); +bool ia_css_refcount_is_valid (ia_css_ptr ptr);#endif /* _IA_CSS_REFCOUNT_H_ */
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +7 -7
@@ -23,10 +23,10 @@#include "ia_css_debug.h" /* TODO: enable for other memory aswell -now only for hrt_vaddress */ +now only for ia_css_ptr */ struct ia_css_refcount_entry {u32 count; -hrt_vaddress data; +ia_css_ptr data;s32 id; };
@@ -37,7 +37,7 @@ struct ia_css_refcount_list {static struct ia_css_refcount_list myrefcount; -static struct ia_css_refcount_entry *refcount_find_entry (hrt_vaddress ptr, +static struct ia_css_refcount_entry *refcount_find_entry (ia_css_ptr ptr,bool firstfree) {u32 i;
@@ -121,7 +121,7 @@ void ia_css_refcount_uninit(void) "ia_css_refcount_uninit() leave\n"); } -hrt_vaddress ia_css_refcount_increment (s32 id,hrt_vaddress ptr) +ia_css_ptr ia_css_refcount_increment (s32 id,ia_css_ptr ptr) {struct ia_css_refcount_entry *entry;
@@ -158,7 +158,7 @@ hrt_vaddress ia_css_refcount_increment(s32 id, hrt_vaddress ptr)return ptr; } -bool ia_css_refcount_decrement (s32 id,hrt_vaddress ptr) +bool ia_css_refcount_decrement (s32 id,ia_css_ptr ptr) {struct ia_css_refcount_entry *entry;
@@ -201,7 +201,7 @@ bool ia_css_refcount_decrement(s32 id, hrt_vaddress ptr)return false; } -bool ia_css_refcount_is_single (hrt_vaddress ptr) +bool ia_css_refcount_is_single (ia_css_ptr ptr) {struct ia_css_refcount_entry *entry;
@@ -262,7 +262,7 @@ void ia_css_refcount_clear(s32 id, clear_func clear_func_ptr) count); } -bool ia_css_refcount_is_valid (hrt_vaddress ptr) +bool ia_css_refcount_is_valid (ia_css_ptr ptr) {struct ia_css_refcount_entry *entry;
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c +2 -2
@@ -27,7 +27,7 @@/* The address of the remote copy */ hrt_address debug_buffer_address = (hrt_address) -1 ; -hrt_vaddress debug_buffer_ddr_address = (hrt_vaddress)-1 ; +ia_css_ptr debug_buffer_ddr_address = (ia_css_ptr)-1 ;/* The local copy */ static debug_data_t debug_data;debug_data_t *debug_data_ptr = &debug_data;
@@ -40,7 +40,7 @@ void debug_buffer_init(const hrt_address addr) debug_data.tail =0 ; } -void debug_buffer_ddr_init (const hrt_vaddress addr) +void debug_buffer_ddr_init (const ia_css_ptr addr) {debug_buf_mode_t mode =DEBUG_BUFFER_MODE_LINEAR ;u32 enable =1 ;
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h +3 -2
@@ -16,6 +16,7 @@#define __DEBUG_PUBLIC_H_INCLUDED__#include <type_support.h> +#include <ia_css_types.h> #include "system_types.h" /*! brief
@@ -42,7 +43,7 @@ typedef struct debug_data_ddr_s debug_data_ddr_t;extern debug_data_t *debug_data_ptr;extern hrt_address debug_buffer_address; -extern hrt_vaddress debug_buffer_ddr_address; +extern ia_css_ptr debug_buffer_ddr_address;/*! Check the empty state of the local debug data buffer
@@ -86,7 +87,7 @@ void debug_buffer_init(\return none */ void debug_buffer_ddr_init ( -const hrt_vaddress addr); +const ia_css_ptr addr);/*! Set the (remote) operating mode of the debug buffer
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h +5 -5
@@ -22,7 +22,7 @@* those defined in <stdint.h> * * The address representation is private to the system -* and represented as "hrt_vaddress" rather than a +* and represented as "ia_css_ptr" rather than a * pointer, as the memory allocation cannot be accessed * by dereferencing but reaquires load and store access * functions
@@ -49,7 +49,7 @@/* * User provided file that defines the (sub)system address types: -* - hrt_vaddress a type that can hold the (sub)system virtual address range +* - ia_css_ptr a type that can hold the (sub)system virtual address range */ #include "system_types.h"
@@ -77,8 +77,8 @@* returned pointer/address. */ -#define mmgr_NULL ((hrt_vaddress)0) -#define mmgr_EXCEPTION ((hrt_vaddress)-1) +#define mmgr_NULL ((ia_css_ptr)0) +#define mmgr_EXCEPTION ((ia_css_ptr)-1)/*! Return the address of an allocation in memory
@@ -89,6 +89,6 @@\return vaddress */ -hrt_vaddress mmgr_alloc_attr (const size_t size,const uint16_t attribute); +ia_css_ptr mmgr_alloc_attr (const size_t size,const uint16_t attribute);#endif /* __MEMORY_ACCESS_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/hive_types.h +0 -3
@@ -78,9 +78,6 @@ typedef hive_uint32 hrt_address;#error adddres width not supported#endif -/* The SP side representation of an HMM virtual address */ -typedef hive_uint32 hrt_vaddress ; -/* use 64 bit addresses in simulation, where possible */ typedef hive_uint64 hive_sim_address ;
drivers/staging/media/atomisp/pci/ia_css_memory_access.c +1 -1
@@ -14,7 +14,7 @@#include <memory_access.h> -hrt_vaddress mmgr_alloc_attr (const size_t size,const uint16_t attrs) +ia_css_ptr mmgr_alloc_attr (const size_t size,const uint16_t attrs) {return hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL , attrs); }
drivers/staging/media/atomisp/pci/ia_css_pipe.h +1 -1
@@ -146,7 +146,7 @@ struct ia_css_pipe {struct ia_css_capture_settings capture;struct ia_css_yuvpp_settings yuvpp; } pipe_settings; -hrt_vaddress scaler_pp_lut; +ia_css_ptr scaler_pp_lut;struct osys_object *osys_obj;/* This number is unique per pipe each instance of css. This number is
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +1 -1
@@ -275,7 +275,7 @@ store_dvs_6axis_config(const struct ia_css_dvs_6axis_config *dvs_6axis_config, const struct ia_css_binary *binary, const struct ia_css_frame_info *dvs_in_frame_info, - hrt_vaddress ddr_addr_y) { + ia_css_ptr ddr_addr_y) { struct ia_css_host_data *me;assert (dvs_6axis_config);
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h +1 -1
@@ -55,6 +55,6 @@ store_dvs_6axis_config(const struct ia_css_dvs_6axis_config *dvs_6axis_config, const struct ia_css_binary *binary, const struct ia_css_frame_info *dvs_in_frame_info, - hrt_vaddress ddr_addr_y); + ia_css_ptr ddr_addr_y);#endif /* __IA_CSS_DVS_HOST_H */
drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref_param.h +2 -2
@@ -28,8 +28,8 @@ struct ia_css_ref_configuration {struct sh_css_isp_ref_isp_config {u32 width_a_over_b;struct dma_port_config port_b; -hrt_vaddress ref_frame_addr_y[MAX_NUM_VIDEO_DELAY_FRAMES ]; -hrt_vaddress ref_frame_addr_c[MAX_NUM_VIDEO_DELAY_FRAMES ]; +ia_css_ptr ref_frame_addr_y[MAX_NUM_VIDEO_DELAY_FRAMES ]; +ia_css_ptr ref_frame_addr_c[MAX_NUM_VIDEO_DELAY_FRAMES ];u32 dvs_frame_delay; };
drivers/staging/media/atomisp/pci/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h +1 -1
@@ -34,7 +34,7 @@ struct sh_css_isp_tnr_isp_config {u32 width_a_over_b;u32 frame_height;struct dma_port_config port_b; - hrt_vaddress tnr_frame_addr[NUM_TNR_FRAMES]; + ia_css_ptr tnr_frame_addr[NUM_TNR_FRAMES]; };#endif /* __IA_CSS_TNR_PARAM_H */
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +1 -1
@@ -2489,7 +2489,7 @@ void ia_css_debug_dump_perf_counters(void)void sh_css_init_ddr_debug_queue (void ) { -hrt_vaddress ddr_debug_queue_addr = +ia_css_ptr ddr_debug_queue_addr =mmgr_alloc_attr (sizeof (debug_data_ddr_t),0 );const struct ia_css_fw_info *fw;unsigned int HIVE_ADDR_debug_buffer_ddr_address;
drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h +2 -2
@@ -18,7 +18,7 @@#include "type_support.h" #include "platform_support.h" #include "runtime/bufq/interface/ia_css_bufq_comm.h" -#include <system_types.h> /* hrt_vaddress */ +#include <system_types.h> /* ia_css_ptr */ /* * These structs are derived from structs defined in ia_css_types.h
@@ -83,7 +83,7 @@ struct ia_css_frame_sp_info {struct ia_css_buffer_sp {union { -hrt_vaddress xmem_addr; +ia_css_ptr xmem_addr;enum sh_css_queue_id queue_id; } buf_src;enum ia_css_buffer_type buf_type;
drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h +1 -1
@@ -31,7 +31,7 @@ ia_css_isp_param_set_css_mem_init(struct ia_css_isp_param_css_segments *mem_init, enum ia_css_param_class pclass, enum ia_css_isp_memories mem, - hrt_vaddress address, size_t size); + ia_css_ptr address, size_t size);void ia_css_isp_param_set_isp_mem_init(
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +2 -2
@@ -34,7 +34,7 @@ ia_css_isp_param_set_css_mem_init(struct ia_css_isp_param_css_segments *mem_init, enum ia_css_param_class pclass, enum ia_css_isp_memories mem, - hrt_vaddress address, size_t size) + ia_css_ptr address, size_t size) { mem_init->params[pclass][mem].address = address; mem_init->params[pclass][mem].size = (uint32_t )size;
@@ -187,7 +187,7 @@ ia_css_isp_param_copy_isp_mem_if_to_ddr(for (mem =0 ; mem <N_IA_CSS_ISP_MEMORIES ; mem++) {size_t size = host->params[pclass][mem].size; -hrt_vaddress ddr_mem_ptr = ddr->params[pclass][mem].address; +ia_css_ptr ddr_mem_ptr = ddr->params[pclass][mem].address;char *host_mem_ptr = host->params[pclass][mem].address;if (size != ddr->params[pclass][mem].size)
drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h +2 -1
@@ -17,13 +17,14 @@#include "ia_css_rmgr.h" #include <type_support.h> +#include <ia_css_types.h> #include <system_types.h> /** * @brief Data structure for the resource handle (host, vbuf) */ struct ia_css_rmgr_vbuf_handle { -hrt_vaddress vptr; +ia_css_ptr vptr;u8 count;u32 size; };
drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h +1 -1
@@ -34,7 +34,7 @@ typedef struct { } ia_css_spctrl_cfg;/* Get the code addr in DDR of SP */ -hrt_vaddress get_sp_code_addr (sp_ID_t sp_id); +ia_css_ptr get_sp_code_addr (sp_ID_t sp_id);/* ! Load firmware on to specfied SP */
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +5 -5
@@ -26,7 +26,7 @@ struct spctrl_context_info {u32 spctrl_config_dmem_addr;/* location of dmem_cfg in SP dmem */ u32 spctrl_state_dmem_addr;unsigned int sp_entry;/* entry function ptr on SP */ -hrt_vaddress code_addr;/* sp firmware location in host mem-DDR*/ +ia_css_ptr code_addr;/* sp firmware location in host mem-DDR*/ u32 code_size;char *program_name;/* used in case of PLATFORM_SIM */ };
@@ -38,7 +38,7 @@ static bool spctrl_loaded[N_SP_ID] = {0};enum ia_css_err ia_css_spctrl_load_fw (sp_ID_t sp_id,ia_css_spctrl_cfg *spctrl_cfg) { -hrt_vaddress code_addr = mmgr_NULL; +ia_css_ptr code_addr = mmgr_NULL;struct ia_css_sp_init_dmem_cfg *init_dmem_cfg;if ((sp_id >=N_SP_ID ) || (!spctrl_cfg))
@@ -68,9 +68,9 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id,return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;hmm_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size); -if (sizeof (hrt_vaddress) >sizeof (hrt_data)) { +if (sizeof (ia_css_ptr) >sizeof (hrt_data)) {ia_css_debug_dtrace (IA_CSS_DEBUG_ERROR , -"size of hrt_vaddress can not be greater than hrt_data\n" ); +"size of ia_css_ptr can not be greater than hrt_data\n" );hmm_free (code_addr); code_addr = mmgr_NULL;return IA_CSS_ERR_INTERNAL_ERROR ;
@@ -112,7 +112,7 @@ void sh_css_spctrl_reload_fw(sp_ID_t sp_id) spctrl_loaded[sp_id] = true; } -hrt_vaddress get_sp_code_addr (sp_ID_t sp_id) +ia_css_ptr get_sp_code_addr (sp_ID_t sp_id) {return spctrl_cofig_info[sp_id].code_addr; }
drivers/staging/media/atomisp/pci/sh_css.c +4 -4
@@ -383,7 +383,7 @@ static struct sh_css_hmm_buffer_record hrt_address kernel_ptr);static struct sh_css_hmm_buffer_record -*sh_css_hmm_buffer_record_validate (hrt_vaddress ddr_buffer_addr, +*sh_css_hmm_buffer_record_validate (ia_css_ptr ddr_buffer_addr,enum ia_css_buffer_type type);void
@@ -4404,7 +4404,7 @@ ia_css_pipe_dequeue_buffer(struct ia_css_pipe *pipe, struct ia_css_buffer *buffer) {enum ia_css_err return_err;enum sh_css_queue_id queue_id; -hrt_vaddress ddr_buffer_addr = (hrt_vaddress )0 ; +ia_css_ptr ddr_buffer_addr = (ia_css_ptr )0 ;struct sh_css_hmm_buffer ddr_buffer;enum ia_css_buffer_type buf_type;enum ia_css_pipe_id pipe_id;
@@ -8435,7 +8435,7 @@ remove_firmware(struct ia_css_fw_info **l, struct ia_css_fw_info *firmware) { }static enum ia_css_err upload_isp_code (struct ia_css_fw_info *firmware) { -hrt_vaddress binary; +ia_css_ptr binary;if (!firmware) {IA_CSS_ERROR ("NULL input parameter" );
@@ -11071,7 +11071,7 @@ static struct sh_css_hmm_buffer_record }static struct sh_css_hmm_buffer_record -*sh_css_hmm_buffer_record_validate (hrt_vaddress ddr_buffer_addr, +*sh_css_hmm_buffer_record_validate (ia_css_ptr ddr_buffer_addr,enum ia_css_buffer_type type) {int i;struct sh_css_hmm_buffer_record *buffer_record =NULL ;
drivers/staging/media/atomisp/pci/sh_css_firmware.c +2 -2
@@ -319,10 +319,10 @@ void sh_css_unload_firmware(void) sh_css_num_binaries =0 ; } -hrt_vaddress +ia_css_ptr sh_css_load_blob (const unsigned char *blob,unsigned int size) { -hrt_vaddress target_addr =mmgr_alloc_attr (size,0 ); +ia_css_ptr target_addr =mmgr_alloc_attr (size,0 );/* this will allocate memory aligned to a DDR word boundary which is required for the CSS DMA to read the instructions. */
drivers/staging/media/atomisp/pci/sh_css_firmware.h +1 -1
@@ -46,7 +46,7 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,void sh_css_unload_firmware (void ); -hrt_vaddress sh_css_load_blob (const unsigned char *blob,unsigned int size); +ia_css_ptr sh_css_load_blob (const unsigned char *blob,unsigned int size); enum ia_css_err sh_css_load_blob_info(const char *fw, const struct ia_css_fw_info *bi,
drivers/staging/media/atomisp/pci/sh_css_internal.h +38 -38
147 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_params.c +38 -38
273 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_params.h +6 -6
@@ -150,13 +150,13 @@ struct ia_css_isp_parameters {void ia_css_params_store_ia_css_host_data ( -hrt_vaddress ddr_addr, +ia_css_ptr ddr_addr,struct ia_css_host_data *data);enum ia_css_err ia_css_params_store_sctbl (const struct ia_css_pipeline_stage *stage, -hrt_vaddress ddr_addr, +ia_css_ptr ddr_addr,const struct ia_css_shading_table *shading_table); struct ia_css_host_data *
@@ -168,10 +168,10 @@ struct ia_css_isp_config * sh_css_pipe_isp_config_get(struct ia_css_pipe *pipe);/* ipu address allocation/free for gdc lut */ -hrt_vaddress +ia_css_ptr sh_css_params_alloc_gdc_lut (void );void -sh_css_params_free_gdc_lut (hrt_vaddress addr); +sh_css_params_free_gdc_lut (ia_css_ptr addr);enum ia_css_err sh_css_params_map_and_store_default_gdc_lut (void );
@@ -179,10 +179,10 @@ sh_css_params_map_and_store_default_gdc_lut(void);void sh_css_params_free_default_gdc_lut (void ); -hrt_vaddress +ia_css_ptr sh_css_params_get_default_gdc_lut (void ); -hrt_vaddress +ia_css_ptr sh_css_pipe_get_pp_gdc_lut (const struct ia_css_pipe *pipe);#endif /* _SH_CSS_PARAMS_H_ */
drivers/staging/media/atomisp/pci/sh_css_sp.c +2 -2
@@ -82,7 +82,7 @@ set_output_frame_buffer(const struct ia_css_frame *frame,static void sh_css_copy_buffer_attr_to_spbuffer (struct ia_css_buffer_sp *dest_buf,const enum sh_css_queue_id queue_id, -const hrt_vaddress xmem_addr, +const ia_css_ptr xmem_addr,const enum ia_css_buffer_type buf_type); static void
@@ -412,7 +412,7 @@ sh_css_sp_get_sw_interrupt_value(unsigned int irq)static void sh_css_copy_buffer_attr_to_spbuffer (struct ia_css_buffer_sp *dest_buf,const enum sh_css_queue_id queue_id, -const hrt_vaddress xmem_addr, +const ia_css_ptr xmem_addr,const enum ia_css_buffer_type buf_type) {assert (buf_type <IA_CSS_NUM_BUFFER_TYPE );
drivers/staging/media/atomisp/pci/sh_css_struct.h +1 -1
@@ -64,7 +64,7 @@ struct sh_css { mipi_sizes_for_check[N_CSI_PORTS ][IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT ];unsigned int mipi_frame_size[N_CSI_PORTS ];#endif -hrt_vaddress sp_bin_addr; +ia_css_ptr sp_bin_addr;hrt_data page_table_base_index;unsigned int size_mem_words;/* \deprecated{Use ia_css_mipi_buffer_config instead.}*/
Signature · 1 line
2.26.2
PATCH v2 8/41 media: atomisp: get rid of memory_access.c
In reply to Mauro Carvalho ChehabNow that we have everything in place, we can get rid of the memory_access abstraction layer.
Now, everything related to heterogeneous memory management (hmm) is under hmm.c & related pools.
--- drivers/staging/media/atomisp/Makefile | 1 - .../staging/media/atomisp/include/hmm/hmm.h | 3 + .../staging/media/atomisp/pci/atomisp_acc.c | 3 +- .../staging/media/atomisp/pci/atomisp_fops.c | 1 - .../atomisp/pci/base/refcount/src/refcount.c | 3 +- .../pci/hive_isp_css_common/host/debug.c | 3 +- .../hive_isp_css_common/host/debug_private.h | 1 - .../memory_access/memory_access.h | 94 ------------------- .../media/atomisp/pci/ia_css_memory_access.c | 20 ---- .../pci/isp/kernels/bh/bh_2/ia_css_bh.host.c | 1 - .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 +- .../raw_aa_binning_1.0/ia_css_raa.host.c | 1 - .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 5 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 5 +- .../media/atomisp/pci/mmu/sh_mmu_mrfld.c | 1 - .../atomisp/pci/runtime/binary/src/binary.c | 4 +- .../pci/runtime/debug/src/ia_css_debug.c | 3 +- .../atomisp/pci/runtime/event/src/event.c | 1 - .../atomisp/pci/runtime/frame/src/frame.c | 21 +++-- .../pci/runtime/isp_param/src/isp_param.c | 5 +- .../pci/runtime/pipeline/src/pipeline.c | 3 +- .../pci/runtime/queue/src/queue_access.c | 3 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 5 +- drivers/staging/media/atomisp/pci/sh_css.c | 3 +- .../media/atomisp/pci/sh_css_firmware.c | 5 +- .../staging/media/atomisp/pci/sh_css_mmu.c | 1 - .../media/atomisp/pci/sh_css_param_dvs.c | 1 - .../staging/media/atomisp/pci/sh_css_params.c | 46 +++++---- drivers/staging/media/atomisp/pci/sh_css_sp.c | 3 +- 30 files changed, 79 insertions(+), 174 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h delete mode 100644 drivers/staging/media/atomisp/pci/ia_css_memory_access.c
drivers/staging/media/atomisp/Makefile +0 -1
@@ -54,7 +54,6 @@ atomisp-objs += \ pci/hmm/hmm.o \ pci/hmm/hmm_reserved_pool.o \ pci/ia_css_device_access.o \ - pci/ia_css_memory_access.o \ pci/isp/kernels/aa/aa_2/ia_css_aa2.host.o \ pci/isp/kernels/anr/anr_1.0/ia_css_anr.host.o \ pci/isp/kernels/anr/anr_2/ia_css_anr2.host.o \
drivers/staging/media/atomisp/include/hmm/hmm.h +3 -0
@@ -28,6 +28,9 @@#include "hmm/hmm_pool.h" #include "ia_css_types.h" +#define mmgr_NULL ((ia_css_ptr)0) +#define mmgr_EXCEPTION ((ia_css_ptr)-1) +int hmm_pool_register (unsigned int pool_size,enum hmm_pool_type pool_type);void hmm_pool_unregister (enum hmm_pool_type pool_type);
drivers/staging/media/atomisp/pci/atomisp_acc.c +2 -1
@@ -23,12 +23,13 @@#include <linux/init.h> #include <media/v4l2-event.h> +#include "hmm.h" +#include "atomisp_acc.h" #include "atomisp_internal.h" #include "atomisp_compat.h" #include "atomisp_cmd.h" -#include "memory_access/memory_access.h" #include "ia_css.h" static const struct {
drivers/staging/media/atomisp/pci/atomisp_fops.c +0 -1
@@ -36,7 +36,6 @@#include "type_support.h" #include "device_access/device_access.h" -#include "memory_access/memory_access.h" #include "atomisp_acc.h"
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +2 -1
@@ -12,8 +12,9 @@* more details. */ +#include "hmm.h" +#include "ia_css_refcount.h" -#include "memory_access/memory_access.h" #include "sh_css_defs.h" #include "platform_support.h"
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c +2 -1
@@ -14,11 +14,12 @@#include "debug.h" +#include "hmm.h" +#ifndef __INLINE_DEBUG__#include "debug_private.h" #endif /* __INLINE_DEBUG__ */ -#include "memory_access.h" #define __INLINE_SP__#include "sp.h"
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h +0 -1
@@ -22,7 +22,6 @@#define __INLINE_ISP__#include "isp.h" -#include "memory_access.h" #include "assert_support.h"
drivers/staging/media/atomisp/pci/hive_isp_css_include/memory_access/memory_access.h deleted +0 -94
94 lines not on this page · raw message
drivers/staging/media/atomisp/pci/ia_css_memory_access.c deleted +0 -20
@@ -1,20 +0,0 @@ -/* -* Support for Intel Camera Imaging ISP subsystem. -* Copyright (c) 2015-2017, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -*/ - -#include <memory_access.h> - -ia_css_ptr mmgr_alloc_attr (const size_t size,const uint16_t attrs) -{ -return hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL , attrs); -}
drivers/staging/media/atomisp/pci/isp/kernels/bh/bh_2/ia_css_bh.host.c +0 -1
@@ -14,7 +14,6 @@#if !defined(HAS_NO_HMEM ) -#include "memory_access.h" #include "ia_css_types.h" #include "sh_css_internal.h" #include "assert_support.h"
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +2 -1
@@ -12,6 +12,8 @@* more details. */ +#include "hmm.h" +#include "ia_css_frame_public.h" #define IA_CSS_INCLUDE_CONFIGURATIONS #include "ia_css_isp_configs.h"
@@ -22,7 +24,6 @@#include "sh_css_params.h" #include "ia_css_binary.h" #include "ia_css_debug.h" -#include "memory_access.h" #include "assert_support.h" #include "ia_css_dvs.host.h"
drivers/staging/media/atomisp/pci/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c +0 -1
@@ -14,7 +14,6 @@#if !defined(HAS_NO_HMEM ) -#include "memory_access.h" #include "ia_css_types.h" #include "sh_css_internal.h" #include "sh_css_frac.h"
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +3 -2
@@ -12,7 +12,8 @@* more details. */ -#include "memory_access.h" +#include "hmm.h" +#include "assert_support.h" #include "ia_css_debug.h" #include "ia_css_sdis_types.h"
@@ -329,7 +330,7 @@ ia_css_isp_dvs_statistics_allocate( HIVE_ISP_DDR_WORD_BYTES); me->size = hor_size + ver_size; - me->data_ptr =mmgr_alloc_attr (me->size,0 ); + me->data_ptr =hmm_alloc (me->size,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (me->data_ptr == mmgr_NULL) goto err; me->hor_size = hor_size;
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +3 -2
@@ -12,8 +12,9 @@* more details. */ +#include "hmm.h" +#include <assert_support.h> -#include "memory_access.h" #include "ia_css_debug.h" #include "ia_css_sdis2.host.h"
@@ -295,7 +296,7 @@ ia_css_isp_dvs2_statistics_allocate( * grid->aligned_height *IA_CSS_DVS2_NUM_COEF_TYPES ; me->size =2 * size; - me->data_ptr =mmgr_alloc_attr (me->size,0 ); + me->data_ptr =hmm_alloc (me->size,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (me->data_ptr == mmgr_NULL) goto err; me->hor_proj = me->data_ptr;
drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c +0 -1
@@ -19,7 +19,6 @@#include "type_support.h" #include "mmu/isp_mmu.h" #include "mmu/sh_mmu_mrfld.h" -#include "memory_access/memory_access.h" #include "atomisp_compat.h" #define MERR_VALID_PTE_MASK 0x80000000
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +3 -1
@@ -14,6 +14,9 @@#include <math_support.h> #include <gdc_device.h> /* HR_GDC_N */ + +#include "hmm.h" +#include "isp.h" /* ISP_VEC_NELEMS */ #include "ia_css_binary.h"
@@ -33,7 +36,6 @@#include "camera/pipe/interface/ia_css_pipe_binarydesc.h" -#include "memory_access.h" #include "assert_support.h"
drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c +1 -2
@@ -13,7 +13,6 @@*/ #include "debug.h" -#include "memory_access.h" #ifndef __INLINE_INPUT_SYSTEM__#define __INLINE_INPUT_SYSTEM__
@@ -2490,7 +2489,7 @@ void ia_css_debug_dump_perf_counters(void)void sh_css_init_ddr_debug_queue (void ) {ia_css_ptr ddr_debug_queue_addr = -mmgr_alloc_attr (sizeof (debug_data_ddr_t),0 ); +hmm_alloc (sizeof (debug_data_ddr_t),HMM_BO_PRIVATE ,0 ,NULL ,0 );const struct ia_css_fw_info *fw;unsigned int HIVE_ADDR_debug_buffer_ddr_address;
drivers/staging/media/atomisp/pci/runtime/event/src/event.c +0 -1
@@ -29,7 +29,6 @@/*#include "sp.h"*/ /* host2sp_enqueue_frame_data() */ -#include "memory_access.h" #include "assert_support.h" #include "platform_support.h" /* hrt_sleep() */
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +13 -8
@@ -12,13 +12,14 @@* more details. */ +#include "hmm.h" +#include "ia_css_frame.h" #include <math_support.h> #include "assert_support.h" #include "ia_css_debug.h" #include "isp.h" #include "sh_css_internal.h" -#include "memory_access.h" #include "atomisp_internal.h" #define NV12_TILEY_TILE_WIDTH 128
@@ -170,20 +171,23 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame,if (pgnr < ((PAGE_ALIGN (me->data_bytes)) >>PAGE_SHIFT )) {dev_err (atomisp_dev,"user space memory size is less than the expected size..\n" ); -return -ENOMEM ; + err = -ENOMEM ; + goto error; }else if (pgnr > ((PAGE_ALIGN (me->data_bytes)) >>PAGE_SHIFT )) {dev_err (atomisp_dev,"user space memory size is large than the expected size..\n" ); -return -ENOMEM ; + err = -ENOMEM ; + goto error; } -return hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data, - attribute &ATOMISP_MAP_FLAG_CACHED ); + me->data =hmm_alloc (me->data_bytes,HMM_BO_USER ,0 , data, + attribute &ATOMISP_MAP_FLAG_CACHED );if (me->data == mmgr_NULL) err =IA_CSS_ERR_INVALID_ARGUMENTS ; } +error:if (err !=IA_CSS_SUCCESS ) {sh_css_free (me); me =NULL ;
@@ -797,9 +801,10 @@ static enum ia_css_err frame_allocate_buffer_data(struct ia_css_frame *frame)#ifdef ISP2401 IA_CSS_ENTER_LEAVE_PRIVATE ("frame->data_bytes=%d\n" , frame->data_bytes);#endif - frame->data =mmgr_alloc_attr (frame->data_bytes, - frame->contiguous ? -ATOMISP_MAP_FLAG_CONTIGUOUS :0 ); + frame->data =hmm_alloc (frame->data_bytes, +HMM_BO_PRIVATE ,0 ,NULL , + frame->contiguous ? +ATOMISP_MAP_FLAG_CONTIGUOUS :0 );if (frame->data == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +3 -2
@@ -12,7 +12,8 @@* more details. */ -#include "memory_access.h" +#include "hmm.h" +#include "ia_css_pipeline.h" #include "ia_css_isp_param.h"
@@ -127,7 +128,7 @@ ia_css_isp_param_allocate_isp_parameters( goto cleanup; }if (pclass !=IA_CSS_PARAM_CLASS_PARAM ) { - css_params->params[pclass][mem].address =mmgr_alloc_attr (size,0 ); + css_params->params[pclass][mem].address =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (!css_params->params[pclass][mem].address) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto cleanup;
drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c +2 -1
@@ -12,11 +12,12 @@* more details. */ +#include "hmm.h" +#include "ia_css_debug.h" #include "sw_event_global.h" /* encode_sw_event */ #include "sp.h" /* cnd_sp_irq_enable() */ #include "assert_support.h" -#include "memory_access.h" #include "sh_css_sp.h" #include "ia_css_pipeline.h" #include "ia_css_isp_param.h"
drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c +2 -1
@@ -12,11 +12,12 @@* more details. */ +#include "hmm.h" +#include "type_support.h" #include "queue_access.h" #include "ia_css_circbuf.h" #include "sp.h" -#include "memory_access.h" #include "assert_support.h" int ia_css_queue_load(
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +2 -2
@@ -12,12 +12,12 @@* more details. */ +#include "hmm.h" #include "ia_css_rmgr.h" #include <type_support.h> #include <assert_support.h> #include <platform_support.h> /* memset */ -#include <memory_access.h> /* mmmgr_alloc_attr */ #include <ia_css_debug.h> /*
@@ -297,7 +297,7 @@ void ia_css_rmgr_acq_vbuf(struct ia_css_rmgr_vbuf_pool *pool, }if ((*handle)->vptr ==0x0 ) {/* we need to allocate */ - (*handle)->vptr =mmgr_alloc_attr ((*handle)->size,0 ); + (*handle)->vptr =hmm_alloc ((*handle)->size,HMM_BO_PRIVATE ,0 ,NULL ,0 ); }else {/* we popped a buffer */ return ;
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +3 -2
@@ -12,11 +12,12 @@* more details. */ +#include "hmm.h" +#include "ia_css_types.h" #define __INLINE_SP__#include "sp.h" -#include "memory_access.h" #include "assert_support.h" #include "ia_css_spctrl.h" #include "ia_css_debug.h"
@@ -63,7 +64,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id,* Data used to be stored separately, because of access alignment constraints, * fix the FW generation instead */ - code_addr =mmgr_alloc_attr (spctrl_cfg->code_size,0 ); + code_addr =hmm_alloc (spctrl_cfg->code_size,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (code_addr == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;hmm_store (code_addr, spctrl_cfg->code, spctrl_cfg->code_size);
drivers/staging/media/atomisp/pci/sh_css.c +2 -1
@@ -17,6 +17,8 @@#include <linux/slab.h> #include <linux/vmalloc.h> +#include "hmm.h" +#include "ia_css.h" #include "sh_css_hrt.h" /* only for file 2 MIPI */ #include "ia_css_buffer.h"
@@ -52,7 +54,6 @@#include "ia_css_isys.h" #endif -#include "memory_access.h" #include "tag.h" #include "assert_support.h" #include "math_support.h"
drivers/staging/media/atomisp/pci/sh_css_firmware.c +3 -2
@@ -15,6 +15,8 @@#include <linux/slab.h> #include <linux/vmalloc.h> +#include "hmm.h" +#include <math_support.h> #include "platform_support.h" #include "sh_css_firmware.h"
@@ -24,7 +26,6 @@#include "sh_css_internal.h" #include "ia_css_isp_param.h" -#include "memory_access.h" #include "assert_support.h" #include "string_support.h"
@@ -322,7 +323,7 @@ void sh_css_unload_firmware(void)ia_css_ptr sh_css_load_blob (const unsigned char *blob,unsigned int size) { -ia_css_ptr target_addr =mmgr_alloc_attr (size,0 ); +ia_css_ptr target_addr =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL ,0 );/* this will allocate memory aligned to a DDR word boundary which is required for the CSS DMA to read the instructions. */
drivers/staging/media/atomisp/pci/sh_css_mmu.c +0 -1
@@ -43,7 +43,6 @@ ia_css_mmu_invalidate_cache(void) "ia_css_mmu_invalidate_cache() leave\n"); } -/* Deprecated, this is an HRT backend function (memory_access.h) */ void sh_css_mmu_set_page_table_base_index (hrt_data base_index) {
drivers/staging/media/atomisp/pci/sh_css_param_dvs.c +0 -1
@@ -18,7 +18,6 @@#include <ia_css_err.h> #include <ia_css_types.h> #include "ia_css_debug.h" -#include "memory_access.h" static struct ia_css_dvs_6axis_config * alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res,
drivers/staging/media/atomisp/pci/sh_css_params.c +26 -20
126 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_sp.c +2 -1
@@ -12,6 +12,8 @@* more details. */ +#include "hmm.h" +#include "sh_css_sp.h" #if !defined(HAS_NO_INPUT_FORMATTER )
@@ -43,7 +45,6 @@/*#include "sp.h"*/ /* host2sp_enqueue_frame_data() */ -#include "memory_access.h" #include "assert_support.h" #include "platform_support.h" /* hrt_sleep() */
Signature · 1 line
2.26.2
PATCH v2 9/41 media: atomisp: hmm_bo: untag user pointers
In reply to Mauro Carvalho ChehabThe kernel ABI was extended to allow pass tagged user pointers.
Untag the pointers in this function.
--- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +3 -0
@@ -997,6 +997,9 @@ static int alloc_user_pages(struct hmm_buffer_object *bo,* Handle frame buffer allocated in other kerenl space driver * and map to user space */ + + userptr =untagged_addr (userptr); +if (vma->vm_flags & (VM_IO |VM_PFNMAP )) { page_nr = get_pfnmap_pages(current, current->mm, (unsigned long)userptr,
Signature · 1 line
2.26.2
PATCH v2 10/41 media: atomisp: add debug message to help debugging hmm code
In reply to Mauro Carvalho ChehabThe hmm code is partially based on a fork from 3.10 code, and has bugs.
Add debug there to help tracking what happens there.
--- drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +5 -0
@@ -1015,6 +1015,11 @@ static int alloc_user_pages(struct hmm_buffer_object *bo, bo->mem_type =HMM_BO_MEM_TYPE_USER ; } +dev_dbg (atomisp_dev,"%s: %d %s pages were allocated as 0x%08x\n" , + __func__, + bo->pgnr, + bo->mem_type ==HMM_BO_MEM_TYPE_USER ?"user" :"pfn" , page_nr); +/* can be written by caller, not forced */ if (page_nr != bo->pgnr) { dev_err(atomisp_dev,
Signature · 1 line
2.26.2
PATCH v2 11/41 media: atomisp: use Yocto Aero default hmm pool sizes
In reply to Mauro Carvalho ChehabYocto Aero driver has a different default for hmm pools.
Use the definitions there.
--- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +5 -5
@@ -56,21 +56,21 @@ module_param(skip_fwload, uint, 0644);MODULE_PARM_DESC (skip_fwload,"Skip atomisp firmware load" );/* set reserved memory pool size in page */ -static unsigned int repool_pgnr; +static unsigned int repool_pgnr =32768 ;module_param (repool_pgnr, uint,0644 );MODULE_PARM_DESC (repool_pgnr, -"Set the reserved memory pool size in page (default:0)" ); +"Set the reserved memory pool size in page (default:32768)" );/* set dynamic memory pool size in page */ unsigned int dypool_pgnr =UINT_MAX ;module_param (dypool_pgnr, uint,0644 );MODULE_PARM_DESC (dypool_pgnr, -"Set the dynamic memory pool size in page (default:0)" ); +"Set the dynamic memory pool size in page (default: unlimited)" ); -bool dypool_enable; +bool dypool_enable = true;module_param (dypool_enable, bool,0644 );MODULE_PARM_DESC (dypool_enable, -"dynamic memory pool enable/disable (default:disable)" ); +"dynamic memory pool enable/disable (default:enabled)" );/* memory optimization: deferred firmware loading */ bool defer_fw_load;
Signature · 1 line
2.26.2
PATCH v2 12/41 media: atomisp: get rid of a warning message
In reply to Mauro Carvalho ChehabThere's a warning message about an unused code. The code that were using it were commented out, due to a problem causing the firmware load to fail on the machines we're using for testing.
Change the place where we're commenting the code out, in order to avoid the warning.
--- .../staging/media/atomisp/pci/atomisp_v4l2.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +12 -6
@@ -734,6 +734,10 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)* WA for DDR DVFS enable/disable * By default, ISP will force DDR DVFS 1600MHz before disable DVFS */ + +#if 0 +// Used only by atomisp_mrfld_power +static void punit_ddr_dvfs_enable (bool enable) {int door_bell =1 <<8 ;
@@ -758,9 +762,12 @@ static void punit_ddr_dvfs_enable(bool enable)if (max_wait ==-1 ) pr_info("DDR DVFS, door bell is not cleared within 3ms\n"); } +#endif static int atomisp_mrfld_power (struct atomisp_device *isp,bool enable) { +// FIXME: at least with ISP2401, the code below causes the driver to break +#if 0 unsigned long timeout;u32 val = enable ?MRFLD_ISPSSPM0_IUNIT_POWER_ON :MRFLD_ISPSSPM0_IUNIT_POWER_OFF ;
@@ -817,22 +824,21 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable)dev_err (isp->dev,"IUNIT power-%s timeout.\n" , enable ?"on" :"off" );return -EBUSY ; +#else +return 0 ; +#endif }/* Workaround for pmu_nc_set_power_state not ready in MRFLD */ int atomisp_mrfld_power_down (struct atomisp_device *isp) { -return 0 ; -// FIXME: at least with ISP2401, the code below causes the driver to break -// return atomisp_mrfld_power(isp, false); +return atomisp_mrfld_power (isp, false); }/* Workaround for pmu_nc_set_power_state not ready in MRFLD */ int atomisp_mrfld_power_up (struct atomisp_device *isp) { -return 0 ; -// FIXME: at least with ISP2401, the code below causes the driver to break -// return atomisp_mrfld_power(isp, true); +return atomisp_mrfld_power (isp, true); }int atomisp_runtime_suspend (struct device *dev)
Signature · 1 line
2.26.2
PATCH v2 13/41 media: atomisp: fix driver caps
In reply to Mauro Carvalho ChehabThis device driver is not MC-centric. So, remove the wrong caps from it.
--- drivers/staging/media/atomisp/pci/atomisp_subdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_subdev.c +1 -2
@@ -1343,8 +1343,7 @@ int atomisp_subdev_register_entities(struct atomisp_sub_device *asd,* Should any of those use V4L2_CAP_META_OUTPUT? Probably yes. */ - device_caps =V4L2_CAP_IO_MC | -V4L2_CAP_VIDEO_CAPTURE | + device_caps =V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_STREAMING ;/* Register the subdev and video node. */
Signature · 1 line
2.26.2
PATCH v2 14/41 media: atomisp: use pin_user_pages() for memory allocation
In reply to Mauro Carvalho ChehabInstead of using a hacked version of an old copy of get_user_pages(), use pin_user_pages().
--- .../media/atomisp/include/hmm/hmm_bo.h | 2 + .../staging/media/atomisp/pci/hmm/hmm_bo.c | 145 +++--------------- 2 files changed, 24 insertions(+), 123 deletions(-)
drivers/staging/media/atomisp/include/hmm/hmm_bo.h +2 -0
@@ -130,6 +130,8 @@ struct hmm_buffer_object {struct list_head list;struct kref kref; +struct page **pages; +/* mutex protecting this BO */ struct mutex mutex;enum hmm_bo_type type;
drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +22 -123
179 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 15/41 media: atomisp: add debug for hmm alloc
In reply to Mauro Carvalho ChehabThe hmm code is still complex and has bugs. Add a debug print when memory gets allocated, in order to help identifying what's happening out there.
--- drivers/staging/media/atomisp/pci/hmm/hmm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/hmm/hmm.c +5 -1
@@ -253,7 +253,7 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type, goto alloc_page_err; } -/* Combind the virtual address and pages togather */ +/* Combine the virtual address and pages together */ ret =hmm_bo_bind (bo);if (ret) {dev_err (atomisp_dev,"hmm_bo_bind failed.\n" );
@@ -265,6 +265,10 @@ ia_css_ptr hmm_alloc(size_t bytes, enum hmm_bo_type type,if (attrs &ATOMISP_MAP_FLAG_CLEARED )hmm_set (bo->start,0 , bytes); +dev_dbg (atomisp_dev, +"%s: pages: 0x%08x (%ld bytes), type: %d from highmem %d, user ptr %p, cached %d\n" , + __func__, bo->start, bytes, type, from_highmem, userptr, cached); +return bo->start; bind_err:
Signature · 1 line
2.26.2
PATCH v2 16/41 media: atomisp: improve warning for IRQ enable function
In reply to Mauro Carvalho ChehabIf something gets wrong when enabling or disabling an IRQ, we should know better about what happened.
--- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +3 -1
@@ -1042,7 +1042,9 @@ int atomisp_css_irq_enable(struct atomisp_device *isp, __func__, info, enable ? "enable" : "disable");if (ia_css_irq_enable (info, enable) !=IA_CSS_SUCCESS ) { -dev_warn (isp->dev,"%s:Invalid irq info.\n" , __func__); +dev_warn (isp->dev,"%s:Invalid irq info: 0x%08x when %s.\n" , + __func__, info, + enable ?"enabling" :"disabling" );return -EINVAL ; }
Signature · 1 line
2.26.2
PATCH v2 17/41 media: atomisp: add debug functions for received events
In reply to Mauro Carvalho ChehabFor debugging purposes, it helps to know what event was actually received.
--- drivers/staging/media/atomisp/pci/atomisp_compat_css20.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +9 -0
@@ -4523,6 +4523,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,atomisp_css_temp_pipe_to_pipe_id (asd, ¤t_event);switch (current_event.event.type) {case IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE : +dev_dbg (isp->dev,"event: Output frame done" ); frame_done_found[asd->index] = true;atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_OUTPUT_FRAME , current_event.pipe, true, stream_id);
@@ -4531,6 +4532,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,break ;case IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE : +dev_dbg (isp->dev,"event: Second output frame done" ); frame_done_found[asd->index] = true;atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME , current_event.pipe, true, stream_id);
@@ -4539,18 +4541,21 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,break ;case IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE : +dev_dbg (isp->dev,"event: 3A stats frame done" );atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_3A_STATISTICS , current_event.pipe, false, stream_id);break ;case IA_CSS_EVENT_TYPE_METADATA_DONE : +dev_dbg (isp->dev,"event: metadata frame done" );atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_METADATA , current_event.pipe, false, stream_id);break ;case IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE : +dev_dbg (isp->dev,"event: VF output frame done" );atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME , current_event.pipe, true, stream_id);
@@ -4559,6 +4564,7 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,break ;case IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE : +dev_dbg (isp->dev,"event: second VF output frame done" );atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME , current_event.pipe, true, stream_id);
@@ -4566,15 +4572,18 @@ int atomisp_css_isr_thread(struct atomisp_device *isp,break ;case IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE : +dev_dbg (isp->dev,"event: dis stats frame done" );atomisp_buf_done (asd,0 ,IA_CSS_BUFFER_TYPE_DIS_STATISTICS , current_event.pipe, false, stream_id);break ;case IA_CSS_EVENT_TYPE_PIPELINE_DONE : +dev_dbg (isp->dev,"event: pipeline done" ); css_pipe_done[asd->index] = true;break ;case IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE : +dev_dbg (isp->dev,"event: acc stage done" );atomisp_acc_done (asd, current_event.event.fw_handle);break ;default :
Signature · 1 line
2.26.2
PATCH v2 18/41 media: atomisp: add more comments about frame allocation
In reply to Mauro Carvalho ChehabThe frame allocation logic happens differently for userptr or normal mmap. On a quick look, this sounded to be unbalanced, but the logic should actually work for both cases.
Add an extra comment to reflect it.
--- drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +5 -1
@@ -1052,7 +1052,7 @@ int __atomisp_reqbufs(struct file *file, void *fh,atomisp_alloc_css_stat_bufs (asd, stream_id);/* -* for user pointer type, buffers are not really allcated here, +* for user pointer type, buffers are not really allocated here, * buffers are setup in QBUF operation through v4l2_buffer structure */ if (req->memory ==V4L2_MEMORY_USERPTR )
@@ -1225,6 +1225,10 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) buf->flags |=V4L2_BUF_FLAG_MAPPED ; buf->flags |=V4L2_BUF_FLAG_QUEUED ; buf->flags &= ~V4L2_BUF_FLAG_DONE ; + +/* +* For mmap, frames were allocated at request buffers +*/ } done:
Signature · 1 line
2.26.2
PATCH v2 19/41 media: atomisp: remove kvmalloc/kvcalloc abstractions
In reply to Mauro Carvalho ChehabThe sh_css layer adds an abstraction for kvmalloc/kvcalloc.
Get rid of them. Most of the work here was done by this small coccinelle script:
<cocci>
@@
expression size;
@@
- sh_css_malloc(size)
+ kvmalloc(size, GFP_KERNEL)
@@
expression n;
expression size;
@@
- sh_css_calloc(n, size)
+ kvcalloc(n, size, GFP_KERNEL)
</cocci>
--- .../atomisp/pci/base/refcount/src/refcount.c | 4 +- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 14 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 4 +- .../atomisp/pci/runtime/binary/src/binary.c | 6 +- .../atomisp/pci/runtime/frame/src/frame.c | 12 +- .../pci/runtime/isp_param/src/isp_param.c | 6 +- .../pci/runtime/pipeline/src/pipeline.c | 4 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- drivers/staging/media/atomisp/pci/sh_css.c | 35 +-- .../media/atomisp/pci/sh_css_host_data.c | 4 +- .../media/atomisp/pci/sh_css_internal.h | 6 - .../media/atomisp/pci/sh_css_metrics.c | 9 +- .../media/atomisp/pci/sh_css_param_dvs.c | 30 +- .../media/atomisp/pci/sh_css_param_shading.c | 7 +- .../staging/media/atomisp/pci/sh_css_params.c | 262 ++++++++++-------- 15 files changed, 202 insertions(+), 205 deletions(-)
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +2 -2
@@ -81,7 +81,7 @@ enum ia_css_err ia_css_refcount_init(uint32_t size)return IA_CSS_ERR_INTERNAL_ERROR ; } myrefcount.items = -sh_css_malloc (sizeof (struct ia_css_refcount_entry ) * size); +kvmalloc (sizeof (struct ia_css_refcount_entry ) * size,GFP_KERNEL );if (!myrefcount.items) err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;if (err ==IA_CSS_SUCCESS ) {
@@ -115,7 +115,7 @@ void ia_css_refcount_uninit(void) entry->id =0 ; } } -sh_css_free (myrefcount.items); +kvfree (myrefcount.items); myrefcount.items =NULL ; myrefcount.size =0 ; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +7 -7
@@ -318,7 +318,7 @@ ia_css_isp_dvs_statistics_allocate(if (!grid->enable)return NULL ; - me =sh_css_calloc (1 ,sizeof (*me)); + me =kvcalloc (1 ,sizeof (*me),GFP_KERNEL );if (!me) goto err;
@@ -359,7 +359,7 @@ ia_css_isp_dvs_statistics_map_allocate(* so we use a local char * instead. */ char *base_ptr; - me =sh_css_malloc (sizeof (*me)); + me =kvmalloc (sizeof (*me),GFP_KERNEL );if (!me) {IA_CSS_LOG ("cannot allocate memory" ); goto err;
@@ -369,7 +369,7 @@ ia_css_isp_dvs_statistics_map_allocate( me->data_allocated = !data_ptr;if (!me->data_ptr) { - me->data_ptr =sh_css_malloc (isp_stats->size); + me->data_ptr =kvmalloc (isp_stats->size,GFP_KERNEL );if (!me->data_ptr) {IA_CSS_LOG ("cannot allocate memory" ); goto err;
@@ -386,7 +386,7 @@ ia_css_isp_dvs_statistics_map_allocate(return me; err:if (me) -sh_css_free (me); +kvfree (me);return NULL ; }
@@ -395,8 +395,8 @@ ia_css_isp_dvs_statistics_map_free(struct ia_css_isp_dvs_statistics_map *me) {if (me) {if (me->data_allocated) -sh_css_free (me->data_ptr); -sh_css_free (me); +kvfree (me->data_ptr); +kvfree (me); } }
@@ -405,7 +405,7 @@ ia_css_isp_dvs_statistics_free(struct ia_css_isp_dvs_statistics *me) {if (me) {hmm_free (me->data_ptr); -sh_css_free (me); +kvfree (me); } }
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +2 -2
@@ -285,7 +285,7 @@ ia_css_isp_dvs2_statistics_allocate(if (!grid->enable)return NULL ; - me =sh_css_calloc (1 ,sizeof (*me)); + me =kvcalloc (1 ,sizeof (*me),GFP_KERNEL );if (!me) goto err;
@@ -318,7 +318,7 @@ ia_css_isp_dvs2_statistics_free(struct ia_css_isp_dvs_statistics *me) {if (me) {hmm_free (me->data_ptr); -sh_css_free (me); +kvfree (me); } }
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +3 -3
@@ -927,8 +927,8 @@ ia_css_binary_init_infos(void) {if (num_of_isp_binaries ==0 )return IA_CSS_SUCCESS ; - all_binaries =sh_css_malloc (num_of_isp_binaries * -sizeof (*all_binaries)); + all_binaries =kvmalloc (num_of_isp_binaries *sizeof (*all_binaries), +GFP_KERNEL );if (!all_binaries)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -966,7 +966,7 @@ ia_css_binary_uninit(void) { } binary_infos[i] =NULL ; } -sh_css_free (all_binaries); +kvfree (all_binaries);return IA_CSS_SUCCESS ; }
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +6 -6
@@ -189,7 +189,7 @@ enum ia_css_err ia_css_frame_map(struct ia_css_frame **frame, error:if (err !=IA_CSS_SUCCESS ) { -sh_css_free (me); +kvfree (me); me =NULL ; }
@@ -228,7 +228,7 @@ enum ia_css_err ia_css_frame_create_from_info(struct ia_css_frame **frame, err =ia_css_frame_init_planes (me);if (err !=IA_CSS_SUCCESS ) { -sh_css_free (me); +kvfree (me); me =NULL ; }
@@ -321,7 +321,7 @@ void ia_css_frame_free(struct ia_css_frame *frame)if (frame) {hmm_free (frame->data); -sh_css_free (frame); +kvfree (frame); }IA_CSS_LEAVE_PRIVATE ("void" );
@@ -551,7 +551,7 @@ enum ia_css_err ia_css_frame_allocate_with_buffer_size( err =frame_allocate_buffer_data (me);if (err !=IA_CSS_SUCCESS ) { -sh_css_free (me); +kvfree (me); me =NULL ; }
@@ -837,7 +837,7 @@ static enum ia_css_err frame_allocate_with_data(struct ia_css_frame **frame, err =frame_allocate_buffer_data (me);if (err !=IA_CSS_SUCCESS ) { -sh_css_free (me); +kvfree (me);#ifndef ISP2401 return err;#else
@@ -858,7 +858,7 @@ static struct ia_css_frame *frame_create(unsigned int width, bool contiguous, bool valid) { -struct ia_css_frame *me =sh_css_malloc (sizeof (*me)); +struct ia_css_frame *me =kvmalloc (sizeof (*me),GFP_KERNEL );if (!me)return NULL ;
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +4 -2
@@ -122,7 +122,9 @@ ia_css_isp_param_allocate_isp_parameters( css_params->params[pclass][mem].size = size; css_params->params[pclass][mem].address =0x0 ;if (size) { - mem_params->params[pclass][mem].address =sh_css_calloc (1 , size); + mem_params->params[pclass][mem].address =kvcalloc (1 , + size, +GFP_KERNEL );if (!mem_params->params[pclass][mem].address) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto cleanup;
@@ -153,7 +155,7 @@ ia_css_isp_param_destroy_isp_parameters(for (mem =0 ; mem <IA_CSS_NUM_MEMORIES ; mem++) {for (pclass =0 ; pclass <IA_CSS_NUM_PARAM_CLASSES ; pclass++) {if (mem_params->params[pclass][mem].address) -sh_css_free (mem_params->params[pclass][mem].address); +kvfree (mem_params->params[pclass][mem].address);if (css_params->params[pclass][mem].address)hmm_free (css_params->params[pclass][mem].address); mem_params->params[pclass][mem].address =NULL ;
drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c +2 -2
@@ -512,7 +512,7 @@ static void pipeline_stage_destroy(struct ia_css_pipeline_stage *stage)ia_css_frame_free (stage->args.out_vf_frame); stage->args.out_vf_frame =NULL ; } -sh_css_free (stage); +kvfree (stage); }static void pipeline_init_sp_thread_map (void )
@@ -593,7 +593,7 @@ static enum ia_css_err pipeline_stage_create( out_frame[i] = stage_desc->out_frame[i]; } - stage =sh_css_malloc (sizeof (*stage)); + stage =kvmalloc (sizeof (*stage),GFP_KERNEL );if (!stage) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto ERR;
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +2 -2
@@ -152,7 +152,7 @@ enum ia_css_err ia_css_rmgr_init_vbuf(struct ia_css_rmgr_vbuf_pool *pool) bytes_needed =sizeof (void *) * pool->size; - pool->handles =sh_css_malloc (bytes_needed); + pool->handles =kvmalloc (bytes_needed,GFP_KERNEL );if (pool->handles)memset (pool->handles,0 , bytes_needed);else
@@ -196,7 +196,7 @@ void ia_css_rmgr_uninit_vbuf(struct ia_css_rmgr_vbuf_pool *pool) } }/* now free the pool handles list */ -sh_css_free (pool->handles); +kvfree (pool->handles); pool->handles =NULL ; } }
drivers/staging/media/atomisp/pci/sh_css.c +3 -32
@@ -1860,35 +1860,6 @@ ia_css_enable_isys_event_queue(bool enable) {return IA_CSS_SUCCESS ; } -void *sh_css_malloc (size_t size) -{ -ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"sh_css_malloc() enter: size=%zu\n" , - size); -/* FIXME: This first test can probably go away */ -if (size ==0 ) -return NULL ; -if (size >PAGE_SIZE ) -return vmalloc (size); -return kmalloc (size,GFP_KERNEL ); -} - -void *sh_css_calloc (size_t N ,size_t size) -{ -void *p; - -ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE , -"sh_css_calloc() enter: N=%zu, size=%zu\n" ,N , size); - -/* FIXME: this test can probably go away */ -if (size >0 ) { - p =sh_css_malloc (N * size); -if (p) -memset (p,0 , size); -return p; - } -return NULL ; -} -void sh_css_free (void *ptr) {if (is_vmalloc_addr (ptr))
@@ -9033,7 +9004,7 @@ ia_css_pipe_create_extra(const struct ia_css_pipe_config *config, i);if (err !=IA_CSS_SUCCESS ) {IA_CSS_LEAVE_ERR_PRIVATE (err); -sh_css_free (internal_pipe); +kvfree (internal_pipe); internal_pipe =NULL ;return err; }
@@ -9052,7 +9023,7 @@ ia_css_pipe_create_extra(const struct ia_css_pipe_config *config, i);if (err !=IA_CSS_SUCCESS ) {IA_CSS_LEAVE_ERR_PRIVATE (err); -sh_css_free (internal_pipe); +kvfree (internal_pipe); internal_pipe =NULL ;return err; }
@@ -9064,7 +9035,7 @@ ia_css_pipe_create_extra(const struct ia_css_pipe_config *config, internal_pipe->config.acc_extension);if (err !=IA_CSS_SUCCESS ) {IA_CSS_LEAVE_ERR_PRIVATE (err); -sh_css_free (internal_pipe); +kvfree (internal_pipe);return err; } }
drivers/staging/media/atomisp/pci/sh_css_host_data.c +2 -2
@@ -24,7 +24,7 @@ struct ia_css_host_data *ia_css_host_data_allocate(size_t size)if (!me)return NULL ; me->size = (uint32_t )size; - me->address =sh_css_malloc (size); + me->address =kvmalloc (size,GFP_KERNEL );if (!me->address) {kfree (me);return NULL ;
@@ -35,7 +35,7 @@ struct ia_css_host_data *ia_css_host_data_allocate(size_t size)void ia_css_host_data_free (struct ia_css_host_data *me) {if (me) { -sh_css_free (me->address); +kvfree (me->address); me->address =NULL ;kfree (me); }
drivers/staging/media/atomisp/pci/sh_css_internal.h +0 -6
@@ -968,12 +968,6 @@ sh_css_params_init(void);void sh_css_params_uninit (void ); -void *sh_css_malloc (size_t size); - -void *sh_css_calloc (size_t N ,size_t size); - -void sh_css_free (void *ptr); -/* For Acceleration API: Flush FW (shared buffer pointer) arguments */ void sh_css_flush (struct ia_css_acc_fw *fw);
drivers/staging/media/atomisp/pci/sh_css_metrics.c +6 -3
@@ -67,13 +67,16 @@ make_histogram(struct sh_css_pc_histogram *histogram, unsigned int length)return ;if (histogram->run)return ; - histogram->run =sh_css_malloc (length *sizeof (*histogram->run)); + histogram->run =kvmalloc (length *sizeof (*histogram->run), +GFP_KERNEL );if (!histogram->run)return ; - histogram->stall =sh_css_malloc (length *sizeof (*histogram->stall)); + histogram->stall =kvmalloc (length *sizeof (*histogram->stall), +GFP_KERNEL );if (!histogram->stall)return ; - histogram->msink =sh_css_malloc (length *sizeof (*histogram->msink)); + histogram->msink =kvmalloc (length *sizeof (*histogram->msink), +GFP_KERNEL );if (!histogram->msink)return ;
drivers/staging/media/atomisp/pci/sh_css_param_dvs.c +15 -15
@@ -30,8 +30,8 @@ alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res,enum ia_css_err err =IA_CSS_SUCCESS ;struct ia_css_dvs_6axis_config *dvs_config =NULL ; - dvs_config = (struct ia_css_dvs_6axis_config *)sh_css_malloc (sizeof ( -struct ia_css_dvs_6axis_config )); + dvs_config =kvmalloc (sizeof (struct ia_css_dvs_6axis_config ), +GFP_KERNEL );if (!dvs_config) {IA_CSS_ERROR ("out of memory" ); err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -57,16 +57,16 @@ alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res, }/* Generate Y buffers */ - dvs_config->xcoords_y = (uint32_t *)sh_css_malloc (width_y * height_y *sizeof ( -uint32_t )); + dvs_config->xcoords_y =kvmalloc (width_y * height_y *sizeof (uint32_t ), +GFP_KERNEL );if (!dvs_config->xcoords_y) {IA_CSS_ERROR ("out of memory" ); err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto exit; } - dvs_config->ycoords_y = (uint32_t *)sh_css_malloc (width_y * height_y *sizeof ( -uint32_t )); + dvs_config->ycoords_y =kvmalloc (width_y * height_y *sizeof (uint32_t ), +GFP_KERNEL );if (!dvs_config->ycoords_y) {IA_CSS_ERROR ("out of memory" ); err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -76,16 +76,16 @@ alloc_dvs_6axis_table(const struct ia_css_resolution *frame_res,/* Generate UV buffers */ IA_CSS_LOG ("UV W %d H %d" , width_uv, height_uv); - dvs_config->xcoords_uv = (uint32_t *)sh_css_malloc (width_uv * height_uv * -sizeof (uint32_t )); + dvs_config->xcoords_uv =kvmalloc (width_uv * height_uv *sizeof (uint32_t ), +GFP_KERNEL );if (!dvs_config->xcoords_uv) {IA_CSS_ERROR ("out of memory" ); err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto exit; } - dvs_config->ycoords_uv = (uint32_t *)sh_css_malloc (width_uv * height_uv * -sizeof (uint32_t )); + dvs_config->ycoords_uv =kvmalloc (width_uv * height_uv *sizeof (uint32_t ), +GFP_KERNEL );if (!dvs_config->ycoords_uv) {IA_CSS_ERROR ("out of memory" ); err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -207,28 +207,28 @@ free_dvs_6axis_table(struct ia_css_dvs_6axis_config **dvs_6axis_config)if ((dvs_6axis_config) && (*dvs_6axis_config)) {IA_CSS_ENTER_PRIVATE ("dvs_6axis_config %p" , (*dvs_6axis_config));if ((*dvs_6axis_config)->xcoords_y) { -sh_css_free ((*dvs_6axis_config)->xcoords_y); +kvfree ((*dvs_6axis_config)->xcoords_y); (*dvs_6axis_config)->xcoords_y =NULL ; }if ((*dvs_6axis_config)->ycoords_y) { -sh_css_free ((*dvs_6axis_config)->ycoords_y); +kvfree ((*dvs_6axis_config)->ycoords_y); (*dvs_6axis_config)->ycoords_y =NULL ; }/* Free up UV buffers */ if ((*dvs_6axis_config)->xcoords_uv) { -sh_css_free ((*dvs_6axis_config)->xcoords_uv); +kvfree ((*dvs_6axis_config)->xcoords_uv); (*dvs_6axis_config)->xcoords_uv =NULL ; }if ((*dvs_6axis_config)->ycoords_uv) { -sh_css_free ((*dvs_6axis_config)->ycoords_uv); +kvfree ((*dvs_6axis_config)->ycoords_uv); (*dvs_6axis_config)->ycoords_uv =NULL ; }IA_CSS_LEAVE_PRIVATE ("dvs_6axis_config %p" , (*dvs_6axis_config)); -sh_css_free (*dvs_6axis_config); +kvfree (*dvs_6axis_config); *dvs_6axis_config =NULL ; } }
drivers/staging/media/atomisp/pci/sh_css_param_shading.c +4 -3
@@ -360,12 +360,13 @@ ia_css_shading_table_alloc( me->fraction_bits =0 ;for (i =0 ; i <IA_CSS_SC_NUM_COLORS ; i++) { me->data[i] = -sh_css_malloc (width * height *sizeof (*me->data[0 ])); +kvmalloc (width * height *sizeof (*me->data[0 ]), +GFP_KERNEL );if (!me->data[i]) {unsigned int j;for (j =0 ; j < i; j++) { -sh_css_free (me->data[j]); +kvfree (me->data[j]); me->data[j] =NULL ; }kfree (me);
@@ -392,7 +393,7 @@ ia_css_shading_table_free(struct ia_css_shading_table *table)for (i =0 ; i <IA_CSS_SC_NUM_COLORS ; i++) {if (table->data[i]) { -sh_css_free (table->data[i]); +kvfree (table->data[i]); table->data[i] =NULL ; } }
drivers/staging/media/atomisp/pci/sh_css_params.c +144 -118
542 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v2 20/41 media: atomisp: avoid OOPS due to non-existing ref_frames
In reply to Mauro Carvalho Chehabstage->args->delay_frames array could point to NULL frames.
What's weird is that we didn't notice this behavior with the Intel Aero Yocto code.
Handle it, while adding a notice at the code, as this could be due to some broken pipeline setup.
--- .../pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 13 +++++++++---- drivers/staging/media/atomisp/pci/sh_css_sp.c | 11 +++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/isp/kernels/ref/ref_1.0/ia_css_ref.host.c +9 -4
@@ -29,10 +29,15 @@ ia_css_ref_config( {unsigned int elems_a =ISP_VEC_NELEMS , i; - (void )size; -ia_css_dma_configure_from_info (&to->port_b, &from->ref_frames[0 ]->info); - to->width_a_over_b = elems_a / to->port_b.elems; - to->dvs_frame_delay = from->dvs_frame_delay; +if (from->ref_frames[0 ]) { +ia_css_dma_configure_from_info (&to->port_b, &from->ref_frames[0 ]->info); + to->width_a_over_b = elems_a / to->port_b.elems; + to->dvs_frame_delay = from->dvs_frame_delay; + }else { + to->width_a_over_b =1 ; + to->dvs_frame_delay =0 ; + to->port_b.elems = elems_a; + }for (i =0 ; i <MAX_NUM_VIDEO_DELAY_FRAMES ; i++) {if (from->ref_frames[i]) { to->ref_frame_addr_y[i] = from->ref_frames[i]->data +
drivers/staging/media/atomisp/pci/sh_css_sp.c +11 -0
@@ -839,6 +839,17 @@ configure_isp_from_args(ia_css_dvs_configure (binary, &args->out_frame[0 ]->info);ia_css_output_configure (binary, &args->out_frame[0 ]->info);ia_css_raw_configure (pipeline, binary, &args->in_frame->info, &binary->in_frame_info, two_ppc, deinterleaved); + +/* +* FIXME: args->delay_frames can be NULL here +* +* Somehow, the driver at the Intel Atom Yocto tree doesn't seem to +* suffer from the same issue. +* +* Anyway, the function below should now handle a NULL delay_frames +* without crashing, but the pipeline should likely be built without +* adding it at the first place (or there are a hidden bug somewhere) +*/ ia_css_ref_configure (binary, args->delay_frames, pipeline->dvs_frame_delay);ia_css_tnr_configure (binary, args->tnr_frames);ia_css_bayer_io_config (binary, args);
Signature · 1 line
2.26.2
PATCH v2 21/41 media: atomisp: Clean up if block in sh_css_sp_init_stage
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
../drivers/staging/media/atomisp/pci/sh_css_sp.c:1039:23: warning:
address of 'binary->in_frame_info' will always evaluate to 'true' [-Wpointer-bool-conversion]
} else if (&binary->in_frame_info) {
~~ ~~~~~~~~^~~~~~~~~~~~~in_frame_info is not a pointer so if binary is not NULL, in_frame_info's address cannot be NULL. Change this to an else since it will always be evaluated as one.
While we are here, clean up this if block. The contents of both if blocks are the same but a check against "stage == 0" is added when ISP2401 is defined. USE_INPUT_SYSTEM_VERSION_2401 is only defined when isp2401_system_global.h is included, which only happens when ISP2401. In other words, USE_INPUT_SYSTEM_VERSION_2401 always requires ISP2401 to be defined so the '#ifndef ISP2401' makes no sense. Remove that part of the block to simplify everything.
--- drivers/staging/media/atomisp/pci/sh_css_sp.c | 27 +++---------------- 1 file changed, 4 insertions(+), 23 deletions(-)
drivers/staging/media/atomisp/pci/sh_css_sp.c +4 -23
@@ -1027,34 +1027,15 @@ sh_css_sp_init_stage(struct ia_css_binary *binary,return err;#ifdef USE_INPUT_SYSTEM_VERSION_2401 -#ifndef ISP2401 - if (args->in_frame) - { +if (stage ==0 ) { pipe =find_pipe_by_num (sh_css_sp_group.pipe[thread_id].pipe_num);if (!pipe)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) - return IA_CSS_ERR_INTERNAL_ERROR; - ia_css_get_crop_offsets(pipe, &binary->in_frame_info); -#else - if (stage == 0) - { - if (args->in_frame) { - pipe = find_pipe_by_num(sh_css_sp_group.pipe[thread_id].pipe_num); - if (!pipe) - return IA_CSS_ERR_INTERNAL_ERROR; + +if (args->in_frame)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) - return IA_CSS_ERR_INTERNAL_ERROR; +else ia_css_get_crop_offsets (pipe, &binary->in_frame_info); - } -#endif }#else (void )pipe;/*avoid build warning*/
Signature · 1 line
2.26.2
PATCH v2 22/41 media: atomisp: Remove second increment of count in atomisp_subdev_probe
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
../drivers/staging/media/atomisp/pci/atomisp_v4l2.c:1097:3: warning:
variable 'count' is incremented both in the loop header and in the loop body [-Wfor-loop-analysis]
count++;
^This was probably unintentional, remove it.
--- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 1 - 1 file changed, 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -1
@@ -1098,7 +1098,6 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)if (camera_count)break ;msleep (SUBDEV_WAIT_TIMEOUT ); - count++; }/* Wait more time to give more time for subdev init code to finish */ msleep (5 *SUBDEV_WAIT_TIMEOUT );
Signature · 1 line
2.26.2
PATCH v2 23/41 media: atomisp: Remove unnecessary NULL checks in ia_css_pipe_load_extension
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
../drivers/staging/media/atomisp/pci/sh_css.c:8537:14: warning: address of 'pipe->output_stage' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (&pipe->output_stage)
~~ ~~~~~~^~~~~~~~~~~~
../drivers/staging/media/atomisp/pci/sh_css.c:8545:14: warning: address
of 'pipe->vf_stage' will always evaluate to 'true'
[-Wpointer-bool-conversion]
if (&pipe->vf_stage)
~~ ~~~~~~^~~~~~~~output_stage and vf_stage are pointers in the middle of a struct, their addresses cannot be NULL if pipe is not NULL and pipe is already checked for NULL in this function. Simplify this if block.
--- drivers/staging/media/atomisp/pci/sh_css.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-)
drivers/staging/media/atomisp/pci/sh_css.c +3 -16
@@ -8491,22 +8491,9 @@ ia_css_pipe_load_extension(struct ia_css_pipe *pipe, }if (firmware->info.isp.type ==IA_CSS_ACC_OUTPUT ) - { -if (&pipe->output_stage) -append_firmware (&pipe->output_stage, firmware); -else { -IA_CSS_LEAVE_ERR_PRIVATE (IA_CSS_ERR_INTERNAL_ERROR ); -return IA_CSS_ERR_INTERNAL_ERROR ; - } - }else if (firmware->info.isp.type ==IA_CSS_ACC_VIEWFINDER ) - { -if (&pipe->vf_stage) -append_firmware (&pipe->vf_stage, firmware); -else { -IA_CSS_LEAVE_ERR_PRIVATE (IA_CSS_ERR_INTERNAL_ERROR ); -return IA_CSS_ERR_INTERNAL_ERROR ; - } - } +append_firmware (&pipe->output_stage, firmware); +else if (firmware->info.isp.type ==IA_CSS_ACC_VIEWFINDER ) +append_firmware (&pipe->vf_stage, firmware); err =acc_load_extension (firmware);IA_CSS_LEAVE_ERR_PRIVATE (err);
Signature · 1 line
2.26.2
PATCH v2 24/41 media: atomisp: Remove unnecessary NULL check in atomisp_param
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
drivers/staging/media/atomisp/pci/atomisp_cmd.c:4278:17: warning:
address of 'config->info' will always evaluate to 'true' [-Wpointer-bool-conversion]
if (!&config->info) {
~ ~~~~~~~~^~~~config cannot be NULL because it comes from an ioctl, which ensures that the user is not giving us an invalid pointer through copy_from_user. If config is not NULL, info cannot be NULL. Remove this check.
--- drivers/staging/media/atomisp/pci/atomisp_cmd.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +0 -5
@@ -4270,7 +4270,6 @@ int atomisp_set_parameters(struct video_device *vdev,int atomisp_param (struct atomisp_sub_device *asd,int flag,struct atomisp_parm *config) { -struct atomisp_device *isp = asd->isp;struct ia_css_pipe_config *vp_cfg = &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ]. pipe_configs[IA_CSS_PIPE_ID_VIDEO ];
@@ -4281,10 +4280,6 @@ int atomisp_param(struct atomisp_sub_device *asd, int flag,atomisp_css_get_dvs_grid_info ( &asd->params.curr_grid_info); -if (!&config->info) { -dev_err (isp->dev,"ERROR: NULL pointer in grid_info\n" ); -return -EINVAL ; - }atomisp_curr_user_grid_info (asd, &config->info);/* We always return the resolution and stride even if there is
Signature · 1 line
2.26.2
PATCH v2 25/41 media: atomisp: Avoid overflow in compute_blending
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c:129:35:
warning: implicit conversion from 'unsigned long' to 'int32_t' (aka 'int') changes value from 18446744073709543424 to -8192 [-Wconstant-conversion]
return MAX(MIN(isp_strength, 0), -XNR_BLENDING_SCALE_FACTOR);
~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~XNR_BLENDING_SCALE_FACTOR is BIT(13), or 8192, which will easily fit into a signed 32-bit integer. However, it is an unsigned long, which means that negating it is the same as subtracting that value from ULONG_MAX + 1, which causes it to be larger than a signed 32-bit integer so it gets implicitly converted.
We can avoid this by using the variable isp_scale, which holds the value of XNR_BLENDING_SCALE_FACTOR already, where the implicit conversion from unsigned long to s32 already happened. If that were to ever overflow, clang would warn: https://godbolt.org/z/EeSxLG
--- .../atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c +1 -1
@@ -126,7 +126,7 @@ compute_blending(int strength)* exactly as s0.11 fixed point, but -1.0 can. */ isp_strength = -(((strength * isp_scale) + offset) / host_scale); -return MAX (MIN (isp_strength,0 ), -XNR_BLENDING_SCALE_FACTOR ); +return MAX (MIN (isp_strength,0 ), -isp_scale); }void
Signature · 1 line
2.26.2
PATCH v2 26/41 media: atomisp: Remove binary_supports_input_format
In reply to Mauro Carvalho ChehabFrom: Nathan Chancellor <[email protected]>
Clang warns:
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c:1707:64:
warning: implicit conversion from enumeration type 'const enum ia_css_frame_format' to different enumeration type 'enum atomisp_input_format' [-Wenum-conversion]
binary_supports_input_format(xcandidate, req_in_info->format));
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~^~~~~~As it turns out, binary_supports_input_format only asserts that xcandidate is not NULL and just returns true so this call is never actually made.
There are other functions that are called that assert info is not NULL so this function actually serves no purpose. Remove it. It can be brought back if needed later.
--- .../atomisp/pci/runtime/binary/src/binary.c | 21 ------------------- 1 file changed, 21 deletions(-)
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +0 -21
@@ -859,18 +859,6 @@ binary_supports_output_format(const struct ia_css_binary_xinfo *info,return false; } -#ifdef ISP2401 -static bool -binary_supports_input_format (const struct ia_css_binary_xinfo *info, -enum atomisp_input_format format) -{ -assert (info); - (void )format; - -return true; -} -#endif -static bool binary_supports_vf_format (const struct ia_css_binary_xinfo *info,enum ia_css_frame_format format)
@@ -1701,15 +1689,6 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, binary_supports_output_format(xcandidate, req_bin_out_info->format));continue ; } -#ifdef ISP2401 -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 ; - } -#endif if (xcandidate->num_output_pins > 1 && /* in case we have a second output pin, */ req_vf_info && /* and we need vf output. */
Signature · 1 line
2.26.2
PATCH v2 27/41 media: atomisp: avoid an extra memset() when alloc memory
In reply to Mauro Carvalho ChehabUse the variant which zeroes the memory when allocating, instead of having an explicit memset.
--- .../staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c | 3 +-- drivers/staging/media/atomisp/pci/sh_css.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c +1 -2
@@ -593,12 +593,11 @@ static enum ia_css_err pipeline_stage_create( out_frame[i] = stage_desc->out_frame[i]; } - stage =kvmalloc (sizeof (*stage),GFP_KERNEL ); + stage =kvzalloc (sizeof (*stage),GFP_KERNEL );if (!stage) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; goto ERR; } -memset (stage,0 ,sizeof (*stage));if (firmware) { stage->binary =NULL ;
drivers/staging/media/atomisp/pci/sh_css.c +1 -2
@@ -9398,7 +9398,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, }/* allocate the stream instance */ - curr_stream =kmalloc (sizeof (struct ia_css_stream ),GFP_KERNEL ); + curr_stream =kzalloc (sizeof (struct ia_css_stream ),GFP_KERNEL );if (!curr_stream) { err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
@@ -9406,7 +9406,6 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,return err; }/* default all to 0 */ -memset (curr_stream,0 ,sizeof (struct ia_css_stream )); curr_stream->info.metadata_info = md_info;/* allocate pipes */
Signature · 1 line
2.26.2
PATCH v2 28/41 media: atomisp: remove some trivial wrappers from compat css20
In reply to Mauro Carvalho ChehabThere are tons of code inside atomisp_compat_css20.c, but several of them are just trivial wrappers to other functions.
Getting rid of all of them will take some time, but let's start getting rid of some of the trivial ones.
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 5 +- .../media/atomisp/pci/atomisp_compat.h | 10 +-- .../media/atomisp/pci/atomisp_compat_css20.c | 72 ++----------------- .../media/atomisp/pci/atomisp_compat_css20.h | 6 -- .../staging/media/atomisp/pci/atomisp_csi2.c | 4 +- .../staging/media/atomisp/pci/atomisp_drvfs.c | 5 +- .../staging/media/atomisp/pci/atomisp_fops.c | 2 +- .../staging/media/atomisp/pci/atomisp_ioctl.c | 4 +- .../staging/media/atomisp/pci/atomisp_v4l2.c | 15 ++-- .../media/atomisp/pci/mmu/sh_mmu_mrfld.c | 2 +- .../media/atomisp/pci/sh_css_firmware.c | 8 +-- 11 files changed, 35 insertions(+), 98 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +3 -2
@@ -57,6 +57,7 @@#include "ia_css_types.h" #include "ia_css_stream.h" +#include "ia_css_debug.h" #include "error_support.h" #include "bits.h"
@@ -1503,8 +1504,8 @@ void atomisp_wdt_work(struct work_struct *work) }if (css_recover) { -atomisp_css_debug_dump_sp_sw_debug_info (); -atomisp_css_debug_dump_debug_info (__func__); +ia_css_debug_dump_sp_sw_debug_info (); +ia_css_debug_dump_debug_info (__func__);for (i =0 ; i < isp->num_of_streams; i++) {struct atomisp_sub_device *asd = &isp->asd[i];
drivers/staging/media/atomisp/pci/atomisp_compat.h +3 -7
@@ -34,11 +34,7 @@ struct atomisp_metadata_buf {struct list_head list; }; -void atomisp_css_debug_dump_sp_sw_debug_info (void ); -void atomisp_css_debug_dump_debug_info (const char *context); -void atomisp_css_debug_set_dtrace_level (const unsigned int trace_level); - -void atomisp_store_uint32 (hrt_address addr,uint32_t data); +void atomisp_css2_hw_store_32 (hrt_address addr,uint32_t data);void atomisp_load_uint32 (hrt_address addr,uint32_t *data);int atomisp_css_init (struct atomisp_device *isp);
@@ -84,9 +80,9 @@ int atomisp_q_dis_buffer_to_css(struct atomisp_sub_device *asd,enum atomisp_input_stream_id stream_id, enum ia_css_pipe_id css_pipe_id); -void atomisp_css_mmu_invalidate_cache (void ); +void ia_css_mmu_invalidate_cache (void ); -void atomisp_css_mmu_invalidate_tlb (void ); +void ia_css_mmu_invalidate_cache (void );int atomisp_css_start (struct atomisp_sub_device *asd,enum ia_css_pipe_id pipe_id,bool in_reset);
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +7 -65
144 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_compat_css20.h +0 -6
@@ -155,17 +155,11 @@ void atomisp_css_set_b_gamma_table(struct atomisp_sub_device *asd,void atomisp_css_set_anr_thres (struct atomisp_sub_device *asd,struct ia_css_anr_thres *anr_thres); -int atomisp_css_check_firmware_version (struct atomisp_device *isp); -int atomisp_css_load_firmware (struct atomisp_device *isp); -void atomisp_css_unload_firmware (struct atomisp_device *isp); -void atomisp_css_set_dvs_6axis (struct atomisp_sub_device *asd,struct ia_css_dvs_6axis_config *dvs_6axis); -unsigned int atomisp_css_debug_get_dtrace_level (void ); -int atomisp_css_debug_dump_isp_binary (void );int atomisp_css_dump_sp_raw_copy_linecount (bool reduced);
drivers/staging/media/atomisp/pci/atomisp_csi2.c +2 -2
@@ -384,9 +384,9 @@ static void atomisp_csi2_configure_isp2401(struct atomisp_sub_device *asd)for (n =0 ; n < csi2_port_lanes[port] +1 ; n++) {hrt_address base = csi2_port_base[port] + csi2_lane_base[n]; -atomisp_store_uint32 (base +CSI2_REG_RX_CSI_DLY_CNT_TERMEN , +atomisp_css2_hw_store_32 (base +CSI2_REG_RX_CSI_DLY_CNT_TERMEN , n ==0 ? clk_termen : dat_termen); -atomisp_store_uint32 (base +CSI2_REG_RX_CSI_DLY_CNT_SETTLE , +atomisp_css2_hw_store_32 (base +CSI2_REG_RX_CSI_DLY_CNT_SETTLE , n ==0 ? clk_settle : dat_settle); } }
drivers/staging/media/atomisp/pci/atomisp_drvfs.c +3 -2
@@ -24,6 +24,7 @@#include "atomisp_ioctl.h" #include "atomisp_drvfs.h" #include "hmm/hmm.h" +#include "ia_css_debug.h" /* * _iunit_debug:
@@ -94,7 +95,7 @@ static inline int iunit_dump_dbgopt(struct atomisp_device *isp,static ssize_t iunit_dbglvl_show (struct device_driver *drv,char *buf) { - iunit_debug.dbglvl =atomisp_css_debug_get_dtrace_level (); + iunit_debug.dbglvl = dbg_level;return sprintf (buf,"dtrace level:%u\n" , iunit_debug.dbglvl); }
@@ -106,7 +107,7 @@ static ssize_t iunit_dbglvl_store(struct device_driver *drv, const char *buf, || iunit_debug.dbglvl > 9) {return -ERANGE ; } -atomisp_css_debug_set_dtrace_level (iunit_debug.dbglvl); +ia_css_debug_set_dtrace_level (iunit_debug.dbglvl);return size; }
drivers/staging/media/atomisp/pci/atomisp_fops.c +1 -1
@@ -997,7 +997,7 @@ static int atomisp_release(struct file *file)atomisp_css_uninit (isp);if (defer_fw_load) { -atomisp_css_unload_firmware (isp); +ia_css_unload_firmware (); isp->css_env.isp_css_fw.data =NULL ; isp->css_env.isp_css_fw.bytes =0 ; }
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +2 -2
@@ -1619,9 +1619,9 @@ static void atomisp_dma_burst_len_cfg(struct atomisp_sub_device *asd) ATOMISP_SUBDEV_PAD_SINK);if (sink->width * sink->height >=4096 *3072 ) -atomisp_store_uint32 (DMA_BURST_SIZE_REG ,0x7F ); +atomisp_css2_hw_store_32 (DMA_BURST_SIZE_REG ,0x7F );else -atomisp_store_uint32 (DMA_BURST_SIZE_REG ,0x00 ); +atomisp_css2_hw_store_32 (DMA_BURST_SIZE_REG ,0x00 ); }/*
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +9 -6
@@ -42,6 +42,8 @@#include "hmm/hmm.h" #include "atomisp_trace_event.h" +#include "sh_css_firmware.h" +#include "device_access.h" /* Timeouts to wait for all subdevs to be registered */
@@ -657,7 +659,7 @@ static int __maybe_unused atomisp_restore_iunit_reg(struct atomisp_device *isp)* which has bugs(like sighting:4567697 and 4567699) and * will be removed in B0 */ -atomisp_store_uint32 (MRFLD_CSI_RECEIVER_SELECTION_REG ,1 ); +atomisp_css2_hw_store_32 (MRFLD_CSI_RECEIVER_SELECTION_REG ,1 );return 0 ; }
@@ -687,7 +689,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)if (!(irq & (1 <<INTR_IIR ))) goto done; -atomisp_store_uint32 (MRFLD_INTR_CLEAR_REG ,0xFFFFFFFF ); +atomisp_css2_hw_store_32 (MRFLD_INTR_CLEAR_REG ,0xFFFFFFFF );atomisp_load_uint32 (MRFLD_INTR_STATUS_REG , &irq);if (irq !=0 ) { dev_err(isp->dev,
@@ -702,7 +704,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq);if (!(irq & (1 <<INTR_IIR ))) { -atomisp_store_uint32 (MRFLD_INTR_ENABLE_REG ,0x0 ); +atomisp_css2_hw_store_32 (MRFLD_INTR_ENABLE_REG ,0x0 ); goto done; } dev_err(isp->dev,
@@ -1763,7 +1765,8 @@ static int atomisp_pci_probe(struct pci_dev *dev, goto load_fw_fail; } - err =atomisp_css_check_firmware_version (isp); + err =sh_css_check_firmware_version (isp->dev, + isp->firmware->data);if (err) {dev_dbg (&dev->dev,"Firmware version check failed\n" ); goto fw_validation_fail;
@@ -1792,7 +1795,7 @@ static int atomisp_pci_probe(struct pci_dev *dev,* bugs(like sighting:4567697 and 4567699) and will be removed * in B0 */ -atomisp_store_uint32 (MRFLD_CSI_RECEIVER_SELECTION_REG ,1 ); +atomisp_css2_hw_store_32 (MRFLD_CSI_RECEIVER_SELECTION_REG ,1 );if ((id->device &ATOMISP_PCI_DEVICE_SOC_MASK ) ==ATOMISP_PCI_DEVICE_SOC_MRFLD ) {
@@ -1943,7 +1946,7 @@ static void atomisp_pci_remove(struct pci_dev *dev)atomisp_acc_cleanup (isp); -atomisp_css_unload_firmware (isp); +ia_css_unload_firmware ();hmm_cleanup ();pm_runtime_forbid (&dev->dev);
drivers/staging/media/atomisp/pci/mmu/sh_mmu_mrfld.c +1 -1
@@ -62,7 +62,7 @@ static unsigned int sh_get_pd_base(struct isp_mmu *mmu,*/ static void sh_tlb_flush (struct isp_mmu *mmu) { -atomisp_css_mmu_invalidate_cache (); +ia_css_mmu_invalidate_cache (); }struct isp_mmu_client sh_mmu_mrfld = {
drivers/staging/media/atomisp/pci/sh_css_firmware.c +4 -4
@@ -203,7 +203,7 @@ sh_css_check_firmware_version(struct device *dev, const char *fw_data) }/* For now, let's just accept a wrong version, even if wrong */ -return true; +return 0 ; }enum ia_css_err
@@ -212,7 +212,7 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,unsigned int i;struct ia_css_fw_info *binaries;struct sh_css_fw_bi_file_h *file_header; -bool valid_firmware = false; +int ret;const char *release_version;if (!atomisp_hw_is_isp2401)
@@ -224,8 +224,8 @@ sh_css_load_firmware(struct device *dev, const char *fw_data, file_header = &firmware_header->file_header; binaries = &firmware_header->binary_header;strscpy (FW_rel_ver_name, file_header->version,min (sizeof (FW_rel_ver_name),sizeof (file_header->version))); - valid_firmware =sh_css_check_firmware_version (dev, fw_data); -if (!valid_firmware) { + ret =sh_css_check_firmware_version (dev, fw_data); +if (ret) {IA_CSS_ERROR ("CSS code version (%s) and firmware version (%s) mismatch!" , file_header->version, release_version);return IA_CSS_ERR_VERSION_MISMATCH ;
Signature · 1 line
2.26.2
PATCH v2 29/41 media: atomisp: do another round of coding style cleanup
In reply to Mauro Carvalho ChehabRun checkpatch --fix-inline again, in order to get rid of some additional issues that got introduced (or that checkpatch can now detect).
This should help preventing receiving random cleanups, while keeping the code on a better shape.
--- drivers/staging/media/atomisp/TODO | 4 +-- drivers/staging/media/atomisp/i2c/Kconfig | 2 +- .../media/atomisp/i2c/atomisp-gc0310.c | 1 - .../media/atomisp/i2c/atomisp-ov2680.c | 2 +- drivers/staging/media/atomisp/i2c/ov2680.h | 2 ++ .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 4 +-- .../staging/media/atomisp/include/hmm/hmm.h | 2 +- .../media/atomisp/include/linux/atomisp.h | 2 +- .../staging/media/atomisp/pci/atomisp_cmd.c | 3 +- .../media/atomisp/pci/atomisp_gmin_platform.c | 5 ++-- .../staging/media/atomisp/pci/atomisp_ioctl.c | 5 ++-- .../staging/media/atomisp/pci/atomisp_v4l2.c | 4 ++- .../css_2400_system/hive/ia_css_isp_states.c | 2 +- .../css_2401_system/hive/ia_css_isp_configs.c | 1 - .../css_2401_system/hive/ia_css_isp_states.c | 2 +- .../pci/css_2401_system/isys_dma_global.h | 1 + drivers/staging/media/atomisp/pci/css_trace.h | 1 - .../pci/hive_isp_css_common/host/debug.c | 1 - .../hive_isp_css_common/host/debug_private.h | 1 - .../pci/hive_isp_css_include/string_support.h | 1 - .../media/atomisp/pci/ia_css_isp_states.h | 2 +- .../media/atomisp/pci/ia_css_pipe_public.h | 2 +- .../staging/media/atomisp/pci/ia_css_types.h | 1 - .../isp/kernels/anr/anr_2/ia_css_anr2_param.h | 2 +- .../pci/isp/kernels/bnlm/ia_css_bnlm.host.c | 2 +- .../macc/macc1_5/ia_css_macc1_5_param.h | 2 +- .../sdis/common/ia_css_sdis_common.host.h | 4 +-- .../media/atomisp/pci/isp2400_system_local.h | 5 ++++ .../media/atomisp/pci/isp2401_system_local.h | 5 ++++ .../atomisp/pci/runtime/event/src/event.c | 1 - .../atomisp/pci/runtime/frame/src/frame.c | 9 +++--- drivers/staging/media/atomisp/pci/sh_css.c | 29 ++++++++++++------- .../staging/media/atomisp/pci/sh_css_defs.h | 3 -- .../staging/media/atomisp/pci/sh_css_params.c | 6 +++- .../staging/media/atomisp/pci/sh_css_struct.h | 1 + 35 files changed, 67 insertions(+), 53 deletions(-)
drivers/staging/media/atomisp/TODO +2 -2
@@ -173,8 +173,8 @@ Limitations device but can also be extracted from the upgrade kit if you've managed to lose them somehow. -2. Without a 3A libary the capture behaviour is not very good. To take a good - picture, you need tune ISP parameters by IOCTL functions or use a 3A libary +2. Without a 3A library the capture behaviour is not very good. To take a good + picture, you need tune ISP parameters by IOCTL functions or use a 3A library such as libxcam. 3. The driver is intended to drive the PCI exposed versions of the device.
drivers/staging/media/atomisp/i2c/Kconfig +1 -1
@@ -57,7 +57,7 @@ config VIDEO_ATOMISP_GC0310 ---help--- This is a Video4Linux2 sensor-level driver for the Galaxycore GC0310 0.3MP sensor. - + config VIDEO_ATOMISP_OV2680 tristate "Omnivision OV2680 sensor support" depends on ACPI
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +0 -1
@@ -1321,7 +1321,6 @@ static int gc0310_probe(struct i2c_client *client) __func__, acpi_device_bid(adev), acpi_device_hid(adev));// FIXME: may need to release resources allocated by acpi_bus_get_device() - dev =kzalloc (sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ;
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +1 -1
@@ -703,7 +703,7 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)if (!dev || !dev->platform_data)return -ENODEV ; -dev_dbg (&client->dev,"%s: %s" , __func__, flag?"on" :"off" ); +dev_dbg (&client->dev,"%s: %s" , __func__, flag ?"on" :"off" );if (flag) { ret |= dev->platform_data->v1p8_ctrl (sd,1 );
drivers/staging/media/atomisp/i2c/ov2680.h +2 -0
@@ -456,6 +456,7 @@ static struct ov2680_reg const ov2680_656x496_30fps[] = {// {0x5090, 0x0c}, {} }; +/* * 800x600 30fps VBlanking 1lane 10Bit (binning) */
@@ -500,6 +501,7 @@ static struct ov2680_reg const ov2680_720x592_30fps[] = { {0x5081, 0x41}, {} }; +/* * 800x600 30fps VBlanking 1lane 10Bit (binning) */
drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +2 -2
@@ -1087,7 +1087,7 @@ static int ov5693_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_VCM_SLEW : ret =ov5693_t_vcm_slew (&dev->sd, ctrl->val);break ; -case V4L2_CID_VCM_TIMEING : +case V4L2_CID_VCM_TIMING : ret =ov5693_t_vcm_timing (&dev->sd, ctrl->val);break ;default :
@@ -1230,7 +1230,7 @@ static const struct v4l2_ctrl_config ov5693_controls[] = { }, { .ops = &ctrl_ops, - .id = V4L2_CID_VCM_TIMEING, + .id = V4L2_CID_VCM_TIMING, .type = V4L2_CTRL_TYPE_INTEGER, .name = "vcm step time", .min = 0,
drivers/staging/media/atomisp/include/hmm/hmm.h +1 -1
@@ -29,7 +29,7 @@#include "ia_css_types.h" #define mmgr_NULL ((ia_css_ptr)0) -#define mmgr_EXCEPTION ((ia_css_ptr)-1) +#define mmgr_EXCEPTION ((ia_css_ptr) - 1)int hmm_pool_register (unsigned int pool_size,enum hmm_pool_type pool_type);void hmm_pool_unregister (enum hmm_pool_type pool_type);
drivers/staging/media/atomisp/include/linux/atomisp.h +1 -1
@@ -1274,7 +1274,7 @@ struct atomisp_sensor_ae_bracketing_lut {/* VCM slew control */ #define V4L2_CID_VCM_SLEW (V4L2_CID_CAMERA_LASTP1 + 11)/* VCM step time */ -#define V4L2_CID_VCM_TIMEING (V4L2_CID_CAMERA_LASTP1 + 12) +#define V4L2_CID_VCM_TIMING (V4L2_CID_CAMERA_LASTP1 + 12)/* Query Focus Status */ #define V4L2_CID_FOCUS_STATUS (V4L2_CID_CAMERA_LASTP1 + 14)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +1 -2
@@ -6005,10 +6005,9 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) output_info.padded_width, 8); pipe->pix.sizeimage =PAGE_ALIGN (f->fmt.pix.height * pipe->pix.bytesperline); - }dev_dbg (isp->dev,"%s: image size: %d, %d bytes per line\n" , - __func__, pipe->pix.sizeimage,pipe-> pix.bytesperline); + __func__, pipe->pix.sizeimage, pipe->pix.bytesperline);if (f->fmt.pix.field ==V4L2_FIELD_ANY ) f->fmt.pix.field =V4L2_FIELD_NONE ;
drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c +2 -3
@@ -479,7 +479,6 @@ static struct gmin_subdev *gmin_subdev_add(struct v4l2_subdev *subdev)if (i >=MAX_SUBDEVS )return NULL ; -if (power) { gmin_subdevs[i].pwm_i2c_addr = power->addr; dev_info(dev,
@@ -616,6 +615,7 @@ static int axp_regulator_set(struct device *dev, struct gmin_subdev *gs,static int axp_v1p8_on (struct device *dev,struct gmin_subdev *gs) {int ret; + ret =axp_regulator_set (dev, gs, gs->eldo2_sel_reg, gs->eldo2_1p8v,ELDO_CTRL_REG , gs->eldo2_ctrl_shift, true);if (ret)
@@ -640,6 +640,7 @@ static int axp_v1p8_on(struct device *dev, struct gmin_subdev *gs)static int axp_v1p8_off (struct device *dev,struct gmin_subdev *gs) {int ret; + ret =axp_regulator_set (dev, gs, gs->eldo1_sel_reg, gs->eldo1_1p8v,ELDO_CTRL_REG , gs->eldo1_ctrl_shift, false);if (ret)
@@ -650,7 +651,6 @@ static int axp_v1p8_off(struct device *dev, struct gmin_subdev *gs)return ret; } -static int gmin_gpio0_ctrl (struct v4l2_subdev *subdev,int on) {struct gmin_subdev *gs =find_gmin_subdev (subdev);
@@ -753,7 +753,6 @@ static int gmin_v1p8_ctrl(struct v4l2_subdev *subdev, int on)dev_err (subdev->dev,"Couldn't set power mode for v1p2\n" ); } -return -EINVAL ; }
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +2 -3
@@ -1563,7 +1563,7 @@ int atomisp_stream_on_master_slave_sensor(struct atomisp_device *isp,/* FIXME! ISP2400 */ static void __wdt_on_master_slave_sensor (struct atomisp_device *isp, -unsigned int wdt_duration) +unsigned int wdt_duration) {if (atomisp_buffers_queued (&isp->asd[0 ]))atomisp_wdt_refresh (&isp->asd[0 ], wdt_duration);
@@ -2467,7 +2467,6 @@ static int atomisp_camera_s_ext_ctrls(struct file *file, void *fh,int i;int ret =0 ; -if (!atomisp_hw_is_isp2401) motor = isp->inputs[asd->input_curr].motor;else
@@ -2484,7 +2483,7 @@ static int atomisp_camera_s_ext_ctrls(struct file *file, void *fh,case V4L2_CID_EXPOSURE_METERING :case V4L2_CID_IRIS_ABSOLUTE :case V4L2_CID_FNUMBER_ABSOLUTE : -case V4L2_CID_VCM_TIMEING : +case V4L2_CID_VCM_TIMING :case V4L2_CID_VCM_SLEW :case V4L2_CID_3A_LOCK :case V4L2_CID_TEST_PATTERN :
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +3 -1
@@ -1092,10 +1092,11 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)/* FIXME: should return -EPROBE_DEFER if not all subdevs were probed */ for (count =0 ; count <SUBDEV_WAIT_TIMEOUT_MAX_COUNT ; count++) {int camera_count =0 ; +for (subdevs = pdata->subdevs; subdevs->type; ++subdevs) {if (subdevs->type ==RAW_CAMERA || subdevs->type ==SOC_CAMERA ) - camera_count ++; + camera_count++; }if (camera_count)break ;
@@ -1571,6 +1572,7 @@ static int init_atomisp_wdts(struct atomisp_device *isp)for (i =0 ; i < isp->num_of_streams; i++) {struct atomisp_sub_device *asd = &isp->asd[i]; +if (!atomisp_hw_is_isp2401)timer_setup (&asd->wdt, atomisp_wdt,0 );else {
drivers/staging/media/atomisp/pci/css_2400_system/hive/ia_css_isp_states.c +1 -1
@@ -210,7 +210,7 @@ ia_css_initialize_ynr_state(/* Code generated by genparam/genstate.c:gen_state_init_table() */ -void (* ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])( +void (*ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])(const struct ia_css_binary *binary) = { ia_css_initialize_aa_state, ia_css_initialize_cnr_state,
drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_configs.c +0 -1
@@ -272,7 +272,6 @@ ia_css_configure_output( "ia_css_configure_output() leave:\n"); } -/* Code generated by genparam/genconfig.c:gen_configure_function() */ void
drivers/staging/media/atomisp/pci/css_2401_system/hive/ia_css_isp_states.c +1 -1
@@ -210,7 +210,7 @@ ia_css_initialize_ynr_state(/* Code generated by genparam/genstate.c:gen_state_init_table() */ -void (* ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])( +void (*ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])(const struct ia_css_binary *binary) = { ia_css_initialize_aa_state, ia_css_initialize_cnr_state,
drivers/staging/media/atomisp/pci/css_2401_system/isys_dma_global.h +1 -0
@@ -46,6 +46,7 @@ struct isys2401_dma_port_cfg_s {u32 cropping;u32 width; }; +/* end of DMA Port */ /************************************************
drivers/staging/media/atomisp/pci/css_trace.h +0 -1
@@ -171,7 +171,6 @@ enum TRACE_DUMP_FORMAT {#define TRACE_ISP_DATA_SIZE (TRACE_ISP_SIZE - TRACE_ISP_HEADER_SIZE)#define TRACE_ISP_MAX_POINTS (TRACE_ISP_DATA_SIZE / TRACE_ISP_ITEM_SIZE) -/* common majors */ /* SP0 */ #define MAJOR_MAIN 1
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug.c +0 -1
@@ -20,7 +20,6 @@#include "debug_private.h" #endif /* __INLINE_DEBUG__ */ -#define __INLINE_SP__#include "sp.h"
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/debug_private.h +0 -1
@@ -22,7 +22,6 @@#define __INLINE_ISP__#include "isp.h" -#include "assert_support.h" STORAGE_CLASS_DEBUG_C bool is_debug_buffer_empty(void)
drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.h +0 -1
@@ -161,5 +161,4 @@ static inline int strcpy_s( return 0; } -#endif /* __STRING_SUPPORT_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/ia_css_isp_states.h +1 -1
@@ -65,7 +65,7 @@ struct ia_css_state_memory_offsets {#include "ia_css_binary.h" /* struct ia_css_binary */ /* Code generated by genparam/genstate.c:gen_state_init_table() */ -extern void (* ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])( +extern void (*ia_css_kernel_init_state[IA_CSS_NUM_STATE_IDS ])(const struct ia_css_binary *binary);#endif /* IA_CSS_INCLUDE_STATE */
drivers/staging/media/atomisp/pci/ia_css_pipe_public.h +1 -1
@@ -502,7 +502,7 @@ ia_css_pipe_get_qos_ext_state(struct ia_css_pipe *pipe,*/ enum ia_css_err ia_css_pipe_update_qos_ext_mapped_arg (struct ia_css_pipe *pipe, -uint32_t fw_handle, +u32 fw_handle,struct ia_css_isp_param_css_segments *css_seg,struct ia_css_isp_param_isp_segments *isp_seg);
drivers/staging/media/atomisp/pci/ia_css_types.h +0 -1
@@ -306,7 +306,6 @@ struct ia_css_shading_info {u32 bayer_scale_ver_ratio_in;u32 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.
drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2_param.h +1 -1
@@ -21,7 +21,7 @@/* Advanced Noise Reduction (ANR) thresholds */ struct ia_css_isp_anr2_params { - VMEM_ARRAY(data, ANR_PARAM_SIZE *ISP_VEC_NELEMS); + VMEM_ARRAY(data, ANR_PARAM_SIZE * ISP_VEC_NELEMS); };#endif /* __IA_CSS_ANR2_PARAM_H */
drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c +1 -1
@@ -42,7 +42,7 @@ static const s32 div_lut_intercepts[BNLM_DIV_LUT_SIZE] = {*/ static inline void bnlm_lut_encode (struct bnlm_lut *lut,const int32_t *lut_thr, -const int32_t *lut_val,const uint32_t lut_size) +const s32 *lut_val,const uint32_t lut_size) {u32 blk, i;const u32 block_size =16 ;
drivers/staging/media/atomisp/pci/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h +1 -1
@@ -25,7 +25,7 @@ struct sh_css_isp_macc1_5_params { };struct sh_css_isp_macc1_5_vmem_params { - VMEM_ARRAY(data, IA_CSS_MACC_NUM_COEFS *ISP_NWAY); + VMEM_ARRAY(data, IA_CSS_MACC_NUM_COEFS * ISP_NWAY); };#endif /* __IA_CSS_MACC1_5_PARAM_H */
drivers/staging/media/atomisp/pci/isp/kernels/sdis/common/ia_css_sdis_common.host.h +2 -2
@@ -76,12 +76,12 @@ struct sh_css_isp_sdis_vert_proj_tbl {struct sh_css_isp_sdis_hori_coef_tbl { VMEM_ARRAY(tbl[ISP_DVS_NUM_COEF_TYPES], - ISP_MAX_SDIS_HOR_COEF_NUM_VECS *ISP_NWAY); + ISP_MAX_SDIS_HOR_COEF_NUM_VECS * ISP_NWAY); };struct sh_css_isp_sdis_vert_coef_tbl { VMEM_ARRAY(tbl[ISP_DVS_NUM_COEF_TYPES], - ISP_MAX_SDIS_VER_COEF_NUM_VECS *ISP_NWAY); + ISP_MAX_SDIS_VER_COEF_NUM_VECS * ISP_NWAY); };#endif /* defined(__ISP) || defined (MK_FIRMWARE) */
drivers/staging/media/atomisp/pci/isp2400_system_local.h +5 -0
@@ -106,6 +106,7 @@ static const hrt_address IRQ_BASE[N_IRQ_ID] = { (hrt_address )0x000000000008C000ULL , (hrt_address)0x0000000000090200ULL }; +/* (hrt_address)0x0000000000000500ULL}; */
@@ -161,6 +162,7 @@ static const hrt_address INPUT_FORMATTER_BASE[N_INPUT_FORMATTER_ID] = {static const hrt_address INPUT_SYSTEM_BASE [N_INPUT_SYSTEM_ID ] = { (hrt_address )0x0000000000080000ULL }; +/* (hrt_address)0x0000000000081000ULL, */ /* capture A */ /* (hrt_address)0x0000000000082000ULL, */ /* capture B */ /* (hrt_address)0x0000000000083000ULL, */ /* capture C */
@@ -247,6 +249,7 @@ static const hrt_address IRQ_BASE[N_IRQ_ID] = { (hrt_address )0x0008C000UL , (hrt_address)0x00090200UL }; +/* (hrt_address)0x00000500UL}; */
@@ -297,12 +300,14 @@ static const hrt_address INPUT_FORMATTER_BASE[N_INPUT_FORMATTER_ID] = { (hrt_address )0x00030200UL , (hrt_address)0x00030400UL }; +/* (hrt_address)0x00030600UL, */ /* memcpy() */ /* INPUT_SYSTEM */ static const hrt_address INPUT_SYSTEM_BASE [N_INPUT_SYSTEM_ID ] = { (hrt_address )0x00080000UL }; +/* (hrt_address)0x00081000UL, */ /* capture A */ /* (hrt_address)0x00082000UL, */ /* capture B */ /* (hrt_address)0x00083000UL, */ /* capture C */
drivers/staging/media/atomisp/pci/isp2401_system_local.h +5 -0
@@ -104,6 +104,7 @@ static const hrt_address IRQ_BASE[N_IRQ_ID] = {0x000000000008C000ULL , 0x0000000000090200ULL }; +/* 0x0000000000000500ULL}; */
@@ -160,6 +161,7 @@ static const hrt_address INPUT_FORMATTER_BASE[N_INPUT_FORMATTER_ID] = {static const hrt_address INPUT_SYSTEM_BASE [N_INPUT_SYSTEM_ID ] = {0x0000000000080000ULL }; +/* 0x0000000000081000ULL, */ /* capture A */ /* 0x0000000000082000ULL, */ /* capture B */ /* 0x0000000000083000ULL, */ /* capture C */
@@ -287,6 +289,7 @@ static const hrt_address IRQ_BASE[N_IRQ_ID] = {0x0008C000UL , 0x00090200UL }; +/* 0x00000500UL}; */
@@ -336,12 +339,14 @@ static const hrt_address INPUT_FORMATTER_BASE[N_INPUT_FORMATTER_ID] = {0x00030200UL , 0x00030400UL }; +/* 0x00030600UL, */ /* memcpy() */ /* INPUT_SYSTEM */ static const hrt_address INPUT_SYSTEM_BASE [N_INPUT_SYSTEM_ID ] = {0x00080000UL }; +/* 0x00081000UL, */ /* capture A */ /* 0x00082000UL, */ /* capture B */ /* 0x00083000UL, */ /* capture C */
drivers/staging/media/atomisp/pci/runtime/event/src/event.c +0 -1
@@ -29,7 +29,6 @@/*#include "sp.h"*/ /* host2sp_enqueue_frame_data() */ -#include "assert_support.h" #include "platform_support.h" /* hrt_sleep() */
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +4 -5
@@ -281,8 +281,7 @@ enum ia_css_err ia_css_frame_allocate_contiguous(struct ia_css_frame **frame,enum ia_css_err err =IA_CSS_SUCCESS ;ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE , -"ia_css_frame_allocate_contiguous() " -"enter: width=%d, height=%d, format=%d, padded_width=%d, raw_bit_depth=%d\n" , +"ia_css_frame_allocate_contiguous() 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,
@@ -802,9 +801,9 @@ 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);#endif frame->data =hmm_alloc (frame->data_bytes, -HMM_BO_PRIVATE ,0 ,NULL , - frame->contiguous ? -ATOMISP_MAP_FLAG_CONTIGUOUS :0 ); +HMM_BO_PRIVATE ,0 ,NULL , + frame->contiguous ? +ATOMISP_MAP_FLAG_CONTIGUOUS :0 );if (frame->data == mmgr_NULL)return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ;
drivers/staging/media/atomisp/pci/sh_css.c +19 -10
@@ -3686,6 +3686,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_TNR_FRAMES ; frm++) { video_stage->args.tnr_frames[frm] = pipe->pipe_settings.video.tnr_frames[frm];
@@ -6685,7 +6686,8 @@ static enum ia_css_err load_low_light_binaries(return err; } -static bool copy_on_sp (struct ia_css_pipe *pipe) { +static bool copy_on_sp (struct ia_css_pipe *pipe) +{bool rval;assert (pipe);
@@ -7379,7 +7381,8 @@ unload_yuvpp_binaries(struct ia_css_pipe *pipe) {return IA_CSS_SUCCESS ; } -static enum ia_css_err yuvpp_start (struct ia_css_pipe *pipe) { +static enum ia_css_err yuvpp_start (struct ia_css_pipe *pipe) +{struct ia_css_binary *copy_binary;enum ia_css_err err =IA_CSS_SUCCESS ;enum sh_css_pipe_config_override copy_ovrd;
@@ -8406,7 +8409,8 @@ remove_firmware(struct ia_css_fw_info **l, struct ia_css_fw_info *firmware) {return ;/* removing single and multiple firmware is handled in acc_unload_extension() */ } -static enum ia_css_err upload_isp_code (struct ia_css_fw_info *firmware) { +static enum ia_css_err upload_isp_code (struct ia_css_fw_info *firmware) +{ia_css_ptr binary;if (!firmware) {
@@ -8663,7 +8667,8 @@ enum ia_css_err ia_css_stream_capture(return return_err; } -void ia_css_stream_request_flash (struct ia_css_stream *stream) { +void ia_css_stream_request_flash (struct ia_css_stream *stream) +{ (void )stream;assert (stream);
@@ -8764,7 +8769,8 @@ sh_css_init_host_sp_control_vars(void) {/* * create the internal structures and fill in the configuration data */ -void ia_css_pipe_config_defaults (struct ia_css_pipe_config *pipe_config) { +void ia_css_pipe_config_defaults (struct ia_css_pipe_config *pipe_config) +{ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"ia_css_pipe_config_defaults()\n" ); *pipe_config =DEFAULT_PIPE_CONFIG ; }
@@ -8786,7 +8792,8 @@ ia_css_pipe_extra_config_defaults(struct ia_css_pipe_extra_config extra_config->enable_fractional_ds = false; } -void ia_css_stream_config_defaults (struct ia_css_stream_config *stream_config) { +void ia_css_stream_config_defaults (struct ia_css_stream_config *stream_config) +{ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"ia_css_stream_config_defaults()\n" );assert (stream_config);memset (stream_config,0 ,sizeof (*stream_config));
@@ -8840,6 +8847,7 @@ ia_css_pipe_create(const struct ia_css_pipe_config *config, if (!pipe) #else } + if (!pipe) { IA_CSS_LEAVE_ERR_PRIVATE(IA_CSS_ERR_INVALID_ARGUMENTS);
@@ -9059,7 +9067,8 @@ ia_css_pipe_get_info(const struct ia_css_pipe *pipe,return IA_CSS_SUCCESS ; } -bool ia_css_pipe_has_dvs_stats (struct ia_css_pipe_info *pipe_info) { +bool ia_css_pipe_has_dvs_stats (struct ia_css_pipe_info *pipe_info) +{unsigned int i;if (pipe_info) {
@@ -9915,7 +9924,6 @@ ia_css_stream_get_info(const struct ia_css_stream *stream,*/ enum ia_css_err ia_css_stream_load (struct ia_css_stream *stream) { -if (!atomisp_hw_is_isp2401) {int i;enum ia_css_err err;
@@ -10492,7 +10500,8 @@ ia_css_update_continuous_frames(struct ia_css_stream *stream) {return IA_CSS_SUCCESS ; } -void ia_css_pipe_map_queue (struct ia_css_pipe *pipe,bool map) { +void ia_css_pipe_map_queue (struct ia_css_pipe *pipe,bool map) +{unsigned int thread_id;enum ia_css_pipe_id pipe_id;unsigned int pipe_num;
@@ -10755,7 +10764,7 @@ ia_css_pipe_get_qos_ext_state(struct ia_css_pipe *pipe, uint32_t fw_handle,/* ISP2401 */ enum ia_css_err ia_css_pipe_update_qos_ext_mapped_arg (struct ia_css_pipe *pipe, -uint32_t fw_handle, +u32 fw_handle,struct ia_css_isp_param_css_segments *css_seg,struct ia_css_isp_param_isp_segments *isp_seg) {unsigned int HIVE_ADDR_sp_group;
drivers/staging/media/atomisp/pci/sh_css_defs.h +0 -3
@@ -177,7 +177,6 @@ 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 ISP2400_SH_CSS_MAX_SCTBL_WIDTH_PER_COLOR (SH_CSS_MAX_BQ_GRID_WIDTH + 1)#define ISP2400_SH_CSS_MAX_SCTBL_HEIGHT_PER_COLOR (SH_CSS_MAX_BQ_GRID_HEIGHT + 1)
@@ -275,7 +274,6 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191] (ISP_BQ_GRID_HEIGHT (input_height, deci_factor_log2) + \SH_CSS_SCTBL_CENTERING_MARGIN +SH_CSS_SCTBL_LAST_GRID_COUNT ) - /* ISP2401: 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)
@@ -284,7 +282,6 @@ RGB[0,8191],coef[-8192,8191] -> RGB[0,8191]#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) -/* ***************************************************************** * Statistics for 3A (Auto Focus, Auto White Balance, Auto Exposure) * *****************************************************************/
drivers/staging/media/atomisp/pci/sh_css_params.c +5 -1
@@ -4249,12 +4249,16 @@ sh_css_params_write_to_ddr_internal( {unsigned int i;ia_css_ptr *virt_addr_tetra_x[ +IA_CSS_MORPH_TABLE_NUM_PLANES ];size_t *virt_size_tetra_x[ +IA_CSS_MORPH_TABLE_NUM_PLANES ];ia_css_ptr *virt_addr_tetra_y[ +IA_CSS_MORPH_TABLE_NUM_PLANES ];size_t *virt_size_tetra_y[ +IA_CSS_MORPH_TABLE_NUM_PLANES ]; virt_addr_tetra_x[0 ] = &ddr_map->tetra_r_x;
@@ -4565,7 +4569,7 @@ free_ia_css_isp_parameter_set_info(enum ia_css_err err =IA_CSS_SUCCESS ;struct ia_css_isp_parameter_set_info isp_params_info;unsigned int i; -ia_css_ptr *addrs = (ia_css_ptr *) &isp_params_info.mem_map; +ia_css_ptr *addrs = (ia_css_ptr *)&isp_params_info.mem_map;IA_CSS_ENTER_PRIVATE ("ptr = %u" , ptr);
drivers/staging/media/atomisp/pci/sh_css_struct.h +1 -0
@@ -66,6 +66,7 @@ struct sh_css {#endif ia_css_ptr sp_bin_addr;hrt_data page_table_base_index; +unsigned int size_mem_words;/* \deprecated{Use ia_css_mipi_buffer_config instead.}*/ enum ia_css_irq_type irq_type;
Signature · 1 line
2.26.2
PATCH v2 30/41 media: atomisp: get rid of non-Linux error codes
In reply to Mauro Carvalho ChehabThe atomisp driver has its own error codes under the ia_css_err.h file. On several places, those got already replaced by standard error codes, but there are still a lot more to be fixed.
Let's get rid of all of those, mapping them into the already-existing set of Linux error codes.
--- .../staging/media/atomisp/pci/atomisp_acc.c | 4 +- .../staging/media/atomisp/pci/atomisp_cmd.c | 4 +- .../media/atomisp/pci/atomisp_compat_css20.c | 110 +- .../base/refcount/interface/ia_css_refcount.h | 2 +- .../atomisp/pci/base/refcount/src/refcount.c | 12 +- .../pipe/interface/ia_css_pipe_binarydesc.h | 16 +- .../pci/camera/pipe/src/pipe_binarydesc.c | 28 +- .../pci/camera/util/interface/ia_css_util.h | 18 +- .../media/atomisp/pci/camera/util/src/util.c | 54 +- drivers/staging/media/atomisp/pci/ia_css_3a.h | 2 +- .../media/atomisp/pci/ia_css_control.h | 16 +- .../staging/media/atomisp/pci/ia_css_dvs.h | 4 +- .../staging/media/atomisp/pci/ia_css_err.h | 21 - .../media/atomisp/pci/ia_css_event_public.h | 18 +- .../media/atomisp/pci/ia_css_firmware.h | 6 +- .../media/atomisp/pci/ia_css_frame_public.h | 14 +- .../staging/media/atomisp/pci/ia_css_irq.h | 8 +- .../staging/media/atomisp/pci/ia_css_mipi.h | 6 +- .../staging/media/atomisp/pci/ia_css_pipe.h | 2 +- .../media/atomisp/pci/ia_css_pipe_public.h | 70 +- .../staging/media/atomisp/pci/ia_css_stream.h | 2 +- .../media/atomisp/pci/ia_css_stream_public.h | 70 +- .../staging/media/atomisp/pci/ia_css_timer.h | 4 +- .../media/atomisp/pci/ia_css_version.h | 2 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 8 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 2 +- .../iterator_1.0/ia_css_iterator.host.c | 4 +- .../iterator_1.0/ia_css_iterator.host.h | 2 +- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 +- .../kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 2 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 6 +- .../kernels/sdis/sdis_2/ia_css_sdis2.host.h | 2 +- .../isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 24 +- .../isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 4 +- .../runtime/binary/interface/ia_css_binary.h | 14 +- .../atomisp/pci/runtime/binary/src/binary.c | 76 +- .../pci/runtime/bufq/interface/ia_css_bufq.h | 32 +- .../media/atomisp/pci/runtime/bufq/src/bufq.c | 58 +- .../runtime/debug/interface/ia_css_debug.h | 4 +- .../runtime/frame/interface/ia_css_frame.h | 10 +- .../atomisp/pci/runtime/frame/src/frame.c | 102 +- .../runtime/ifmtr/interface/ia_css_ifmtr.h | 2 +- .../atomisp/pci/runtime/ifmtr/src/ifmtr.c | 28 +- .../isp_param/interface/ia_css_isp_param.h | 4 +- .../pci/runtime/isp_param/src/isp_param.c | 14 +- .../pci/runtime/isys/interface/ia_css_isys.h | 12 +- .../pci/runtime/isys/src/csi_rx_rmgr.c | 12 +- .../media/atomisp/pci/runtime/isys/src/rx.c | 20 +- .../pipeline/interface/ia_css_pipeline.h | 28 +- .../pci/runtime/pipeline/src/pipeline.c | 80 +- .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 2 +- .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 2 +- .../media/atomisp/pci/runtime/rmgr/src/rmgr.c | 10 +- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 8 +- .../runtime/spctrl/interface/ia_css_spctrl.h | 8 +- .../atomisp/pci/runtime/spctrl/src/spctrl.c | 24 +- .../atomisp/pci/runtime/timer/src/timer.c | 6 +- drivers/staging/media/atomisp/pci/sh_css.c | 1515 +++++++++-------- .../media/atomisp/pci/sh_css_firmware.c | 54 +- .../media/atomisp/pci/sh_css_firmware.h | 4 +- .../staging/media/atomisp/pci/sh_css_hrt.c | 4 +- .../staging/media/atomisp/pci/sh_css_hrt.h | 2 +- .../media/atomisp/pci/sh_css_internal.h | 2 +- .../staging/media/atomisp/pci/sh_css_legacy.h | 6 +- .../staging/media/atomisp/pci/sh_css_mipi.c | 64 +- .../staging/media/atomisp/pci/sh_css_mipi.h | 8 +- .../media/atomisp/pci/sh_css_param_dvs.c | 14 +- .../staging/media/atomisp/pci/sh_css_params.c | 302 ++-- .../staging/media/atomisp/pci/sh_css_params.h | 4 +- drivers/staging/media/atomisp/pci/sh_css_sp.c | 84 +- .../media/atomisp/pci/sh_css_version.c | 6 +- 71 files changed, 1578 insertions(+), 1600 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_acc.c +2 -2
@@ -559,7 +559,7 @@ int atomisp_acc_set_state(struct atomisp_sub_device *asd,struct atomisp_acc_fw *acc_fw;bool enable = (arg->flags &ATOMISP_STATE_FLAG_ENABLE ) !=0 ;struct ia_css_pipe *pipe; -enum ia_css_err r; +int r;int i;if (!asd->acc.extension_mode)
@@ -581,7 +581,7 @@ int atomisp_acc_set_state(struct atomisp_sub_device *asd, pipes[acc_flag_to_pipe[i].pipe_id]; r =ia_css_pipe_set_qos_ext_state (pipe, acc_fw->handle, enable); -if (r !=IA_CSS_SUCCESS ) +if (r)return -EBADRQC ; } }
drivers/staging/media/atomisp/pci/atomisp_cmd.c +2 -2
@@ -586,7 +586,7 @@ irqreturn_t atomisp_isr(int irq, void *dev)if (irq_infos &IA_CSS_IRQ_INFO_ISYS_EVENTS_READY ) {while (ia_css_dequeue_isys_event (&eof_event.event) == -IA_CSS_SUCCESS ) { +0 ) {/* EOF Event does not have the css_pipe returned */ asd =__get_asd_from_port (isp, eof_event.event.port);if (!asd) {
@@ -6632,7 +6632,7 @@ int atomisp_get_invalid_frame_num(struct video_device *vdev, ret =ia_css_pipe_get_info ( asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ] .pipes[pipe_id], &p_info); -if (ret ==IA_CSS_SUCCESS ) { +if (!ret) { *invalid_frame_num = p_info.num_invalid_frames;return 0 ; }else {
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +55 -55
411 lines not on this page · raw message
drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h +1 -1
@@ -27,7 +27,7 @@ typedef void (*clear_func)(ia_css_ptr ptr);* \param[in] size Size of the refcount list. * \return ia_css_err */ -enum ia_css_err ia_css_refcount_init (uint32_t size); +int ia_css_refcount_init (uint32_t size);/*! \brief Function for de-initializing refcount list *
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +6 -6
@@ -66,25 +66,25 @@ static struct ia_css_refcount_entry *refcount_find_entry(ia_css_ptr ptr,return NULL ; } -enum ia_css_err ia_css_refcount_init (uint32_t size) +int ia_css_refcount_init (uint32_t size) { -enum ia_css_err err =IA_CSS_SUCCESS ; +int err =0 ;if (size ==0 ) {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"ia_css_refcount_init(): Size of 0 for Ref count init!\n" ); -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ; }if (myrefcount.items) {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"ia_css_refcount_init(): Ref count is already initialized\n" ); -return IA_CSS_ERR_INTERNAL_ERROR ; +return -EINVAL ; } myrefcount.items =kvmalloc (sizeof (struct ia_css_refcount_entry ) * size,GFP_KERNEL );if (!myrefcount.items) - err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; -if (err ==IA_CSS_SUCCESS ) { + err = -ENOMEM ; +if (!err) {memset (myrefcount.items,0 ,sizeof (struct ia_css_refcount_entry ) * size); myrefcount.size = size;
drivers/staging/media/atomisp/pci/camera/pipe/interface/ia_css_pipe_binarydesc.h +8 -8
@@ -59,10 +59,10 @@ void ia_css_pipe_get_vfpp_binarydesc(* (= The numerator member in the sh_css_bds_factor structure.) * @param[out] bds_factor_denominator: The denominator of the bayer downscaling factor. * (= The denominator member in the sh_css_bds_factor structure.) -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err sh_css_bds_factor_get_numerator_denominator ( +int sh_css_bds_factor_get_numerator_denominator (unsigned int bds_factor,unsigned int *bds_factor_numerator,unsigned int *bds_factor_denominator);
@@ -75,10 +75,10 @@ enum ia_css_err sh_css_bds_factor_get_numerator_denominator(* @param[in/out] bds_out_info * @param[in/out] out_info * @param[in/out] vf_info -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_pipe_get_preview_binarydesc( +int ia_css_pipe_get_preview_binarydesc( struct ia_css_pipe *const pipe, struct ia_css_binary_descr *preview_descr, struct ia_css_frame_info *in_info,
@@ -93,10 +93,10 @@ enum ia_css_err ia_css_pipe_get_preview_binarydesc(* @param[in/out] in_info * @param[in/out] bds_out_info * @param[in/out] vf_info -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_pipe_get_video_binarydesc( +int ia_css_pipe_get_video_binarydesc( struct ia_css_pipe *const pipe, struct ia_css_binary_descr *video_descr, struct ia_css_frame_info *in_info,
@@ -287,9 +287,9 @@ void ia_css_pipe_get_ldc_binarydesc(* @param[in] input_res * @param[in] output_res * @param[in/out] bds_factor -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. */ -enum ia_css_err binarydesc_calculate_bds_factor ( +int binarydesc_calculate_bds_factor (struct ia_css_resolution input_res,struct ia_css_resolution output_res,unsigned int *bds_factor);
drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c +14 -14
@@ -141,7 +141,7 @@ static struct sh_css_bds_factor bds_factors_list[] = { {8, 1, SH_CSS_BDS_FACTOR_8_00} }; -enum ia_css_err sh_css_bds_factor_get_numerator_denominator ( +int sh_css_bds_factor_get_numerator_denominator (unsigned int bds_factor,unsigned int *bds_factor_numerator,unsigned int *bds_factor_denominator)
@@ -153,16 +153,16 @@ enum ia_css_err sh_css_bds_factor_get_numerator_denominator(if (bds_factors_list[i].bds_factor == bds_factor) { *bds_factor_numerator = bds_factors_list[i].numerator; *bds_factor_denominator = bds_factors_list[i].denominator; -return IA_CSS_SUCCESS ; +return 0 ; } }/* Throw an error since bds_factor cannot be found in bds_factors_list */ -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ; } -enum ia_css_err binarydesc_calculate_bds_factor ( +int binarydesc_calculate_bds_factor (struct ia_css_resolution input_res,struct ia_css_resolution output_res,unsigned int *bds_factor)
@@ -195,15 +195,15 @@ enum ia_css_err binarydesc_calculate_bds_factor(if (cond) { *bds_factor = bds_factors_list[i].bds_factor; -return IA_CSS_SUCCESS ; +return 0 ; } }/* Throw an error since a suitable bds_factor cannot be found */ -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ; } -enum ia_css_err ia_css_pipe_get_preview_binarydesc( +int ia_css_pipe_get_preview_binarydesc( struct ia_css_pipe *const pipe, struct ia_css_binary_descr *preview_descr, struct ia_css_frame_info *in_info,
@@ -211,7 +211,7 @@ enum ia_css_err ia_css_pipe_get_preview_binarydesc(struct ia_css_frame_info *out_info, struct ia_css_frame_info *vf_info) { - enum ia_css_err err; + int err;struct ia_css_frame_info *out_infos[IA_CSS_BINARY_MAX_OUTPUT_PORTS ];int mode =IA_CSS_BINARY_MODE_PREVIEW ;unsigned int i;
@@ -264,7 +264,7 @@ enum ia_css_err ia_css_pipe_get_preview_binarydesc(binarydesc_calculate_bds_factor (in_info->res, bds_out_info->res, &preview_descr->required_bds_factor); -if (err !=IA_CSS_SUCCESS ) +if (err)return err; }else { bds_out_info->res.width = in_info->res.width /2 ;
@@ -318,11 +318,11 @@ enum ia_css_err ia_css_pipe_get_preview_binarydesc( 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 ; +IA_CSS_LEAVE_ERR_PRIVATE (0 ); +return 0 ; } -enum ia_css_err ia_css_pipe_get_video_binarydesc( +int ia_css_pipe_get_video_binarydesc( struct ia_css_pipe *const pipe, struct ia_css_binary_descr *video_descr, struct ia_css_frame_info *in_info,
@@ -334,7 +334,7 @@ enum ia_css_err ia_css_pipe_get_video_binarydesc(int mode =IA_CSS_BINARY_MODE_VIDEO ;unsigned int i;struct ia_css_frame_info *out_infos[IA_CSS_BINARY_MAX_OUTPUT_PORTS ]; -enum ia_css_err err =IA_CSS_SUCCESS ; +int err =0 ;bool stream_dz_config = false;/* vf_info can be NULL */
@@ -407,7 +407,7 @@ enum ia_css_err ia_css_pipe_get_video_binarydesc(binarydesc_calculate_bds_factor ( in_info->res, bds_out_info->res, &video_descr->required_bds_factor); -if (err !=IA_CSS_SUCCESS ) +if (err)return err; }else { bds_out_info->res.width =
drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h +9 -9
@@ -28,26 +28,26 @@* @return "ia_css_err" error code * */ -enum ia_css_err ia_css_convert_errno ( +int ia_css_convert_errno (int in_err);/* @brief check vf frame info. * * @param[in] info -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_util_check_vf_info ( +int ia_css_util_check_vf_info (const struct ia_css_frame_info *const info);/* @brief check input configuration. * * @param[in] stream_config * @param[in] must_be_raw -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_util_check_input ( +int ia_css_util_check_input (const struct ia_css_stream_config *const stream_config,bool must_be_raw,bool must_be_yuv);
@@ -56,10 +56,10 @@ enum ia_css_err ia_css_util_check_input(* * @param[in] out_info * @param[in] vf_info -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_util_check_vf_out_info ( +int ia_css_util_check_vf_out_info (const struct ia_css_frame_info *const out_info,const struct ia_css_frame_info *const vf_info);
@@ -67,10 +67,10 @@ enum ia_css_err ia_css_util_check_vf_out_info(* * @param[in] width * @param[in] height -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_util_check_res ( +int ia_css_util_check_res (unsigned int width,unsigned int height);
drivers/staging/media/atomisp/pci/camera/util/src/util.c +27 -27
131 lines not on this page · raw message
drivers/staging/media/atomisp/pci/ia_css_3a.h +1 -1
@@ -106,7 +106,7 @@ struct ia_css_isp_3a_statistics_map {* used. * Always use this function, never copy the buffer directly. */ -enum ia_css_err +int ia_css_get_3a_statistics (struct ia_css_3a_statistics *host_stats,const struct ia_css_isp_3a_statistics *isp_stats);
drivers/staging/media/atomisp/pci/ia_css_control.h +8 -8
@@ -37,15 +37,15 @@* of the L1 page table. This is a physical * address or index. * @param[in] irq_type The type of interrupt to be used (edge or level) -* @return Returns IA_CSS_ERR_INTERNAL_ERROR in case of any -* errors and IA_CSS_SUCCESS otherwise. +* @return Returns -EINVAL in case of any +* errors and 0 otherwise. * * This function initializes the API which includes allocating and initializing * internal data structures. This also interprets the firmware package. All * contents of this firmware package are copied into local data structures, so * the fw pointer could be freed after this function completes. */ -enum ia_css_err ia_css_init(struct device *dev, +int ia_css_init(struct device *dev, const struct ia_css_env *env, const struct ia_css_fw *fw, u32 l1_base,
@@ -77,7 +77,7 @@ ia_css_uninit(void);* This function should only be called when the SP is not running, calling it * when the SP is running will result in an error value being returned. } */ -enum ia_css_err +int ia_css_enable_isys_event_queue (bool enable);/* @brief Test whether the ISP has started.
@@ -109,23 +109,23 @@ ia_css_sp_has_terminated(void);/* @brief start SP hardware * -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * * It will boot the SP hardware and start multi-threading infrastructure. * All threads will be started and blocked by semaphore. This function should * be called before any ia_css_stream_start(). */ -enum ia_css_err +int ia_css_start_sp (void );/* @brief stop SP hardware * -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * * This function will terminate all threads and shut down SP. It should be * called after all ia_css_stream_stop(). */ -enum ia_css_err +int ia_css_stop_sp (void );#endif /* __IA_CSS_CONTROL_H */
drivers/staging/media/atomisp/pci/ia_css_dvs.h +2 -2
@@ -94,7 +94,7 @@ union ia_css_dvs_statistics_host {* advised to map the ISP memory into a host-side pointer and use * the ia_css_translate_dvs_statistics() function instead. */ -enum ia_css_err +int ia_css_get_dvs_statistics (struct ia_css_dvs_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats);
@@ -128,7 +128,7 @@ ia_css_translate_dvs_statistics(* advised to map the ISP memory into a host-side pointer and use * the ia_css_translate_dvs2_statistics() function instead. */ -enum ia_css_err +int ia_css_get_dvs2_statistics (struct ia_css_dvs2_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats);
drivers/staging/media/atomisp/pci/ia_css_err.h +0 -21
@@ -20,27 +20,6 @@* functions in the CSS-API. */ -/* Errors, these values are used as the return value for most -* functions in this API. -*/ -enum ia_css_err { -IA_CSS_SUCCESS , -IA_CSS_ERR_INTERNAL_ERROR , -IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY , -IA_CSS_ERR_INVALID_ARGUMENTS , -IA_CSS_ERR_SYSTEM_NOT_IDLE , -IA_CSS_ERR_MODE_HAS_NO_VIEWFINDER , -IA_CSS_ERR_QUEUE_IS_FULL , -IA_CSS_ERR_QUEUE_IS_EMPTY , -IA_CSS_ERR_RESOURCE_NOT_AVAILABLE , -IA_CSS_ERR_RESOURCE_LIST_TO_SMALL , -IA_CSS_ERR_RESOURCE_ITEMS_STILL_ALLOCATED , -IA_CSS_ERR_RESOURCE_EXHAUSTED , -IA_CSS_ERR_RESOURCE_ALREADY_ALLOCATED , -IA_CSS_ERR_VERSION_MISMATCH , -IA_CSS_ERR_NOT_SUPPORTED -}; -/* FW warnings. This enum contains a value for each warning that * the SP FW could indicate potential performance issue */
drivers/staging/media/atomisp/pci/ia_css_event_public.h +9 -9
@@ -143,9 +143,9 @@ struct ia_css_event {* * @param[out] event Pointer to the event struct which will be filled by * this function if an event is available. -* @return IA_CSS_ERR_QUEUE_IS_EMPTY if no events are +* @return -ENODATA if no events are * available or -* IA_CSS_SUCCESS otherwise. +* 0 otherwise. * * This function dequeues an event from the PSYS event queue. The queue is * between the Host CPU and the CSS system. This function can be
@@ -153,31 +153,31 @@ struct ia_css_event {* was available and can be used in a polling-like situation where the NO_EVENT * return value is used to determine whether an event was available or not. */ -enum ia_css_err +int ia_css_dequeue_psys_event (struct ia_css_event *event);/* @brief Dequeue an event from the CSS system. * * @param[out] event Pointer to the event struct which will be filled by * this function if an event is available. -* @return IA_CSS_ERR_QUEUE_IS_EMPTY if no events are +* @return -ENODATA if no events are * available or -* IA_CSS_SUCCESS otherwise. +* 0 otherwise. * * deprecated{Use ia_css_dequeue_psys_event instead}. * Unless the isys event queue is explicitly enabled, this function will * dequeue both isys (EOF) and psys events (all others). */ -enum ia_css_err +int ia_css_dequeue_event (struct ia_css_event *event);/* @brief Dequeue an ISYS event from the CSS system. * * @param[out] event Pointer to the event struct which will be filled by * this function if an event is available. -* @return IA_CSS_ERR_QUEUE_IS_EMPTY if no events are +* @return -ENODATA if no events are * available or -* IA_CSS_SUCCESS otherwise. +* 0 otherwise. * * This function dequeues an event from the ISYS event queue. The queue is * between host and the CSS system.
@@ -190,7 +190,7 @@ ia_css_dequeue_event(struct ia_css_event *event);* incurring additional latency due to locks being held by other CSS API * functions. */ -enum ia_css_err +int ia_css_dequeue_isys_event (struct ia_css_event *event);#endif /* __IA_CSS_EVENT_PUBLIC_H */
drivers/staging/media/atomisp/pci/ia_css_firmware.h +3 -3
@@ -36,8 +36,8 @@ struct ia_css_fw {* printing. * @param[in] fw Firmware package containing the firmware for all * predefined ISP binaries. -* @return Returns IA_CSS_ERR_INTERNAL_ERROR in case of any -* errors and IA_CSS_SUCCESS otherwise. +* @return Returns -EINVAL in case of any +* errors and 0 otherwise. * * This function interprets the firmware package. All * contents of this firmware package are copied into local data structures, so
@@ -47,7 +47,7 @@ struct ia_css_fw {* speeds up ia_css_init (ia_css_init is called each time a stream is created but the * firmware only needs to be loaded once). */ -enum ia_css_err +int ia_css_load_firmware (struct device *dev,const struct ia_css_env *env,const struct ia_css_fw *fw);
drivers/staging/media/atomisp/pci/ia_css_frame_public.h +7 -7
@@ -214,7 +214,7 @@ void ia_css_frame_zero(struct ia_css_frame *frame);* Allocate a CSS frame structure. The memory for the frame data will be * allocated in the CSS address space. */ -enum ia_css_err +int ia_css_frame_allocate(struct ia_css_frame **frame, unsigned int width, unsigned int height,
@@ -232,7 +232,7 @@ ia_css_frame_allocate(struct ia_css_frame **frame,* This is a convenience function, implemented on top of * ia_css_frame_allocate(). */ -enum ia_css_err +int ia_css_frame_allocate_from_info (struct ia_css_frame **frame,const struct ia_css_frame_info *info);/* @brief Free a CSS frame structure.
@@ -260,7 +260,7 @@ ia_css_frame_free(struct ia_css_frame *frame);* physically contiguous memory. * Deprecated. */ -enum ia_css_err +int ia_css_frame_allocate_contiguous(struct ia_css_frame **frame, unsigned int width, unsigned int height,
@@ -280,7 +280,7 @@ ia_css_frame_allocate_contiguous(struct ia_css_frame **frame,* Only for FPGA display driver which needs physically contiguous memory. * Deprecated. */ -enum ia_css_err +int ia_css_frame_allocate_contiguous_from_info (struct ia_css_frame **frame,const struct ia_css_frame_info *info);
@@ -293,7 +293,7 @@ ia_css_frame_allocate_contiguous_from_info(struct ia_css_frame **frame,* Allocate an empty CSS frame with no data buffer using the parameters * in the frame info. */ -enum ia_css_err +int ia_css_frame_create_from_info (struct ia_css_frame **frame,const struct ia_css_frame_info *info);
@@ -310,7 +310,7 @@ ia_css_frame_create_from_info(struct ia_css_frame **frame,* free the mapped_data buffer. However if ia_css_frame_free() is called and * the frame had a valid data buffer, it would be freed along with the frame. */ -enum ia_css_err +int ia_css_frame_set_data (struct ia_css_frame *frame,const ia_css_ptr mapped_data,size_t data_size_bytes);
@@ -331,7 +331,7 @@ ia_css_frame_set_data(struct ia_css_frame *frame,* ia_css_frame_allocate() does, but instead of allocating the memory, it will * map the pre-allocated memory into the CSS address space. */ -enum ia_css_err +int ia_css_frame_map(struct ia_css_frame **frame, const struct ia_css_frame_info *info, const void __user *data,
drivers/staging/media/atomisp/pci/ia_css_irq.h +4 -4
@@ -144,14 +144,14 @@ struct ia_css_irq {* @return If an error is encountered during the interrupt info * and no interrupt could be translated successfully, this * will return IA_CSS_INTERNAL_ERROR. Otherwise -* IA_CSS_SUCCESS. +* 0. * * This function is expected to be executed after an interrupt has been sent * to the IA from the CSS. This function returns information about the interrupt * which is needed by the IA code to properly handle the interrupt. This * information includes the image pipe, buffer type etc. */ -enum ia_css_err +int ia_css_irq_translate (unsigned int *info);/* @brief Get CSI receiver error info.
@@ -227,9 +227,9 @@ ia_css_rx_port_clear_irq_info(enum mipi_port_id port, unsigned int irq_bits);* @return Returns IA_CSS_INTERNAL_ERROR if this interrupt * type cannot be enabled/disabled which is true for * CSS internal interrupts. Otherwise returns -* IA_CSS_SUCCESS. +* 0. */ -enum ia_css_err +int ia_css_irq_enable (enum ia_css_irq_info type,bool enable);#endif /* __IA_CSS_IRQ_H */
drivers/staging/media/atomisp/pci/ia_css_mipi.h +3 -3
@@ -37,7 +37,7 @@* * Specifies a CSS MIPI frame buffer: size in memory words (32B). */ -enum ia_css_err +int ia_css_mipi_frame_specify (const unsigned int size_mem_words,const bool contiguous);
@@ -54,7 +54,7 @@ ia_css_mipi_frame_specify(const unsigned int size_mem_words,* * */ -enum ia_css_err +int ia_css_mipi_frame_enable_check_on_size (const enum mipi_port_id port,const unsigned int size_mem_words);#endif
@@ -71,7 +71,7 @@ ia_css_mipi_frame_enable_check_on_size(const enum mipi_port_id port,* * Calculate the size of a mipi frame, based on the resolution and format. */ -enum ia_css_err +int ia_css_mipi_frame_calculate_size(const unsigned int width, const unsigned int height, const enum atomisp_input_format format,
drivers/staging/media/atomisp/pci/ia_css_pipe.h +1 -1
@@ -181,7 +181,7 @@ struct ia_css_pipe {void ia_css_pipe_map_queue (struct ia_css_pipe *pipe,bool map); -enum ia_css_err +int sh_css_param_update_isp_params (struct ia_css_pipe *curr_pipe,struct ia_css_isp_parameters *params,bool commit,struct ia_css_pipe *pipe);
drivers/staging/media/atomisp/pci/ia_css_pipe_public.h +35 -35
214 lines not on this page · raw message
drivers/staging/media/atomisp/pci/ia_css_stream.h +1 -1
@@ -102,7 +102,7 @@ ia_css_get_isp_dvs2_coefficients(struct ia_css_stream *stream,short *ver_coefs_even_real, short *ver_coefs_even_imag); -enum ia_css_err +int ia_css_stream_isp_parameters_init (struct ia_css_stream *stream);void
drivers/staging/media/atomisp/pci/ia_css_stream_public.h +35 -35
242 lines not on this page · raw message
drivers/staging/media/atomisp/pci/ia_css_timer.h +2 -2
@@ -58,10 +58,10 @@ struct ia_css_time_meas {/* @brief API to fetch timer count directly * * @param curr_ts [out] measured count value -* @return IA_CSS_SUCCESS if success +* @return 0 if success * */ -enum ia_css_err +int ia_css_timer_get_current_tick (struct ia_css_clock_tick *curr_ts);
drivers/staging/media/atomisp/pci/ia_css_version.h +1 -1
@@ -34,7 +34,7 @@* This function generates and returns the version string. If FW is loaded, it * attaches the FW version. */ -enum ia_css_err +int ia_css_get_version (char *version,int max_size);#endif /* __IA_CSS_VERSION_H */
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +4 -4
@@ -271,7 +271,7 @@ convert_allocate_dvs_6axis_config(return me; } -enum ia_css_err +int store_dvs_6axis_config( const struct ia_css_dvs_6axis_config *dvs_6axis_config, const struct ia_css_binary *binary,
@@ -289,8 +289,8 @@ store_dvs_6axis_config(if (!me) { -IA_CSS_LEAVE_ERR_PRIVATE (IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ); -return IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; +IA_CSS_LEAVE_ERR_PRIVATE (-ENOMEM ); +return -ENOMEM ; } ia_css_params_store_ia_css_host_data(
@@ -298,5 +298,5 @@ store_dvs_6axis_config( me);ia_css_host_data_free (me); -return IA_CSS_SUCCESS ; +return 0 ; }
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h +1 -1
@@ -50,7 +50,7 @@ convert_allocate_dvs_6axis_config(const struct ia_css_binary *binary, const struct ia_css_frame_info *dvs_in_frame_info); -enum ia_css_err +int store_dvs_6axis_config( const struct ia_css_dvs_6axis_config *dvs_6axis_config, const struct ia_css_binary *binary,
drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c +2 -2
@@ -37,7 +37,7 @@ ia_css_iterator_config(ia_css_resolution_to_sp_resolution (&to->dvs_envelope, from->dvs_envelope); } -enum ia_css_err +int ia_css_iterator_configure (const struct ia_css_binary *binary,const struct ia_css_frame_info *in_info) {
@@ -76,5 +76,5 @@ ia_css_iterator_configure(ia_css_configure_iterator (binary, &config); -return IA_CSS_SUCCESS ; +return 0 ; }
drivers/staging/media/atomisp/pci/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h +1 -1
@@ -26,7 +26,7 @@ ia_css_iterator_config(const struct ia_css_iterator_configuration *from, unsigned int size); -enum ia_css_err +int ia_css_iterator_configure (const struct ia_css_binary *binary,const struct ia_css_frame_info *in_info);
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +3 -3
@@ -235,12 +235,12 @@ void ia_css_sdis_clear_coefficients( dvs_coefs->ver_coefs =NULL ; } -enum ia_css_err +int ia_css_get_dvs_statistics (struct ia_css_dvs_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats) {struct ia_css_isp_dvs_statistics_map *map; -enum ia_css_err ret =IA_CSS_SUCCESS ; +int ret =0 ;IA_CSS_ENTER ("host_stats=%p, isp_stats=%p" , host_stats, isp_stats);
@@ -256,7 +256,7 @@ ia_css_get_dvs_statistics( }else {IA_CSS_ERROR ("out of memory" ); - ret =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; + ret = -ENOMEM ; }IA_CSS_LEAVE_ERR (ret);
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h +1 -1
@@ -53,7 +53,7 @@ void ia_css_get_isp_dis_coefficients(short *horizontal_coefficients, short *vertical_coefficients); -enum ia_css_err +int ia_css_get_dvs_statistics (struct ia_css_dvs_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats);
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +3 -3
@@ -175,12 +175,12 @@ void ia_css_sdis2_clear_coefficients( dvs2_coefs->ver_coefs.even_imag =NULL ; } -enum ia_css_err +int ia_css_get_dvs2_statistics (struct ia_css_dvs2_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats) {struct ia_css_isp_dvs_statistics_map *map; -enum ia_css_err ret =IA_CSS_SUCCESS ; +int ret =0 ;IA_CSS_ENTER ("host_stats=%p, isp_stats=%p" , host_stats, isp_stats);
@@ -196,7 +196,7 @@ ia_css_get_dvs2_statistics( }else {IA_CSS_ERROR ("out of memory" ); - ret =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; + ret = -ENOMEM ; }IA_CSS_LEAVE_ERR (ret);
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h +1 -1
@@ -62,7 +62,7 @@ void ia_css_get_isp_dvs2_coefficients(void ia_css_sdis2_clear_coefficients (struct ia_css_dvs2_coefficients *dvs2_coefs); -enum ia_css_err +int ia_css_get_dvs2_statistics (struct ia_css_dvs2_statistics *host_stats,const struct ia_css_isp_dvs_statistics *isp_stats);
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +12 -12
@@ -49,7 +49,7 @@ ia_css_vf_config(* to the requested viewfinder resolution on the upper side. The output cannot * be smaller than the requested viewfinder resolution. */ -enum ia_css_err +int sh_css_vf_downscale_log2( const struct ia_css_frame_info *out_info, const struct ia_css_frame_info *vf_info,
@@ -58,12 +58,12 @@ sh_css_vf_downscale_log2(unsigned int out_width;if ((!out_info) | (!vf_info)) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ; out_width = out_info->res.width;if (out_width ==0 ) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ;/* downscale until width smaller than the viewfinder width. We don't * test for the height since the vmem buffers only put restrictions on
@@ -79,26 +79,26 @@ sh_css_vf_downscale_log2( ds_log2--;/* TODO: use actual max input resolution of vf_pp binary */ if ((out_info->res.width >> ds_log2) >=2 *ia_css_binary_max_vf_width ()) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ; *downscale_log2 = ds_log2; -return IA_CSS_SUCCESS ; +return 0 ; } -static enum ia_css_err +static int configure_kernel (const struct ia_css_binary_info *info,const struct ia_css_frame_info *out_info,const struct ia_css_frame_info *vf_info,unsigned int *downscale_log2,struct ia_css_vf_configuration *config) { -enum ia_css_err err; +int err;unsigned int vf_log_ds =0 ;/* First compute value */ if (vf_info) { err =sh_css_vf_downscale_log2 (out_info, vf_info, &vf_log_ds); -if (err !=IA_CSS_SUCCESS ) +if (err)return err; } vf_log_ds =min (vf_log_ds, info->vf_dec.max_log_downscale);
@@ -106,7 +106,7 @@ configure_kernel(/* Then store it in isp config section */ config->vf_downscale_bits = vf_log_ds; -return IA_CSS_SUCCESS ; +return 0 ; } static void
@@ -117,13 +117,13 @@ configure_dma( config->info = vf_info; } -enum ia_css_err +int ia_css_vf_configure (const struct ia_css_binary *binary,const struct ia_css_frame_info *out_info,struct ia_css_frame_info *vf_info,unsigned int *downscale_log2) { -enum ia_css_err err; +int err;struct ia_css_vf_configuration config;const struct ia_css_binary_info *info = &binary->info->sp;
@@ -134,5 +134,5 @@ ia_css_vf_configure( vf_info->raw_bit_depth = info->dma.vfdec_bits_per_pixel;ia_css_configure_vf (binary, &config); -return IA_CSS_SUCCESS ; +return 0 ; }
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.h +2 -2
@@ -25,7 +25,7 @@* to the requested viewfinder resolution on the upper side. The output cannot * be smaller than the requested viewfinder resolution. */ -enum ia_css_err +int sh_css_vf_downscale_log2( const struct ia_css_frame_info *out_info, const struct ia_css_frame_info *vf_info,
@@ -37,7 +37,7 @@ ia_css_vf_config(const struct ia_css_vf_configuration *from, unsigned int size); -enum ia_css_err +int ia_css_vf_configure( const struct ia_css_binary *binary, const struct ia_css_frame_info *out_info,
drivers/staging/media/atomisp/pci/runtime/binary/interface/ia_css_binary.h +7 -7
@@ -152,13 +152,13 @@ struct ia_css_binary { .vf_frame_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \ } -enum ia_css_err +int ia_css_binary_init_infos (void ); -enum ia_css_err +int ia_css_binary_uninit (void ); -enum ia_css_err +int ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo, bool online, bool two_ppc,
@@ -172,7 +172,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,int stream_config_left_padding, bool accelerator); -enum ia_css_err +int ia_css_binary_find (struct ia_css_binary_descr *descr,struct ia_css_binary *binary);
@@ -188,10 +188,10 @@ ia_css_binary_find(struct ia_css_binary_descr *descr,* 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. +* @return 0 or error code upon error. * */ -enum ia_css_err +int ia_css_binary_get_shading_info(const struct ia_css_binary *binary, enum ia_css_shading_correction_type type, unsigned int required_bds_factor,
@@ -199,7 +199,7 @@ ia_css_binary_get_shading_info(const struct ia_css_binary *binary,struct ia_css_shading_info *shading_info, struct ia_css_pipe_config *pipe_config); -enum ia_css_err +int ia_css_binary_3a_grid_info (const struct ia_css_binary *binary,struct ia_css_grid_info *info,struct ia_css_pipe *pipe);
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +38 -38
268 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/bufq/interface/ia_css_bufq.h +16 -16
@@ -77,10 +77,10 @@ void ia_css_bufq_init(void);* * @param queue_id[in] Index of the queue in the specified thread * @param item[in] Object to enqueue. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_enqueue_buffer ( +int ia_css_bufq_enqueue_buffer (int thread_index,int queue_id,uint32_t item);
@@ -91,10 +91,10 @@ enum ia_css_err ia_css_bufq_enqueue_buffer(* @param queue_id[in] Specifies the index of the queue in the list where * the item has to be read. * @paramitem [out] Object to be dequeued into this item. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_dequeue_buffer ( +int ia_css_bufq_dequeue_buffer (int queue_id,uint32_t *item);
@@ -105,10 +105,10 @@ enum ia_css_err ia_css_bufq_dequeue_buffer(* @param[in] evt_payload_0 The event payload. * @param[in] evt_payload_1 The event payload. * @param[in] evt_payload_2 The event payload. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_enqueue_psys_event( +int ia_css_bufq_enqueue_psys_event( u8 evt_id, u8 evt_payload_0, u8 evt_payload_1,
@@ -119,10 +119,10 @@ enum ia_css_err ia_css_bufq_enqueue_psys_event(* @brief Dequeue an item from SP to host communication event queue. * * @param item Object to be dequeued into this item. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_dequeue_psys_event ( +int ia_css_bufq_dequeue_psys_event (u8 item[BUFQ_EVENT_SIZE ] );
@@ -131,10 +131,10 @@ enum ia_css_err ia_css_bufq_dequeue_psys_event(* @brief Enqueue an event item into host to SP EOF event queue. * * @param[in] evt_id The event ID. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_enqueue_isys_event ( +int ia_css_bufq_enqueue_isys_event (uint8_t evt_id);/**
@@ -142,29 +142,29 @@ enum ia_css_err ia_css_bufq_enqueue_isys_event(* * @param item Object to be dequeued into this item. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_dequeue_isys_event ( +int ia_css_bufq_dequeue_isys_event (u8 item[BUFQ_EVENT_SIZE ]);/** * @brief Enqueue a tagger command item into tagger command queue.. * * @param item Object to be enqueue. -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_enqueue_tag_cmd ( +int ia_css_bufq_enqueue_tag_cmd (uint32_t item);/** * @brief Uninitializes bufq module. * -* @return IA_CSS_SUCCESS or error code upon error. +* @return 0 or error code upon error. * */ -enum ia_css_err ia_css_bufq_deinit (void ); +int ia_css_bufq_deinit (void );/** * @brief Dump queue states
drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c +28 -30
199 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h +2 -2
@@ -91,7 +91,7 @@ enum ia_css_debug_enable_param_dump {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE , \ "%s(): leave: " fmt "\n", __func__, ##__VA_ARGS__) -/* Shorthand for returning an enum ia_css_err return value */ +/* Shorthand for returning an int return value */#define IA_CSS_LEAVE_ERR (__err) \ ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, \ "%s() %d: leave: return_err=%d\n", __func__, __LINE__, __err)
@@ -112,7 +112,7 @@ enum ia_css_debug_enable_param_dump {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE , \ "%s(): leave: " fmt "\n", __func__, ##__VA_ARGS__) -/* Shorthand for returning an enum ia_css_err return value */ +/* Shorthand for returning an int return value */#define IA_CSS_LEAVE_ERR_PRIVATE (__err) \ ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, \ "%s() %d: leave: return_err=%d\n", __func__, __LINE__, __err)
drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame.h +5 -5
@@ -80,7 +80,7 @@ bool ia_css_frame_info_is_same_resolution(* @param[in] info The frame attributes to be initialized * @return The error code. */ -enum ia_css_err ia_css_frame_check_info (const struct ia_css_frame_info *info); +int ia_css_frame_check_info (const struct ia_css_frame_info *info);/********************************************************************* **** Frame APIs
@@ -92,7 +92,7 @@ enum ia_css_err ia_css_frame_check_info(const struct ia_css_frame_info *info);* @param[in] frame The frame attributes to be initialized * @return The error code. */ -enum ia_css_err ia_css_frame_init_planes (struct ia_css_frame *frame); +int ia_css_frame_init_planes (struct ia_css_frame *frame);/* @brief Free an array of frames *
@@ -114,7 +114,7 @@ void ia_css_frame_free_multiple(unsigned int num_frames,* Allocate a frame using the given size in bytes. * The frame structure is partially null initialized. */ -enum ia_css_err ia_css_frame_allocate_with_buffer_size ( +int ia_css_frame_allocate_with_buffer_size (struct ia_css_frame **frame,const unsigned int size_bytes,const bool contiguous);
@@ -153,9 +153,9 @@ void ia_css_dma_configure_from_info(* @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 +* @return Returns 0 or -EINVAL on error */ -enum ia_css_err +int 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);
drivers/staging/media/atomisp/pci/runtime/frame/src/frame.c +51 -51
329 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/ifmtr/interface/ia_css_ifmtr.h +1 -1
@@ -27,7 +27,7 @@ unsigned int ia_css_ifmtr_lines_needed_for_bayer_order(unsigned int ia_css_ifmtr_columns_needed_for_bayer_order (const struct ia_css_stream_config *config); -enum ia_css_err ia_css_ifmtr_configure (struct ia_css_stream_config *config, +int ia_css_ifmtr_configure (struct ia_css_stream_config *config,struct ia_css_binary *binary);#endif /* __IA_CSS_IFMTR_H__ */
drivers/staging/media/atomisp/pci/runtime/ifmtr/src/ifmtr.c +14 -14
@@ -28,12 +28,12 @@/************************************************************ * Static functions declarations ************************************************************/ -static enum ia_css_err ifmtr_start_column ( +static int ifmtr_start_column (const struct ia_css_stream_config *config,unsigned int bin_in,unsigned int *start_column); -static enum ia_css_err ifmtr_input_start_line ( +static int ifmtr_input_start_line (const struct ia_css_stream_config *config,unsigned int bin_in,unsigned int *start_line);
@@ -71,7 +71,7 @@ unsigned int ia_css_ifmtr_columns_needed_for_bayer_order(return 0 ; } -enum ia_css_err ia_css_ifmtr_configure (struct ia_css_stream_config *config, +int ia_css_ifmtr_configure (struct ia_css_stream_config *config,struct ia_css_binary *binary) { unsigned int start_line, start_column = 0,
@@ -97,7 +97,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, left_padding =0 ;input_formatter_cfg_t if_a_config, if_b_config;enum atomisp_input_format input_format; -enum ia_css_err err =IA_CSS_SUCCESS ; +int err =0 ;u8 if_config_index;/* Determine which input formatter config set is targeted. */
@@ -142,10 +142,10 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,* columns. */ err =ifmtr_input_start_line (config, cropped_height, &start_line); -if (err !=IA_CSS_SUCCESS ) +if (err)return err; err =ifmtr_start_column (config, cropped_width, &start_column); -if (err !=IA_CSS_SUCCESS ) +if (err)return err;if (config->left_padding ==-1 )
@@ -358,7 +358,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config,break ; }if (width_a ==0 ) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ;if (two_ppc) left_padding /=2 ;
@@ -459,7 +459,7 @@ enum ia_css_err ia_css_ifmtr_configure(struct ia_css_stream_config *config, } } -return IA_CSS_SUCCESS ; +return 0 ; }bool ifmtr_set_if_blocking_mode_reset = true;
@@ -496,7 +496,7 @@ static void ifmtr_set_if_blocking_mode(return ; } -static enum ia_css_err ifmtr_start_column ( +static int ifmtr_start_column (const struct ia_css_stream_config *config,unsigned int bin_in,unsigned int *start_column)
@@ -505,7 +505,7 @@ static enum ia_css_err ifmtr_start_column( for_bayer =ia_css_ifmtr_columns_needed_for_bayer_order (config);if (bin_in +2 * for_bayer > in) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ;/* On the hardware, we want to use the middle of the input, so we * divide the start column by 2. */
@@ -519,10 +519,10 @@ static enum ia_css_err ifmtr_start_column(*/ start += for_bayer; *start_column = start; -return IA_CSS_SUCCESS ; +return 0 ; } -static enum ia_css_err ifmtr_input_start_line ( +static int ifmtr_input_start_line (const struct ia_css_stream_config *config,unsigned int bin_in,unsigned int *start_line)
@@ -531,7 +531,7 @@ static enum ia_css_err ifmtr_input_start_line( for_bayer =ia_css_ifmtr_lines_needed_for_bayer_order (config);if (bin_in +2 * for_bayer > in) -return IA_CSS_ERR_INVALID_ARGUMENTS ; +return -EINVAL ;/* On the hardware, we want to use the middle of the input, so we * divide the start line by 2. On the simulator, we cannot handle extra
@@ -546,7 +546,7 @@ static enum ia_css_err ifmtr_input_start_line(/* now we add the one line (if needed) to correct for the bayer order */ start += for_bayer; *start_line = start; - return IA_CSS_SUCCESS; + return 0; }#endif
drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param.h +2 -2
@@ -67,7 +67,7 @@ ia_css_init_memory_interface( const struct ia_css_isp_param_css_segments *css_params);/* Allocate memory parameters */ -enum ia_css_err +int ia_css_isp_param_allocate_isp_parameters( struct ia_css_isp_param_host_segments *mem_params, struct ia_css_isp_param_css_segments *css_params,
@@ -88,7 +88,7 @@ ia_css_isp_param_load_fw_params( bool init);/* Copy host parameter images to ddr */ -enum ia_css_err +int ia_css_isp_param_copy_isp_mem_if_to_ddr( struct ia_css_isp_param_css_segments *ddr, const struct ia_css_isp_param_host_segments *host,
drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c +7 -7
@@ -101,12 +101,12 @@ ia_css_init_memory_interface( } } -enum ia_css_err +int ia_css_isp_param_allocate_isp_parameters (struct ia_css_isp_param_host_segments *mem_params,struct ia_css_isp_param_css_segments *css_params,const struct ia_css_isp_param_isp_segments *mem_initializers) { -enum ia_css_err err =IA_CSS_SUCCESS ; +int err =0 ;unsigned int mem, pclass; pclass =IA_CSS_PARAM_CLASS_PARAM ;
@@ -126,13 +126,13 @@ ia_css_isp_param_allocate_isp_parameters( size, GFP_KERNEL);if (!mem_params->params[pclass][mem].address) { - err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; + err = -ENOMEM ; goto cleanup; }if (pclass !=IA_CSS_PARAM_CLASS_PARAM ) { css_params->params[pclass][mem].address =hmm_alloc (size,HMM_BO_PRIVATE ,0 ,NULL ,0 );if (!css_params->params[pclass][mem].address) { - err =IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY ; + err = -ENOMEM ; goto cleanup; } }
@@ -180,7 +180,7 @@ ia_css_isp_param_load_fw_params( } } -enum ia_css_err +int ia_css_isp_param_copy_isp_mem_if_to_ddr( struct ia_css_isp_param_css_segments *ddr, const struct ia_css_isp_param_host_segments *host,
@@ -194,12 +194,12 @@ ia_css_isp_param_copy_isp_mem_if_to_ddr(char *host_mem_ptr = host->params[pclass][mem].address;if (size != ddr->params[pclass][mem].size) -return IA_CSS_ERR_INTERNAL_ERROR ; +return -EINVAL ;if (!size)continue ;hmm_store (ddr_mem_ptr, host_mem_ptr, size); } -return IA_CSS_SUCCESS ; +return 0 ; }void
drivers/staging/media/atomisp/pci/runtime/isys/interface/ia_css_isys.h +6 -6
@@ -48,10 +48,10 @@ enum mipi_port_id ia_css_isys_port_to_mipi_port(* @param[in] port CSI port * @param[in] isys_stream_id Stream handle generated with ia_css_isys_generate_stream_id() * Must be lower than SH_CSS_MAX_ISYS_CHANNEL_NODES -* @return IA_CSS_SUCCESS if successful, IA_CSS_ERR_INTERNAL_ERROR if +* @return 0 if successful, -EINVAL if * there is already a stream registered with the same handle */ -enum ia_css_err ia_css_isys_csi_rx_register_stream ( +int ia_css_isys_csi_rx_register_stream (enum mipi_port_id port,uint32_t isys_stream_id);
@@ -63,14 +63,14 @@ enum ia_css_err ia_css_isys_csi_rx_register_stream(* @param[in] port CSI port * @param[in] isys_stream_id Stream handle generated with ia_css_isys_generate_stream_id() * Must be lower than SH_CSS_MAX_ISYS_CHANNEL_NODES -* @return IA_CSS_SUCCESS if successful, IA_CSS_ERR_INTERNAL_ERROR if +* @return 0 if successful, -EINVAL if * there is no stream registered with that handle */ -enum ia_css_err ia_css_isys_csi_rx_unregister_stream ( +int ia_css_isys_csi_rx_unregister_stream (enum mipi_port_id port,uint32_t isys_stream_id); -enum ia_css_err ia_css_isys_convert_compressed_format ( +int ia_css_isys_convert_compressed_format (struct ia_css_csi2_compression *comp,struct input_system_cfg_s *cfg); unsigned int ia_css_csi2_calculate_input_system_alignment(
@@ -107,7 +107,7 @@ unsigned int ia_css_isys_rx_translate_irq_infos(unsigned int bits);* This is normally done by the sensor, but when using the input fifo, this * format type must be sumitted correctly by the application. */ -enum ia_css_err ia_css_isys_convert_stream_format_to_mipi_format ( +int ia_css_isys_convert_stream_format_to_mipi_format (enum atomisp_input_format input_format,mipi_predictor_t compression,unsigned int *fmt_type);
drivers/staging/media/atomisp/pci/runtime/isys/src/csi_rx_rmgr.c +6 -6
@@ -126,11 +126,11 @@ void ia_css_isys_csi_rx_lut_rmgr_release( } } -enum ia_css_err ia_css_isys_csi_rx_register_stream( +int ia_css_isys_csi_rx_register_stream(
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/isys/src/rx.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/pipeline/interface/ia_css_pipeline.h +14 -14
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c +40 -40
80 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/spctrl/interface/ia_css_spctrl.h +4 -4
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/spctrl/src/spctrl.c +12 -12
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/runtime/timer/src/timer.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css.c +758 -757
1,515 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_firmware.c +27 -27
54 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_firmware.h +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_hrt.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_hrt.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_internal.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_legacy.h +3 -3
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_mipi.c +32 -32
64 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_mipi.h +4 -4
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_param_dvs.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_params.c +151 -151
302 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_params.h +2 -2
Lines of this file are not shown. View the raw message.
drivers/staging/media/atomisp/pci/sh_css_sp.c +42 -42
84 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_version.c +3 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.26.2
Part of the diff is not shown here. View the raw message.
PATCH v2 31/41 media: atomisp: get rid of an error abstraction layer
In reply to Mauro Carvalho ChehabThere is an abstraction layer there meant to convert to the Linux standard error codes. As the driver now use such errors everywhere. we can get rid of this.
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 2 +- .../pci/camera/util/interface/ia_css_util.h | 3 +- .../media/atomisp/pci/camera/util/src/util.c | 29 ------------ .../pci/hive_isp_css_include/error_support.h | 39 --------------- .../pci/hive_isp_css_include/string_support.h | 16 +++---- .../media/atomisp/pci/runtime/bufq/src/bufq.c | 47 ++++++++----------- .../runtime/eventq/interface/ia_css_eventq.h | 8 ++-- .../atomisp/pci/runtime/eventq/src/eventq.c | 4 +- .../runtime/queue/interface/ia_css_queue.h | 30 ++++++------ .../atomisp/pci/runtime/queue/src/queue.c | 44 ++++++++--------- .../pci/runtime/queue/src/queue_access.c | 16 +++---- .../pci/runtime/queue/src/queue_access.h | 3 +- 12 files changed, 83 insertions(+), 158 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h
drivers/staging/media/atomisp/pci/atomisp_cmd.c +1 -1
@@ -16,6 +16,7 @@* * */ +#include <linux/errno.h> #include <linux/firmware.h> #include <linux/pci.h> #include <linux/interrupt.h>
@@ -58,7 +59,6 @@#include "ia_css_types.h" #include "ia_css_stream.h" #include "ia_css_debug.h" -#include "error_support.h" #include "bits.h" /* We should never need to run the flash for more than 2 frames.
drivers/staging/media/atomisp/pci/camera/util/interface/ia_css_util.h +2 -1
@@ -15,8 +15,9 @@#ifndef __IA_CSS_UTIL_H__#define __IA_CSS_UTIL_H__ +#include <linux/errno.h> +#include <ia_css_err.h> -#include <error_support.h> #include <type_support.h> #include <ia_css_frame_public.h> #include <ia_css_stream_public.h>
drivers/staging/media/atomisp/pci/camera/util/src/util.c +0 -29
@@ -20,35 +20,6 @@/* for ia_css_binary_max_vf_width() */ #include "ia_css_binary.h" -int ia_css_convert_errno ( -int in_err) -{ -int out_err; - -switch (in_err) { -case 0 : - out_err =0 ; -break ; -case EINVAL : - out_err = -EINVAL ; -break ; -case ENODATA : - out_err = -ENODATA ; -break ; -case ENOSYS : -case ENOTSUP : - out_err = -EINVAL ; -break ; -case ENOBUFS : - out_err = -ENOBUFS ; -break ; -default : - out_err = -EINVAL ; -break ; - } -return out_err; -} -/* MW: Table look-up ??? */ unsigned int ia_css_util_input_format_bpp( enum atomisp_input_format format,
drivers/staging/media/atomisp/pci/hive_isp_css_include/error_support.h deleted +0 -39
@@ -1,39 +0,0 @@ -/* -* Support for Intel Camera Imaging ISP subsystem. -* Copyright (c) 2015, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -*/ - -#ifndef __ERROR_SUPPORT_H_INCLUDED__ -#define __ERROR_SUPPORT_H_INCLUDED__ - -#include <linux/errno.h> -/* -* Put here everything __KERNEL__ specific not covered in -* "errno.h" -*/ -#define ENOTSUP 252 - -#define verifexit (cond, error_tag) \ -do { \ - if (!(cond)) { \ - goto EXIT; \ - } \ -} while (0) - -#define verifjmpexit (cond) \ -do { \ - if (!(cond)) { \ - goto EXIT; \ - } \ -} while (0) - -#endif /* __ERROR_SUPPORT_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/hive_isp_css_include/string_support.h +8 -8
@@ -28,7 +28,7 @@* @param[in] src_buf. The source buffer * @param[in] src_size. The size of the source buffer in bytes * @return 0 on success, error code on failure -* @return EINVAL on Invalid arguments +* @return -EINVAL on Invalid arguments * @return ERANGE on Destination size too small */ static inline int memcpy_s(
@@ -39,7 +39,7 @@ static inline int memcpy_s( {if ((!src_buf) || (!dest_buf)) {/* Invalid arguments*/ -return EINVAL ; +return -EINVAL ; }if ((dest_size < src_size) || (src_size ==0 )) {
@@ -84,7 +84,7 @@ static size_t strnlen_s(* @param[in] src_str. The source buffer * @param[in] src_size. The size of the source buffer in bytes * @return Returns 0 on success -* @return Returns EINVAL on invalid arguments +* @return Returns -EINVAL on invalid arguments * @return Returns ERANGE on destination size too small */ static inline int strncpy_s(
@@ -97,13 +97,13 @@ static inline int strncpy_s(if (!dest_str) {/* Invalid arguments*/ -return EINVAL ; +return -EINVAL ; }if ((!src_str) || (dest_size ==0 )) {/* Invalid arguments*/ dest_str[0 ] ='\0' ; -return EINVAL ; +return -EINVAL ; } len =strnlen_s (src_str, src_size);
@@ -126,7 +126,7 @@ static inline int strncpy_s(* @param[in] dest_size. The size of the destination buffer in bytes * @param[in] src_str. The source buffer * @return Returns 0 on success -* @return Returns EINVAL on invalid arguments +* @return Returns -EINVAL on invalid arguments * @return Returns ERANGE on destination size too small */ static inline int strcpy_s(
@@ -138,13 +138,13 @@ static inline int strcpy_s(if (!dest_str) {/* Invalid arguments*/ -return EINVAL ; +return -EINVAL ; }if ((!src_str) || (dest_size ==0 )) {/* Invalid arguments*/ dest_str[0 ] ='\0' ; -return EINVAL ; +return -EINVAL ; } len =strnlen_s (src_str, dest_size);
drivers/staging/media/atomisp/pci/runtime/bufq/src/bufq.c +19 -28
133 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/eventq/interface/ia_css_eventq.h +4 -4
@@ -23,8 +23,8 @@* @param[in] eventq_handle eventq_handle. * @param[in] payload The event payload. * @return 0 - Successfully dequeue. -* @return EINVAL - Invalid argument. -* @return ENODATA - Queue is empty. +* @return -EINVAL - Invalid argument. +* @return -ENODATA - Queue is empty. */ int ia_css_eventq_recv( ia_css_queue_t *eventq_handle,
@@ -41,8 +41,8 @@ int ia_css_eventq_recv(* @param[in] evt_payload_1 The event payload. * @param[in] evt_payload_2 The event payload. * @return 0 - Successfully enqueue. -* @return EINVAL - Invalid argument. -* @return ENOBUFS - Queue is full. +* @return -EINVAL - Invalid argument. +* @return -ENOBUFS - Queue is full. */ int ia_css_eventq_send( ia_css_queue_t *eventq_handle,
drivers/staging/media/atomisp/pci/runtime/eventq/src/eventq.c +2 -2
@@ -50,7 +50,7 @@ int ia_css_eventq_send( {u8 tmp[4 ];u32 sw_event; -int error =ENOSYS ; +int error = -ENOSYS ;/* * Encode the queue type, the thread ID and
@@ -65,7 +65,7 @@ int ia_css_eventq_send(/* queue the software event (busy-waiting) */ for ( ; ; ) { error =ia_css_queue_enqueue (eventq_handle, sw_event); -if (error !=ENOBUFS ) { +if (error != -ENOBUFS ) {/* We were able to successfully send the event or had a real failure. return the status*/ break ;
drivers/staging/media/atomisp/pci/runtime/queue/interface/ia_css_queue.h +15 -15
@@ -40,7 +40,7 @@ typedef struct ia_css_queue ia_css_queue_t;* @param[out] qhandle. Handle to queue instance for use with API * @param[in] desc. Descriptor with queue properties filled-in * @return 0 - Successful init of local queue instance. -* @return EINVAL - Invalid argument. +* @return -EINVAL - Invalid argument. * */ int ia_css_queue_local_init(
@@ -52,7 +52,7 @@ int ia_css_queue_local_init(* @param[out] qhandle. Handle to queue instance for use with API * @param[in] desc. Descriptor with queue properties filled-in * @return 0 - Successful init of remote queue instance. -* @return EINVAL - Invalid argument. +* @return -EINVAL - Invalid argument. */ int ia_css_queue_remote_init( ia_css_queue_t *qhandle,
@@ -72,8 +72,8 @@ int ia_css_queue_uninit(* @param[in] qhandle. Handle to queue instance * @param[in] item. Object to be enqueued. * @return 0 - Successful enqueue. -* @return EINVAL - Invalid argument. -* @return ENOBUFS - Queue is full. +* @return -EINVAL - Invalid argument. +* @return -ENOBUFS - Queue is full. * */ int ia_css_queue_enqueue(
@@ -86,8 +86,8 @@ int ia_css_queue_enqueue(* @param[out] item. Object to be dequeued into this item. * @return 0 - Successful dequeue. -* @return EINVAL - Invalid argument. -* @return ENODATA - Queue is empty. +* @return -EINVAL - Invalid argument. +* @return -ENODATA - Queue is empty. * */ int ia_css_queue_dequeue(
@@ -99,8 +99,8 @@ int ia_css_queue_dequeue(* @param[in] qhandle. Handle to queue instance * @param[in] is_empty True if empty, False if not. * @return 0 - Successful access state. -* @return EINVAL - Invalid argument. -* @return ENOSYS - Function not implemented. +* @return -EINVAL - Invalid argument. +* @return -ENOSYS - Function not implemented. * */ int ia_css_queue_is_empty(
@@ -112,8 +112,8 @@ int ia_css_queue_is_empty(* @param[in] qhandle. Handle to queue instance * @param[in] is_full True if Full, False if not. * @return 0 - Successfully access state. -* @return EINVAL - Invalid argument. -* @return ENOSYS - Function not implemented. +* @return -EINVAL - Invalid argument. +* @return -ENOSYS - Function not implemented. * */ int ia_css_queue_is_full(
@@ -125,7 +125,7 @@ int ia_css_queue_is_full(* @param[in] qhandle. Handle to queue instance * @param[in] size Number of available elements in the queue * @return 0 - Successfully access state. -* @return EINVAL - Invalid argument. +* @return -EINVAL - Invalid argument. * */ int ia_css_queue_get_used_space(
@@ -137,7 +137,7 @@ int ia_css_queue_get_used_space(* @param[in] qhandle. Handle to queue instance * @param[in] size Number of free elements in the queue * @return 0 - Successfully access state. -* @return EINVAL - Invalid argument. +* @return -EINVAL - Invalid argument. * */ int ia_css_queue_get_free_space(
@@ -151,7 +151,7 @@ int ia_css_queue_get_free_space(* starting from head of queue * @param[in] element Value of element returned * @return 0 - Successfully access state. -* @return EINVAL - Invalid argument. +* @return -EINVAL - Invalid argument. * */ int ia_css_queue_peek(
@@ -164,8 +164,8 @@ int ia_css_queue_peek(* @param[in] qhandle. Handle to queue instance * @param[out] size Size value to be returned here. * @return 0 - Successful get size. -* @return EINVAL - Invalid argument. -* @return ENOSYS - Function not implemented. +* @return -EINVAL - Invalid argument. +* @return -ENOSYS - Function not implemented. * */ int ia_css_queue_get_size(
drivers/staging/media/atomisp/pci/runtime/queue/src/queue.c +22 -22
176 lines not on this page · raw message
drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.c +8 -8
@@ -26,7 +26,7 @@ int ia_css_queue_load( uint32_t ignore_desc_flags) {if (!rdesc || !cb_desc) -return EINVAL ; +return -EINVAL ;if (rdesc->location ==IA_CSS_QUEUE_LOC_SP ) {assert (ignore_desc_flags <=QUEUE_IGNORE_DESC_FLAGS_MAX );
@@ -69,7 +69,7 @@ int ia_css_queue_load( sizeof(ia_css_circbuf_desc_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {/* Not supported yet */ -return ENOTSUP ; +return -ENOTSUPP ; }return 0 ;
@@ -81,7 +81,7 @@ int ia_css_queue_store( uint32_t ignore_desc_flags) {if (!rdesc || !cb_desc) -return EINVAL ; +return -EINVAL ;if (rdesc->location ==IA_CSS_QUEUE_LOC_SP ) {assert (ignore_desc_flags <=QUEUE_IGNORE_DESC_FLAGS_MAX );
@@ -116,7 +116,7 @@ int ia_css_queue_store( sizeof(ia_css_circbuf_desc_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {/* Not supported yet */ -return ENOTSUP ; +return -ENOTSUPP ; }return 0 ;
@@ -128,7 +128,7 @@ int ia_css_queue_item_load( ia_css_circbuf_elem_t *item) {if (!rdesc || !item) -return EINVAL ; +return -EINVAL ;if (rdesc->location ==IA_CSS_QUEUE_LOC_SP ) { sp_dmem_load(rdesc->proc_id,
@@ -143,7 +143,7 @@ int ia_css_queue_item_load( sizeof(ia_css_circbuf_elem_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {/* Not supported yet */ -return ENOTSUP ; +return -ENOTSUPP ; }return 0 ;
@@ -155,7 +155,7 @@ int ia_css_queue_item_store( ia_css_circbuf_elem_t *item) {if (!rdesc || !item) -return EINVAL ; +return -EINVAL ;if (rdesc->location ==IA_CSS_QUEUE_LOC_SP ) { sp_dmem_store(rdesc->proc_id,
@@ -170,7 +170,7 @@ int ia_css_queue_item_store( sizeof(ia_css_circbuf_elem_t)); }else if (rdesc->location ==IA_CSS_QUEUE_LOC_ISP ) {/* Not supported yet */ -return ENOTSUP ; +return -ENOTSUPP ; }return 0 ;
drivers/staging/media/atomisp/pci/runtime/queue/src/queue_access.h +2 -1
@@ -15,10 +15,11 @@#ifndef __QUEUE_ACCESS_H#define __QUEUE_ACCESS_H +#include <linux/errno.h> +#include <type_support.h> #include <ia_css_queue_comm.h> #include <ia_css_circbuf.h> -#include <error_support.h> #define QUEUE_IGNORE_START_FLAG 0x0001#define QUEUE_IGNORE_END_FLAG 0x0002
Signature · 1 line
2.26.2
PATCH v2 32/41 media: atomisp: don't cause a warn if probe failed
In reply to Mauro Carvalho ChehabWhen probe fails, it is possible that hmm_init() to not be called. On such case, hmm_cleanup() will cause a WARN_ON().
Avoid it by adding an explicit check at hmm_cleanup() to ensure that the hmm code was properly initialized.
--- drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/atomisp/pci/hmm/hmm.c +2 -0
@@ -208,6 +208,8 @@ int hmm_init(void)void hmm_cleanup (void ) { +if (!dummy_ptr) +return ;sysfs_remove_group (&atomisp_dev->kobj, atomisp_attribute_group);/* free dummy memory first */
Signature · 1 line
2.26.2
PATCH v2 33/41 media: atomisp: get rid of a bunch of other wrappers
In reply to Mauro Carvalho ChehabThere are too many wrapper functions at atomisp_compat_css20.c.
Get rid of another set of such wrappers.
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 156 +++++----- .../media/atomisp/pci/atomisp_compat.h | 79 ----- .../media/atomisp/pci/atomisp_compat_css20.c | 281 ------------------ .../media/atomisp/pci/atomisp_compat_css20.h | 12 - .../staging/media/atomisp/pci/atomisp_file.c | 7 +- .../staging/media/atomisp/pci/atomisp_fops.c | 3 +- .../staging/media/atomisp/pci/atomisp_ioctl.c | 15 +- 7 files changed, 93 insertions(+), 460 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +81 -75
@@ -1170,8 +1170,7 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error,atomisp_apply_css_parameters (asd, &asd->params.css_param);if (asd->params.css_param.update_flag.dz_config) -atomisp_css_set_dz_config (asd, - &asd->params.css_param.dz_config); + asd->params.config.dz_config = &asd->params.css_param.dz_config;/* New global dvs 6axis config should be blocked * here if there's a buffer with per-frame parameters * pending in CSS frame buffer queue.
@@ -1262,9 +1261,15 @@ void atomisp_delayed_init_work(struct work_struct *work)*/ if (!ATOMISP_USE_YUVPP (asd)) {struct v4l2_event event = {0 }; +struct ia_css_stream *stream; -atomisp_css_allocate_continuous_frames (false, asd); -atomisp_css_update_continuous_frames (asd); + stream = asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream; + + +if (ia_css_alloc_continuous_frame_remain (stream)) +return ; + +ia_css_update_continuous_frames (stream); event.type =V4L2_EVENT_ATOMISP_RAW_BUFFERS_ALLOC_DONE ;v4l2_event_queue (asd->subdev.devnode, &event);
@@ -1823,7 +1828,8 @@ void atomisp_setup_flash(struct atomisp_sub_device *asd)return ; } -atomisp_css_request_flash (asd); +ia_css_stream_request_flash (asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream); + asd->params.flash_state =ATOMISP_FLASH_ONGOING ; }else { asd->params.flash_state =ATOMISP_FLASH_IDLE ;
@@ -2107,10 +2113,9 @@ int atomisp_gdc_cac(struct atomisp_sub_device *asd, int flag, asd->params.gdc_cac_en = !!*value;if (asd->params.gdc_cac_en) { -atomisp_css_set_morph_table (asd, - asd->params.css_param.morph_table); + asd->params.config.morph_table = asd->params.css_param.morph_table; }else { -atomisp_css_set_morph_table (asd,NULL ); + asd->params.config.morph_table =NULL ; } asd->params.css_update_params_needed = true;atomisp_update_capture_mode (asd);
@@ -2164,7 +2169,7 @@ int atomisp_nr(struct atomisp_sub_device *asd, int flag,/* Set nr config to isp parameters */ memcpy (&asd->params.css_param.nr_config, arg,sizeof (struct ia_css_nr_config )); -atomisp_css_set_nr_config (asd, &asd->params.css_param.nr_config); + asd->params.config.nr_config = &asd->params.css_param.nr_config; asd->params.css_update_params_needed = true; }return 0 ;
@@ -2185,7 +2190,7 @@ int atomisp_tnr(struct atomisp_sub_device *asd, int flag,/* Set tnr config to isp parameters */ memcpy (&asd->params.css_param.tnr_config, config,sizeof (struct ia_css_tnr_config )); -atomisp_css_set_tnr_config (asd, &asd->params.css_param.tnr_config); + asd->params.config.tnr_config = &asd->params.css_param.tnr_config; asd->params.css_update_params_needed = true; }
@@ -2206,7 +2211,7 @@ int atomisp_black_level(struct atomisp_sub_device *asd, int flag,/* Set ob config to isp parameters */ memcpy (&asd->params.css_param.ob_config, config,sizeof (struct ia_css_ob_config )); -atomisp_css_set_ob_config (asd, &asd->params.css_param.ob_config); + asd->params.config.ob_config = &asd->params.css_param.ob_config; asd->params.css_update_params_needed = true; }
@@ -2227,7 +2232,7 @@ int atomisp_ee(struct atomisp_sub_device *asd, int flag,/* Set ee config to isp parameters */ memcpy (&asd->params.css_param.ee_config, config,sizeof (asd->params.css_param.ee_config)); -atomisp_css_set_ee_config (asd, &asd->params.css_param.ee_config); + asd->params.config.ee_config = &asd->params.css_param.ee_config; asd->params.css_update_params_needed = true; }
@@ -2248,7 +2253,7 @@ int atomisp_gamma(struct atomisp_sub_device *asd, int flag,/* Set gamma table to isp parameters */ memcpy (&asd->params.css_param.gamma_table, config,sizeof (asd->params.css_param.gamma_table)); -atomisp_css_set_gamma_table (asd, &asd->params.css_param.gamma_table); + asd->params.config.gamma_table = &asd->params.css_param.gamma_table; }return 0 ;
@@ -2288,7 +2293,7 @@ int atomisp_gamma_correction(struct atomisp_sub_device *asd, int flag,/* Set gamma correction params to isp parameters */ memcpy (&asd->params.css_param.gc_config, config,sizeof (asd->params.css_param.gc_config)); -atomisp_css_set_gc_config (asd, &asd->params.css_param.gc_config); + asd->params.config.gc_config = &asd->params.css_param.gc_config; asd->params.css_update_params_needed = true; }
@@ -2309,7 +2314,7 @@ int atomisp_formats(struct atomisp_sub_device *asd, int flag,/* Set narrow gamma flag to isp parameters */ memcpy (&asd->params.css_param.formats_config, config,sizeof (asd->params.css_param.formats_config)); -atomisp_css_set_formats_config (asd, &asd->params.css_param.formats_config); + asd->params.config.formats_config = &asd->params.css_param.formats_config; }return 0 ;
@@ -2320,7 +2325,7 @@ void atomisp_free_internal_buffers(struct atomisp_sub_device *asd)atomisp_free_css_parameters (&asd->params.css_param);if (asd->raw_output_frame) { -atomisp_css_frame_free (asd->raw_output_frame); +ia_css_frame_free (asd->raw_output_frame); asd->raw_output_frame =NULL ; } }
@@ -2472,7 +2477,7 @@ int atomisp_gdc_cac_table(struct atomisp_sub_device *asd, int flag, } asd->params.css_param.morph_table = tab;if (asd->params.gdc_cac_en) -atomisp_css_set_morph_table (asd, tab); + asd->params.config.morph_table = tab; }return 0 ;
@@ -2514,7 +2519,7 @@ int atomisp_macc_table(struct atomisp_sub_device *asd, int flag,memcpy (macc_table, &config->table,sizeof (struct ia_css_macc_table ));if (config->color_effect == asd->params.color_effect) -atomisp_css_set_macc_table (asd, macc_table); + asd->params.config.macc_table = macc_table; }return 0 ;
@@ -3151,84 +3156,82 @@ void atomisp_apply_css_parameters( struct atomisp_css_params *css_param) {if (css_param->update_flag.wb_config) -atomisp_css_set_wb_config (asd, &css_param->wb_config); + asd->params.config.wb_config = &css_param->wb_config;if (css_param->update_flag.ob_config) -atomisp_css_set_ob_config (asd, &css_param->ob_config); + asd->params.config.ob_config = &css_param->ob_config;if (css_param->update_flag.dp_config) -atomisp_css_set_dp_config (asd, &css_param->dp_config); + asd->params.config.dp_config = &css_param->dp_config;if (css_param->update_flag.nr_config) -atomisp_css_set_nr_config (asd, &css_param->nr_config); + asd->params.config.nr_config = &css_param->nr_config;if (css_param->update_flag.ee_config) -atomisp_css_set_ee_config (asd, &css_param->ee_config); + asd->params.config.ee_config = &css_param->ee_config;if (css_param->update_flag.tnr_config) -atomisp_css_set_tnr_config (asd, &css_param->tnr_config); + asd->params.config.tnr_config = &css_param->tnr_config;if (css_param->update_flag.a3a_config) -atomisp_css_set_3a_config (asd, &css_param->s3a_config); + asd->params.config.s3a_config = &css_param->s3a_config;if (css_param->update_flag.ctc_config) -atomisp_css_set_ctc_config (asd, &css_param->ctc_config); + asd->params.config.ctc_config = &css_param->ctc_config;if (css_param->update_flag.cnr_config) -atomisp_css_set_cnr_config (asd, &css_param->cnr_config); + asd->params.config.cnr_config = &css_param->cnr_config;if (css_param->update_flag.ecd_config) -atomisp_css_set_ecd_config (asd, &css_param->ecd_config); + asd->params.config.ecd_config = &css_param->ecd_config;if (css_param->update_flag.ynr_config) -atomisp_css_set_ynr_config (asd, &css_param->ynr_config); + asd->params.config.ynr_config = &css_param->ynr_config;if (css_param->update_flag.fc_config) -atomisp_css_set_fc_config (asd, &css_param->fc_config); + asd->params.config.fc_config = &css_param->fc_config;if (css_param->update_flag.macc_config) -atomisp_css_set_macc_config (asd, &css_param->macc_config); + asd->params.config.macc_config = &css_param->macc_config;if (css_param->update_flag.aa_config) -atomisp_css_set_aa_config (asd, &css_param->aa_config); + asd->params.config.aa_config = &css_param->aa_config;if (css_param->update_flag.anr_config) -atomisp_css_set_anr_config (asd, &css_param->anr_config); + asd->params.config.anr_config = &css_param->anr_config;if (css_param->update_flag.xnr_config) -atomisp_css_set_xnr_config (asd, &css_param->xnr_config); + asd->params.config.xnr_config = &css_param->xnr_config;if (css_param->update_flag.yuv2rgb_cc_config) -atomisp_css_set_yuv2rgb_cc_config (asd, - &css_param->yuv2rgb_cc_config); + asd->params.config.yuv2rgb_cc_config = &css_param->yuv2rgb_cc_config;if (css_param->update_flag.rgb2yuv_cc_config) -atomisp_css_set_rgb2yuv_cc_config (asd, - &css_param->rgb2yuv_cc_config); + asd->params.config.rgb2yuv_cc_config = &css_param->rgb2yuv_cc_config;if (css_param->update_flag.macc_table) -atomisp_css_set_macc_table (asd, &css_param->macc_table); + asd->params.config.macc_table = &css_param->macc_table;if (css_param->update_flag.xnr_table) -atomisp_css_set_xnr_table (asd, &css_param->xnr_table); + asd->params.config.xnr_table = &css_param->xnr_table;if (css_param->update_flag.r_gamma_table) -atomisp_css_set_r_gamma_table (asd, &css_param->r_gamma_table); + asd->params.config.r_gamma_table = &css_param->r_gamma_table;if (css_param->update_flag.g_gamma_table) -atomisp_css_set_g_gamma_table (asd, &css_param->g_gamma_table); + asd->params.config.g_gamma_table = &css_param->g_gamma_table;if (css_param->update_flag.b_gamma_table) -atomisp_css_set_b_gamma_table (asd, &css_param->b_gamma_table); + asd->params.config.b_gamma_table = &css_param->b_gamma_table;if (css_param->update_flag.anr_thres)atomisp_css_set_anr_thres (asd, &css_param->anr_thres);if (css_param->update_flag.shading_table) -atomisp_css_set_shading_table (asd, css_param->shading_table); + asd->params.config.shading_table = css_param->shading_table;if (css_param->update_flag.morph_table && asd->params.gdc_cac_en) -atomisp_css_set_morph_table (asd, css_param->morph_table); + asd->params.config.morph_table = css_param->morph_table;if (css_param->update_flag.dvs2_coefs) { struct ia_css_dvs_grid_info *dvs_grid_info =
@@ -4363,18 +4366,18 @@ int atomisp_param(struct atomisp_sub_device *asd, int flag, asd->params.color_effect != V4L2_COLORFX_BW) {memcpy (&asd->params.css_param.cc_config, &config->cc_config,sizeof (struct ia_css_cc_config )); -atomisp_css_set_cc_config (asd, &asd->params.css_param.cc_config); + asd->params.config.cc_config = &asd->params.css_param.cc_config; } -atomisp_css_set_wb_config (asd, &asd->params.css_param.wb_config); -atomisp_css_set_ob_config (asd, &asd->params.css_param.ob_config); -atomisp_css_set_de_config (asd, &asd->params.css_param.de_config); -atomisp_css_set_dz_config (asd, &asd->params.css_param.dz_config); -atomisp_css_set_ce_config (asd, &asd->params.css_param.ce_config); -atomisp_css_set_dp_config (asd, &asd->params.css_param.dp_config); -atomisp_css_set_nr_config (asd, &asd->params.css_param.nr_config); -atomisp_css_set_ee_config (asd, &asd->params.css_param.ee_config); -atomisp_css_set_tnr_config (asd, &asd->params.css_param.tnr_config); + asd->params.config.wb_config = &asd->params.css_param.wb_config; + asd->params.config.ob_config = &asd->params.css_param.ob_config; + asd->params.config.de_config = &asd->params.css_param.de_config; + asd->params.config.dz_config = &asd->params.css_param.dz_config; + asd->params.config.ce_config = &asd->params.css_param.ce_config; + asd->params.config.dp_config = &asd->params.css_param.dp_config; + asd->params.config.nr_config = &asd->params.css_param.nr_config; + asd->params.config.ee_config = &asd->params.css_param.ee_config; + asd->params.config.tnr_config = &asd->params.css_param.tnr_config; asd->params.css_update_params_needed = true;return 0 ;
@@ -4463,9 +4466,9 @@ int atomisp_color_effect(struct atomisp_sub_device *asd, int flag,atomisp_update_capture_mode (asd);if (cc_config) -atomisp_css_set_cc_config (asd, cc_config); + asd->params.config.cc_config = cc_config;if (macc_table) -atomisp_css_set_macc_table (asd, macc_table); + asd->params.config.macc_table = macc_table;if (ctc_table)atomisp_css_set_ctc_table (asd, ctc_table); asd->params.color_effect = (u32)*effect;
@@ -4502,7 +4505,7 @@ int atomisp_bad_pixel_param(struct atomisp_sub_device *asd, int flag,/* Set bad pixel to isp parameters */ memcpy (&asd->params.css_param.dp_config, config,sizeof (asd->params.css_param.dp_config)); -atomisp_css_set_dp_config (asd, &asd->params.css_param.dp_config); + asd->params.config.dp_config = &asd->params.css_param.dp_config; asd->params.css_update_params_needed = true; }
@@ -4595,7 +4598,7 @@ atomisp_v4l2_framebuffer_to_css_frame(const struct v4l2_framebuffer *arg,/* Note: the padded width on an ia_css_frame is in elements, not in bytes. The RAW frame we use here should always be a 16bit RAW frame. This is why we bytesperline/2 is equal to the padded with */ -if (atomisp_css_frame_allocate (&res, arg->fmt.width, arg->fmt.height, +if (ia_css_frame_allocate (&res, arg->fmt.width, arg->fmt.height, sh_format, padded_width,0 )) { ret = -ENOMEM ; goto err;
@@ -4619,7 +4622,7 @@ atomisp_v4l2_framebuffer_to_css_frame(const struct v4l2_framebuffer *arg, err:if (ret && res) -atomisp_css_frame_free (res); +ia_css_frame_free (res);if (tmp_buf)vfree (tmp_buf);if (ret ==0 )
@@ -4642,10 +4645,12 @@ int atomisp_fixed_pattern_table(struct atomisp_sub_device *asd, ret =atomisp_v4l2_framebuffer_to_css_frame (arg, &raw_black_frame);if (ret)return ret; -if (atomisp_css_set_black_frame (asd, raw_black_frame)) - ret = -ENOMEM ; -atomisp_css_frame_free (raw_black_frame); +if (sh_css_set_black_frame (asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream, + raw_black_frame) !=0 ) +return -ENOMEM ; + +ia_css_frame_free (raw_black_frame);return ret; }
@@ -4663,10 +4668,10 @@ int atomisp_false_color(struct atomisp_sub_device *asd, int flag,/* Set nr config to isp parameters */ if (*value) { -atomisp_css_set_default_de_config (asd); + asd->params.config.de_config =NULL ; }else { asd->params.css_param.de_config.pixelnoise =0 ; -atomisp_css_set_de_config (asd, &asd->params.css_param.de_config); + asd->params.config.de_config = &asd->params.css_param.de_config; } asd->params.css_update_params_needed = true; asd->params.false_color = *value;
@@ -4687,7 +4692,7 @@ int atomisp_false_color_param(struct atomisp_sub_device *asd, int flag,/* Set false color to isp parameters */ memcpy (&asd->params.css_param.de_config, config,sizeof (asd->params.css_param.de_config)); -atomisp_css_set_de_config (asd, &asd->params.css_param.de_config); + asd->params.config.de_config = &asd->params.css_param.de_config; asd->params.css_update_params_needed = true; }
@@ -4708,7 +4713,7 @@ int atomisp_white_balance_param(struct atomisp_sub_device *asd, int flag,/* Set white balance to isp parameters */ memcpy (&asd->params.css_param.wb_config, config,sizeof (asd->params.css_param.wb_config)); -atomisp_css_set_wb_config (asd, &asd->params.css_param.wb_config); + asd->params.config.wb_config = &asd->params.css_param.wb_config; asd->params.css_update_params_needed = true; }
@@ -4730,7 +4735,7 @@ int atomisp_3a_config_param(struct atomisp_sub_device *asd, int flag,/* Set white balance to isp parameters */ memcpy (&asd->params.css_param.s3a_config, config,sizeof (asd->params.css_param.s3a_config)); -atomisp_css_set_3a_config (asd, &asd->params.css_param.s3a_config); + asd->params.config.s3a_config = &asd->params.css_param.s3a_config; asd->params.css_update_params_needed = true; }
@@ -5191,7 +5196,7 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, configure_pp_input_nop;u16 stream_index =atomisp_source_pad_to_stream_id (asd, source_pad);const struct atomisp_in_fmt_conv *fc; -int ret; +int ret, i;v4l2_fh_init (&fh.vfh, vdev);
@@ -5288,8 +5293,9 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, }atomisp_css_input_set_mode (asd,IA_CSS_INPUT_MODE_BUFFERED_SENSOR ); -atomisp_css_disable_vf_pp (asd, - asd->vfpp->val !=ATOMISP_VFPP_ENABLE ); + +for (i =0 ; i <IA_CSS_PIPE_ID_NUM ; i++) + asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].pipe_extra_configs[i].disable_vf_pp = asd->vfpp->val !=ATOMISP_VFPP_ENABLE ;/* ISP2401 new input system need to use copy pipe */ if (asd->copy_mode) {
@@ -5434,12 +5440,12 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,atomisp_update_grid_info (asd, pipe_id, source_pad);/* Free the raw_dump buffer first */ -atomisp_css_frame_free (asd->raw_output_frame); +ia_css_frame_free (asd->raw_output_frame); asd->raw_output_frame =NULL ;if (!asd->continuous_mode->val && !asd->params.online_process && !isp->sw_contex.file_input && -atomisp_css_frame_allocate_from_info (&asd->raw_output_frame, +ia_css_frame_allocate_from_info (&asd->raw_output_frame, raw_output_info))return -ENOMEM ;
@@ -6086,7 +6092,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device *asd,return -EINVAL ;if (!user_shading_table->enable) { -atomisp_css_set_shading_table (asd,NULL ); + asd->params.config.shading_table =NULL ; asd->params.sc_en = false;return 0 ; }
@@ -6131,7 +6137,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device *asd, free_table = asd->params.css_param.shading_table; asd->params.css_param.shading_table = shading_table; -atomisp_css_set_shading_table (asd, shading_table); + asd->params.config.shading_table = shading_table; asd->params.sc_en = true; out:
drivers/staging/media/atomisp/pci/atomisp_compat.h +0 -79
100 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +0 -281
305 lines not on this page · raw message
drivers/staging/media/atomisp/pci/atomisp_compat_css20.h +0 -12
@@ -140,18 +140,6 @@ void atomisp_css_set_yuv2rgb_cc_config(struct atomisp_sub_device *asd,void atomisp_css_set_rgb2yuv_cc_config (struct atomisp_sub_device *asd,struct ia_css_cc_config *rgb2yuv_cc_config); -void atomisp_css_set_xnr_table (struct atomisp_sub_device *asd, -struct ia_css_xnr_table *xnr_table); - -void atomisp_css_set_r_gamma_table (struct atomisp_sub_device *asd, -struct ia_css_rgb_gamma_table *r_gamma_table); - -void atomisp_css_set_g_gamma_table (struct atomisp_sub_device *asd, -struct ia_css_rgb_gamma_table *g_gamma_table); - -void atomisp_css_set_b_gamma_table (struct atomisp_sub_device *asd, -struct ia_css_rgb_gamma_table *b_gamma_table); -void atomisp_css_set_anr_thres (struct atomisp_sub_device *asd,struct ia_css_anr_thres *anr_thres);
drivers/staging/media/atomisp/pci/atomisp_file.c +4 -3
@@ -50,11 +50,12 @@ static void file_work(struct work_struct *work)V4L2_SUBDEV_FORMAT_ACTIVE , ATOMISP_SUBDEV_PAD_SINK); -while (!atomisp_css_isp_has_started ()) +while (!ia_css_isp_has_started ())usleep_range (1000 ,1500 ); -atomisp_css_send_input_frame (asd, buf, isp_sink_fmt.width, - isp_sink_fmt.height); +ia_css_stream_send_input_frame (asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream, + buf, isp_sink_fmt.width, + isp_sink_fmt.height);dev_dbg (isp->dev,"<%s: streaming done\n" , __func__); }
drivers/staging/media/atomisp/pci/atomisp_fops.c +1 -2
@@ -252,8 +252,7 @@ int atomisp_q_video_buffers_to_css(struct atomisp_sub_device *asd, err =atomisp_calculate_real_zoom_region (asd, ¶m->params.dz_config, css_pipe_id);if (!err) -atomisp_css_set_dz_config (asd, - ¶m->params.dz_config); + asd->params.config.dz_config = ¶m->params.dz_config; }atomisp_css_set_isp_config_applied_frame (asd, vm_mem->vaddr);
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +7 -8
@@ -891,7 +891,7 @@ void atomisp_videobuf_free_buf(struct videobuf_buffer *vb) vm_mem = vb->priv;if (vm_mem && vm_mem->vaddr) { -atomisp_css_frame_free (vm_mem->vaddr); +ia_css_frame_free (vm_mem->vaddr); vm_mem->vaddr =NULL ; } }
@@ -1067,7 +1067,7 @@ int __atomisp_reqbufs(struct file *file, void *fh,* memory management function */ for (i =0 ; i < req->count; i++) { -if (atomisp_css_frame_allocate_from_info (&frame, &frame_info)) +if (ia_css_frame_allocate_from_info (&frame, &frame_info)) goto error; vm_mem = pipe->capq.bufs[i]->priv; vm_mem->vaddr = frame;
@@ -1078,11 +1078,11 @@ int __atomisp_reqbufs(struct file *file, void *fh, error:while (i--) { vm_mem = pipe->capq.bufs[i]->priv; -atomisp_css_frame_free (vm_mem->vaddr); +ia_css_frame_free (vm_mem->vaddr); }if (asd->vf_frame) -atomisp_css_frame_free (asd->vf_frame); +ia_css_frame_free (asd->vf_frame);return -ENOMEM ; }
@@ -1200,7 +1200,7 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) goto error; } - ret =atomisp_css_frame_map (&handle, &frame_info, + ret =ia_css_frame_map (&handle, &frame_info, (void __user *)buf->m.userptr,0 , pgnr);if (ret) {
@@ -1210,7 +1210,7 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)if (vm_mem->vaddr) {mutex_lock (&pipe->capq.vb_lock); -atomisp_css_frame_free (vm_mem->vaddr); +ia_css_frame_free (vm_mem->vaddr); vm_mem->vaddr =NULL ; vb->state =VIDEOBUF_NEEDS_INIT ;mutex_unlock (&pipe->capq.vb_lock);
@@ -1758,8 +1758,7 @@ static int atomisp_streamon(struct file *file, void *fh,if (asd->params.css_update_params_needed) {atomisp_apply_css_parameters (asd, &asd->params.css_param);if (asd->params.css_param.update_flag.dz_config) -atomisp_css_set_dz_config (asd, - &asd->params.css_param.dz_config); + asd->params.config.dz_config = &asd->params.css_param.dz_config;atomisp_css_update_isp_params (asd); asd->params.css_update_params_needed = false; memset(&asd->params.css_param.update_flag, 0,
Signature · 1 line
2.26.2
PATCH v2 34/41 media: atomisp: get rid of system_types.h
In reply to Mauro Carvalho ChehabThis is just a wrapper for system_local.h.
--- .../base/refcount/interface/ia_css_refcount.h | 2 +- .../input_formatter_global.h | 2 +- .../pci/hive_isp_css_common/irq_global.h | 2 +- .../pci/hive_isp_css_common/isp_global.h | 2 +- .../pci/hive_isp_css_common/sp_global.h | 2 +- .../device_access/device_access.h | 2 +- .../hive_isp_css_include/host/debug_public.h | 2 +- .../hive_isp_css_include/host/dma_public.h | 2 +- .../host/event_fifo_public.h | 2 +- .../host/fifo_monitor_public.h | 2 +- .../host/gp_device_public.h | 2 +- .../host/gp_timer_public.h | 2 +- .../hive_isp_css_include/host/gpio_public.h | 2 +- .../host/input_formatter_public.h | 2 +- .../hive_isp_css_include/host/irq_public.h | 2 +- .../hive_isp_css_include/host/isp_public.h | 2 +- .../host/isys_dma_public.h | 2 +- .../hive_isp_css_include/host/mmu_public.h | 2 +- .../pci/hive_isp_css_include/host/sp_public.h | 2 +- .../host/timed_ctrl_public.h | 2 +- .../pci/hive_isp_css_include/system_types.h | 24 ------------------- .../media/atomisp/pci/ia_css_acc_types.h | 2 +- .../media/atomisp/pci/ia_css_device_access.c | 2 +- .../media/atomisp/pci/ia_css_device_access.h | 2 +- .../frame/interface/ia_css_frame_comm.h | 2 +- .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 2 +- .../media/atomisp/pci/sh_css_firmware.h | 2 +- .../staging/media/atomisp/pci/sh_css_struct.h | 2 +- 28 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h
drivers/staging/media/atomisp/pci/base/refcount/interface/ia_css_refcount.h +1 -1
@@ -16,7 +16,7 @@#define _IA_CSS_REFCOUNT_H_#include <type_support.h> -#include <system_types.h> +#include <system_local.h> #include <ia_css_err.h> #include <ia_css_types.h>
drivers/staging/media/atomisp/pci/hive_isp_css_common/input_formatter_global.h +1 -1
@@ -19,7 +19,7 @@#define IS_INPUT_SWITCH_VERSION2 #include <type_support.h> -#include <system_types.h> +#include <system_local.h> #include "if_defs.h" #include "str2mem_defs.h" #include "input_switch_2400_defs.h"
drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h +1 -1
@@ -15,7 +15,7 @@#ifndef __IRQ_GLOBAL_H_INCLUDED__#define __IRQ_GLOBAL_H_INCLUDED__ -#include <system_types.h> +#include <system_local.h> #define IS_IRQ_VERSION_2 #define IS_IRQ_MAP_VERSION_2
drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h +1 -1
@@ -15,7 +15,7 @@#ifndef __ISP_GLOBAL_H_INCLUDED__#define __ISP_GLOBAL_H_INCLUDED__ -#include <system_types.h> +#include <system_local.h> #if defined(HAS_ISP_2401_MAMOIADA )#define IS_ISP_2401_MAMOIADA
drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h +1 -1
@@ -15,7 +15,7 @@#ifndef __SP_GLOBAL_H_INCLUDED__#define __SP_GLOBAL_H_INCLUDED__ -#include <system_types.h> +#include <system_local.h> #if defined(HAS_SP_2401 )#define IS_SP_2401
drivers/staging/media/atomisp/pci/hive_isp_css_include/device_access/device_access.h +1 -1
@@ -39,7 +39,7 @@ more details.* User provided file that defines the system address types: * - hrt_address a type that can hold the (sub)system address range */ -#include "system_types.h" +#include "system_local.h" /* * We cannot assume that the global system address size is the size of * a pointer because a (say) 64-bit host can be simulated in a 32-bit
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/debug_public.h +1 -1
@@ -17,7 +17,7 @@#include <type_support.h> #include <ia_css_types.h> -#include "system_types.h" +#include "system_local.h" /*! brief *
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/dma_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __DMA_PUBLIC_H_INCLUDED__#define __DMA_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" typedef struct dma_state_s dma_state_t ;
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/event_fifo_public.h +1 -1
@@ -16,7 +16,7 @@#define __EVENT_FIFO_PUBLIC_H#include <type_support.h> -#include "system_types.h" +#include "system_local.h" /*! Blocking read from an event source EVENT[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/fifo_monitor_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __FIFO_MONITOR_PUBLIC_H_INCLUDED__#define __FIFO_MONITOR_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" typedef struct fifo_channel_state_s fifo_channel_state_t ;typedef struct fifo_switch_state_s fifo_switch_state_t ;
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_device_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __GP_DEVICE_PUBLIC_H_INCLUDED__#define __GP_DEVICE_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" typedef struct gp_device_state_s gp_device_state_t ;
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gp_timer_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __GP_TIMER_PUBLIC_H_INCLUDED__#define __GP_TIMER_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" /*! initialize mentioned timer param ID timer_id
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/gpio_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __GPIO_PUBLIC_H_INCLUDED__#define __GPIO_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" /*! Write to a control register of GPIO[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/input_formatter_public.h +1 -1
@@ -16,7 +16,7 @@#define __INPUT_FORMATTER_PUBLIC_H_INCLUDED__#include <type_support.h> -#include "system_types.h" +#include "system_local.h" /*! Reset INPUT_FORMATTER[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/irq_public.h +1 -1
@@ -16,7 +16,7 @@#define __IRQ_PUBLIC_H_INCLUDED__#include <type_support.h> -#include "system_types.h" +#include "system_local.h" /*! Read the control registers of IRQ[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isp_public.h +1 -1
@@ -16,7 +16,7 @@#define __ISP_PUBLIC_H_INCLUDED__#include <type_support.h> -#include "system_types.h" +#include "system_local.h" /*! Enable or disable the program complete irq signal of ISP[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_dma_public.h +1 -1
@@ -17,7 +17,7 @@#ifdef USE_INPUT_SYSTEM_VERSION_2401 -#include "system_types.h" +#include "system_local.h" #include "type_support.h" STORAGE_CLASS_ISYS2401_DMA_H void isys2401_dma_reg_store(
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/mmu_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __MMU_PUBLIC_H_INCLUDED__#define __MMU_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" #include "device_access.h" #include "assert_support.h"
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/sp_public.h +1 -1
@@ -16,7 +16,7 @@#define __SP_PUBLIC_H_INCLUDED__#include <type_support.h> -#include "system_types.h" +#include "system_local.h" typedef struct sp_state_s sp_state_t ;typedef struct sp_stall_s sp_stall_t ;
drivers/staging/media/atomisp/pci/hive_isp_css_include/host/timed_ctrl_public.h +1 -1
@@ -15,7 +15,7 @@#ifndef __TIMED_CTRL_PUBLIC_H_INCLUDED__#define __TIMED_CTRL_PUBLIC_H_INCLUDED__ -#include "system_types.h" +#include "system_local.h" /*! Write to a control register of TIMED_CTRL[ID]
drivers/staging/media/atomisp/pci/hive_isp_css_include/system_types.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* -* Support for Intel Camera Imaging ISP subsystem. -* Copyright (c) 2015, Intel Corporation. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -*/ -#ifndef __SYSTEM_TYPES_H_INCLUDED__ -#define __SYSTEM_TYPES_H_INCLUDED__ - -/** -* @file -* Platform specific types. -*/ - -#include "system_local.h" - -#endif /* __SYSTEM_TYPES_H_INCLUDED__ */
drivers/staging/media/atomisp/pci/ia_css_acc_types.h +1 -1
@@ -19,7 +19,7 @@* This file contains types used for acceleration */ -#include <system_types.h> /* HAS_IRQ_MAP_VERSION_# */ +#include <system_local.h> /* HAS_IRQ_MAP_VERSION_# */ #include <type_support.h> #include <platform_support.h> #include <debug_global.h>
drivers/staging/media/atomisp/pci/ia_css_device_access.c +1 -1
@@ -14,7 +14,7 @@#include "ia_css_device_access.h" #include <type_support.h> /* for uint*, size_t */ -#include <system_types.h> /* for hrt_address */ +#include <system_local.h> /* for hrt_address */ #include <ia_css_env.h> /* for ia_css_hw_access_env */ #include <assert_support.h> /* for assert */
drivers/staging/media/atomisp/pci/ia_css_device_access.h +1 -1
@@ -20,7 +20,7 @@*/ #include <type_support.h> /* for uint*, size_t */ -#include <system_types.h> /* for hrt_address */ +#include <system_local.h> /* for hrt_address */ #include <ia_css_env.h> /* for ia_css_hw_access_env */ void
drivers/staging/media/atomisp/pci/runtime/frame/interface/ia_css_frame_comm.h +1 -1
@@ -18,7 +18,7 @@#include "type_support.h" #include "platform_support.h" #include "runtime/bufq/interface/ia_css_bufq_comm.h" -#include <system_types.h> /* ia_css_ptr */ +#include <system_local.h> /* ia_css_ptr */ /* * These structs are derived from structs defined in ia_css_types.h
drivers/staging/media/atomisp/pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h +1 -1
@@ -18,7 +18,7 @@#include "ia_css_rmgr.h" #include <type_support.h> #include <ia_css_types.h> -#include <system_types.h> +#include <system_local.h> /** * @brief Data structure for the resource handle (host, vbuf)
drivers/staging/media/atomisp/pci/sh_css_firmware.h +1 -1
@@ -15,7 +15,7 @@#ifndef _SH_CSS_FIRMWARE_H_#define _SH_CSS_FIRMWARE_H_ -#include <system_types.h> +#include <system_local.h> #include <ia_css_err.h> #include <ia_css_acc_types.h>
drivers/staging/media/atomisp/pci/sh_css_struct.h +1 -1
@@ -24,7 +24,7 @@*/ #include <type_support.h> -#include <system_types.h> +#include <system_local.h> #include "ia_css_pipeline.h" #include "ia_css_pipe_public.h" #include "ia_css_frame_public.h"
Signature · 1 line
2.26.2
PATCH v2 35/41 media: atomisp: provide more details about the firmware binaries
In reply to Mauro Carvalho ChehabIn order to make easier to identify what a firmware file contains, add more info at the firmware dump log facility.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 39 +++++++++++++++++-- .../media/atomisp/pci/ia_css_acc_types.h | 4 +- .../media/atomisp/pci/sh_css_firmware.c | 2 + 3 files changed, 40 insertions(+), 5 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +36 -3
@@ -4306,6 +4306,20 @@ int atomisp_css_dump_sp_raw_copy_linecount(bool reduced)return 0 ; } +static const char *fw_type_name[] = { + [ia_css_sp_firmware] ="SP" , + [ia_css_isp_firmware] ="ISP" , + [ia_css_bootloader_firmware] ="BootLoader" , + [ia_css_acc_firmware] ="accel" , +}; + +static const char *fw_acc_type_name[] = { + [IA_CSS_ACC_NONE ] ="Normal" , + [IA_CSS_ACC_OUTPUT ] ="Accel stage on output" , + [IA_CSS_ACC_VIEWFINDER ] ="Accel stage on viewfinder" , + [IA_CSS_ACC_STANDALONE ] ="Stand-alone acceleration" , +}; +int atomisp_css_dump_blob_infor (void ) {struct ia_css_blob_descr *bd = sh_css_blob_info;
@@ -4316,9 +4330,28 @@ int atomisp_css_dump_blob_infor(void)if (!bd)return -EPERM ; -for (i =1 ; i < sh_css_num_binaries; i++) -dev_dbg (atomisp_dev,"Num%d binary id is %d, name is %s\n" , i, - bd[i -1 ].header.info.isp.sp.id, bd[i -1 ].name); +/* +* The sh_css_load_firmware function discard the initial +* "SPS" binaries +*/ +for (i =0 ; i < sh_css_num_binaries -NUM_OF_SPS ; i++) { +switch (bd[i].header.type) { +case ia_css_isp_firmware: +dev_dbg (atomisp_dev, +"Num%2d type %s (%s), binary id is %2d, name is %s\n" , + i +NUM_OF_SPS , + fw_type_name[bd[i].header.type], + fw_acc_type_name[bd[i].header.info.isp.type], + bd[i].header.info.isp.sp.id, + bd[i].name); +break ; +default : +dev_dbg (atomisp_dev, +"Num%2d type %s, name is %s\n" , + i +NUM_OF_SPS , fw_type_name[bd[i].header.type], + bd[i].name); + } + }return 0 ; }
drivers/staging/media/atomisp/pci/ia_css_acc_types.h +2 -2
@@ -62,8 +62,8 @@ enum ia_css_cell_type {*/ enum ia_css_fw_type { ia_css_sp_firmware,/** Firmware for the SP */ - ia_css_isp_firmware,/** Firmware for the ISP */ - ia_css_bootloader_firmware,/** Firmware for the BootLoader */ + ia_css_isp_firmware,/** Firmware for the ISP */ + ia_css_bootloader_firmware,/** Firmware for the BootLoader */ ia_css_acc_firmware/** Firmware for accelrations */ };
drivers/staging/media/atomisp/pci/sh_css_firmware.c +2 -0
@@ -282,6 +282,8 @@ sh_css_load_firmware(struct device *dev, const char *fw_data, err =setup_binary (bi, fw_data, &sh_css_sp_fw, i);if (err)return err; +dev_dbg (dev,"firmware #%d (SP), name %s\n" , i, bd.name); + }else {/* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS) are ISP firmware */ if (i <NUM_OF_SPS )
Signature · 1 line
2.26.2
PATCH v2 36/41 media: atomisp: print firmware data during load
In reply to Mauro Carvalho ChehabWhile there's a way to list the firmware binaries in runtime, it is worth to also print it during firmware load.
One advantage is that this code also introduces additional checks with regards to invalid firmware types, which can be useful to identify problems.
--- .../media/atomisp/pci/sh_css_firmware.c | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/sh_css_firmware.c +47 -1
@@ -206,6 +206,20 @@ sh_css_check_firmware_version(struct device *dev, const char *fw_data)return 0 ; } +static const char *fw_type_name[] = { + [ia_css_sp_firmware] ="SP" , + [ia_css_isp_firmware] ="ISP" , + [ia_css_bootloader_firmware] ="BootLoader" , + [ia_css_acc_firmware] ="accel" , +}; + +static const char *fw_acc_type_name[] = { + [IA_CSS_ACC_NONE ] ="Normal" , + [IA_CSS_ACC_OUTPUT ] ="Accel for output" , + [IA_CSS_ACC_VIEWFINDER ] ="Accel for viewfinder" , + [IA_CSS_ACC_STANDALONE ] ="Stand-alone accel" , +}; +int sh_css_load_firmware (struct device *dev,const char *fw_data,unsigned int fw_size) {
@@ -276,13 +290,45 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,if (bi->blob.offset + bi->blob.size > fw_size)return -EINVAL ; +switch (bd.header.type) { +case ia_css_isp_firmware: +if (bd.header.info.isp.type >IA_CSS_ACC_STANDALONE ) { +dev_err (dev,"binary #%2d: invalid SP type\n" , + i); +return -EINVAL ; + } + +dev_dbg (dev, +"binary #%-2d type %s (%s), binary id is %2d: %s\n" , + i, + fw_type_name[bd.header.type], + fw_acc_type_name[bd.header.info.isp.type], + bd.header.info.isp.sp.id, + bd.name); +break ; +case ia_css_sp_firmware: +case ia_css_bootloader_firmware: +case ia_css_acc_firmware: +dev_dbg (dev, +"binary #%-2d type %s: %s\n" , + i, fw_type_name[bd.header.type], + bd.name); +default : +if (bd.header.info.isp.type >IA_CSS_ACC_STANDALONE ) { +dev_err (dev, +"binary #%2d: invalid firmware type\n" , + i); +return -EINVAL ; + } +break ; + } +if (bi->type == ia_css_sp_firmware) {if (i !=SP_FIRMWARE )return -EINVAL ; err =setup_binary (bi, fw_data, &sh_css_sp_fw, i);if (err)return err; -dev_dbg (dev,"firmware #%d (SP), name %s\n" , i, bd.name); }else {/* All subsequent binaries (including bootloaders) (i>NUM_OF_SPS) are ISP firmware */
Signature · 1 line
2.26.2
PATCH v2 37/41 media: atomisp: allow passing firmware name at modprobe time
In reply to Mauro Carvalho ChehabIt can be useful to be able to test different firmware files at modprobe time, in order to be able to test different variants without much efforts.
--- .../staging/media/atomisp/pci/atomisp_v4l2.c | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +19 -11
@@ -95,6 +95,10 @@ int mipicsi_flag;module_param (mipicsi_flag, int,0644 );MODULE_PARM_DESC (mipicsi_flag,"mipi csi compression predictor algorithm" ); +static char firmware_name[256 ]; +module_param_string (firmware_name, firmware_name,sizeof (firmware_name),0 ); +MODULE_PARM_DESC (firmware_name,"Firmware file name. Allows overriding the default firmware name." ); +/*set to 16x16 since this is the amount of lines and pixels the sensor exports extra. If these are kept at the 10x8 that they were on, in yuv downscaling modes incorrect resolutions where requested to the sensor
@@ -1455,19 +1459,23 @@ atomisp_load_firmware(struct atomisp_device *isp)if (skip_fwload)return NULL ; -if ((isp->media_dev.hw_revision >>ATOMISP_HW_REVISION_SHIFT ) - ==ATOMISP_HW_REVISION_ISP2401 ) - fw_path ="shisp_2401a0_v21.bin" ; +if (firmware_name[0 ] !='\0' ) { + fw_path = firmware_name; + }else { +if ((isp->media_dev.hw_revision >>ATOMISP_HW_REVISION_SHIFT ) + ==ATOMISP_HW_REVISION_ISP2401 ) + fw_path ="shisp_2401a0_v21.bin" ; -if (isp->media_dev.hw_revision == - ((ATOMISP_HW_REVISION_ISP2401_LEGACY <<ATOMISP_HW_REVISION_SHIFT ) - |ATOMISP_HW_STEPPING_A0 )) - fw_path ="shisp_2401a0_legacy_v21.bin" ; +if (isp->media_dev.hw_revision == + ((ATOMISP_HW_REVISION_ISP2401_LEGACY <<ATOMISP_HW_REVISION_SHIFT ) + |ATOMISP_HW_STEPPING_A0 )) + fw_path ="shisp_2401a0_legacy_v21.bin" ; -if (isp->media_dev.hw_revision == - ((ATOMISP_HW_REVISION_ISP2400 <<ATOMISP_HW_REVISION_SHIFT ) - |ATOMISP_HW_STEPPING_B0 )) - fw_path ="shisp_2400b0_v21.bin" ; +if (isp->media_dev.hw_revision == + ((ATOMISP_HW_REVISION_ISP2400 <<ATOMISP_HW_REVISION_SHIFT ) + |ATOMISP_HW_STEPPING_B0 )) + fw_path ="shisp_2400b0_v21.bin" ; + }if (!fw_path) { dev_err(isp->dev, "Unsupported hw_revision 0x%x\n",
Signature · 1 line
2.26.2
PATCH v2 38/41 media: atomisp: add a debug message at hmm free
In reply to Mauro Carvalho ChehabIn order to check if aren't there any memory leaks, let's add a debug print for hmm_free().
--- drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/staging/media/atomisp/pci/hmm/hmm.c +2 -0
@@ -285,6 +285,8 @@ void hmm_free(ia_css_ptr virt) {struct hmm_buffer_object *bo; +dev_dbg (atomisp_dev,"%s: free 0x%08x\n" , __func__, virt); +WARN_ON (!virt); bo =hmm_bo_device_search_start (&bo_device, (unsigned int )virt);
Signature · 1 line
2.26.2
PATCH v2 39/41 media: atomisp: add some debug messages when binaries are used
In reply to Mauro Carvalho ChehabThe ISP firmware logic is complex, as several binaries are contained into a single file.
Print debug messages:
- with a stack dump if binary not found;
- when a firmware is selected.
--- .../atomisp/pci/runtime/binary/src/binary.c | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c +27 -4
@@ -29,6 +29,8 @@#include "sh_css_defs.h" #include "sh_css_legacy.h" +#include "atomisp_internal.h" +#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"
@@ -36,7 +38,6 @@#include "camera/pipe/interface/ia_css_pipe_binarydesc.h" -#include "assert_support.h" #define IMPLIES (a, b) (!(a) || (b))/* A => B */
@@ -1375,9 +1376,8 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,return 0 ; } -int -ia_css_binary_find (struct ia_css_binary_descr *descr, -struct ia_css_binary *binary) { +static int __ia_css_binary_find (struct ia_css_binary_descr *descr, +struct ia_css_binary *binary) {int mode;bool online;bool two_ppc;
@@ -1793,9 +1793,32 @@ ia_css_binary_find(struct ia_css_binary_descr *descr,ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE ,"ia_css_binary_find() leave: return_err=%d\n" , err); +if (!err && xcandidate) +dev_dbg (atomisp_dev, +"Using binary %s (id %d), type %d, mode %d, continuous %s\n" , + xcandidate->blob->name, + xcandidate->sp.id, + xcandidate->type, + xcandidate->sp.pipeline.mode, + xcandidate->sp.enable.continuous ?"true" :"false" ); + +return err; } +int ia_css_binary_find (struct ia_css_binary_descr *descr, +struct ia_css_binary *binary) +{ +int ret =__ia_css_binary_find (descr, binary); + +if (unlikely (ret)) { +dev_dbg (atomisp_dev,"Seeking for binary failed at:" ); +dump_stack (); + } + +return ret; +} +unsigned ia_css_binary_max_vf_width (void ) {
Signature · 1 line
2.26.2
PATCH v2 40/41 media: atomisp: get rid of set_fs() dirty hacks
In reply to Mauro Carvalho ChehabThis file was based on an older version of the V4L2 compat32 code, which had this ugly hack.
Change the code to remove the hack. Yet, the entire compat32 code is currently commented out. So, let's add a FIXME note at the code, as we may need to check if some of the atomisp specific ioctls would require it.
It is not worth to do such checks now, as we may get rid of several of them while cleaning up other things while at staging.
--- drivers/staging/media/atomisp/TODO | 3 + .../atomisp/pci/atomisp_compat_ioctl32.c | 89 ++++++++++--------- 2 files changed, 52 insertions(+), 40 deletions(-)
drivers/staging/media/atomisp/TODO +3 -0
@@ -161,6 +161,9 @@ TODO for this driver until the other work is done, as there will be a lot of code churn until this driver becomes functional again. +16. Fix the compat32 code and remove the comment preventing it to be + called. + Limitations ===========
drivers/staging/media/atomisp/pci/atomisp_compat_ioctl32.c +49 -40
188 lines not on this page · raw message
Signature · 1 line
2.26.2