media: merged code from 43177e6a on the amlogic-3.14-dev
authorNanxin Qin <nanxin.qin@amlogic.com>
Mon, 19 Jun 2017 07:34:01 +0000 (15:34 +0800)
committerNanxin Qin <nanxin.qin@amlogic.com>
Mon, 21 Aug 2017 12:30:19 +0000 (20:30 +0800)
commit0a5e4639e409e29ee8172309dbaa756a2b5a4679
treea219e91805bee79f4593fc52804876a635ac9a9e
parent2ea937e0a6642a1f429e5dcdc8f2941a60e81b67
media: merged code from 43177e6a on the amlogic-3.14-dev

PD#146152: merged code from 43177e6a on the amlogic-3.14-dev

1. support for multi-instance features
2. fixed in multi-instance codec_mm memory bugs and added some
debugging information
3. optimization of vfm problems

Change-Id: I43ba9d4894ae71d53c158df667490030735b9e1e
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
Signed-off-by: KeLe Bai <kele.bai@amlogic.com>
78 files changed:
MAINTAINERS
arch/arm64/configs/meson64_defconfig
drivers/amlogic/media/Kconfig
drivers/amlogic/media/Makefile
drivers/amlogic/media/common/arch/registers/register_map.c
drivers/amlogic/media/common/arch/registers/register_ops.c
drivers/amlogic/media/common/arch/registers/register_ops_m8.c
drivers/amlogic/media/common/canvas/canvas.c
drivers/amlogic/media/common/canvas/canvas_mgr.c
drivers/amlogic/media/common/codec_mm/Makefile
drivers/amlogic/media/common/codec_mm/codec_mm.c
drivers/amlogic/media/common/codec_mm/codec_mm_priv.h
drivers/amlogic/media/common/codec_mm/codec_mm_scatter.c
drivers/amlogic/media/common/codec_mm/codec_mm_scatter_priv.h
drivers/amlogic/media/common/codec_mm/configs/Makefile [new file with mode: 0644]
drivers/amlogic/media/common/codec_mm/configs/configs.c [new file with mode: 0644]
drivers/amlogic/media/common/codec_mm/configs/configs_module.c [new file with mode: 0644]
drivers/amlogic/media/common/codec_mm/configs/configs_priv.h [new file with mode: 0644]
drivers/amlogic/media/common/codec_mm/configs/configs_test.c [new file with mode: 0644]
drivers/amlogic/media/common/ge2d/ge2d_hw.c
drivers/amlogic/media/common/rdma/Makefile
drivers/amlogic/media/common/rdma/rdma.c
drivers/amlogic/media/common/rdma/rdma_mgr.c
drivers/amlogic/media/common/vfm/vfm.c
drivers/amlogic/media/common/vfm/vfm.h
drivers/amlogic/media/common/vfm/vframe_provider.c
drivers/amlogic/media/common/vfm/vframe_receiver.c
drivers/amlogic/media/common/vfm/vftrace.c
drivers/amlogic/media/deinterlace/deinterlace.c
drivers/amlogic/media/deinterlace/deinterlace.h
drivers/amlogic/media/frame_sync/ptsserv.c
drivers/amlogic/media/frame_sync/timestamp.c
drivers/amlogic/media/frame_sync/tsync.c
drivers/amlogic/media/frame_sync/tsync_pcr.c
drivers/amlogic/media/video_processor/ionvideo/ionvideo.c
drivers/amlogic/media/video_processor/video_dev/amlvideo.c
drivers/amlogic/media/video_processor/video_dev/amlvideo.h
drivers/amlogic/media/video_processor/video_dev/amlvideo2.c
drivers/amlogic/media/video_sink/Kconfig
drivers/amlogic/media/video_sink/amvideocap_priv.h [new file with mode: 0644]
drivers/amlogic/media/video_sink/video.c
drivers/amlogic/media/video_sink/video_keeper.c
drivers/amlogic/media/video_sink/video_priv.h
drivers/amlogic/media/video_sink/vpp.c
drivers/amlogic/wifi/wifi_dt.c
include/linux/amlogic/cpu_version.h
include/linux/amlogic/major.h
include/linux/amlogic/media/canvas/canvas.h
include/linux/amlogic/media/canvas/canvas_mgr.h
include/linux/amlogic/media/codec_mm/codec_mm.h
include/linux/amlogic/media/codec_mm/codec_mm_scatter.h
include/linux/amlogic/media/codec_mm/configs.h [new file with mode: 0644]
include/linux/amlogic/media/codec_mm/configs_api.h [new file with mode: 0644]
include/linux/amlogic/media/frame_sync/ptsserv.h
include/linux/amlogic/media/frame_sync/tsync.h
include/linux/amlogic/media/registers/register_map.h
include/linux/amlogic/media/registers/register_ops.h
include/linux/amlogic/media/registers/regs/aiu_regs.h
include/linux/amlogic/media/registers/regs/demux_regs.h
include/linux/amlogic/media/registers/regs/dos_regs.h
include/linux/amlogic/media/registers/regs/hevc_regs.h
include/linux/amlogic/media/registers/regs/parser_regs.h
include/linux/amlogic/media/registers/regs/sys_regs.h
include/linux/amlogic/media/registers/regs/vdin_regs.h
include/linux/amlogic/media/registers/regs/viu_regs.h
include/linux/amlogic/media/registers/regs/vpp_regs.h
include/linux/amlogic/media/tvin/tvin.h [new file with mode: 0644]
include/linux/amlogic/media/tvin/tvin_v4l2.h [new file with mode: 0644]
include/linux/amlogic/media/utils/aformat.h
include/linux/amlogic/media/utils/amports_config.h
include/linux/amlogic/media/utils/amstream.h
include/linux/amlogic/media/utils/vdec_reg.h
include/linux/amlogic/media/vfm/vframe.h
include/linux/amlogic/media/vfm/vframe_provider.h
include/linux/amlogic/media/video_sink/amvideocap.h [new file with mode: 0644]
include/linux/amlogic/media/video_sink/ionvideo_ext.h
include/linux/amlogic/media/video_sink/video.h
include/linux/amlogic/media/video_sink/vpp.h