diff --git a/drivers/amlogic/media/common/v4l_util/Kconfig b/drivers/amlogic/media/common/v4l_util/Kconfig index 5511b627ea43..bbf86618fc6f 100644 --- a/drivers/amlogic/media/common/v4l_util/Kconfig +++ b/drivers/amlogic/media/common/v4l_util/Kconfig @@ -3,7 +3,7 @@ # config AMLOGIC_VIDEOBUF_RESOURCE - bool "Amlogic V4L UTIL Support" + tristate "Amlogic V4L UTIL Support" select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV default n diff --git a/drivers/amlogic/media/video_processor/Makefile b/drivers/amlogic/media/video_processor/Makefile index 354b2478a554..d6db469cbf2c 100644 --- a/drivers/amlogic/media/video_processor/Makefile +++ b/drivers/amlogic/media/video_processor/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_AMLOGIC_V4L_VIDEO) += video_dev/ obj-$(CONFIG_AMLOGIC_V4L_VIDEO2) += video_dev/ obj-$(CONFIG_AMLOGIC_POST_PROCESS_MANAGER) += ppmgr/ obj-$(CONFIG_AMLOGIC_IONVIDEO) += ionvideo/ diff --git a/drivers/amlogic/media/video_processor/ppmgr/ppmgr_drv.c b/drivers/amlogic/media/video_processor/ppmgr/ppmgr_drv.c index 72471596fbf6..352c0adc799e 100644 --- a/drivers/amlogic/media/video_processor/ppmgr/ppmgr_drv.c +++ b/drivers/amlogic/media/video_processor/ppmgr/ppmgr_drv.c @@ -1419,6 +1419,7 @@ void get_ppmgr_buf_info(unsigned int *start, unsigned int *size) *start = ppmgr_device.buffer_start; *size = ppmgr_device.buffer_size; } +EXPORT_SYMBOL(get_ppmgr_buf_info); static int ppmgr_open(struct inode *inode, struct file *file) { diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c index 78a398be67ba..86de3ae9e86d 100644 --- a/drivers/amlogic/media/video_sink/video.c +++ b/drivers/amlogic/media/video_sink/video.c @@ -184,6 +184,7 @@ bool platform_type = 1; int bit_depth_flag = 8; bool omx_secret_mode; +EXPORT_SYMBOL(omx_secret_mode); #define DEBUG_FLAG_FFPLAY (1<<0) #define DEBUG_FLAG_CALC_PTS_INC (1<<1) diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c b/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c index 3e7a47f7a287..a09c3eeb974d 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c @@ -1928,6 +1928,7 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k) goto error; } if (p->frame_base_video_path == FRAME_BASE_PATH_IONVIDEO) { +#ifdef CONFIG_AMLOGIC_IONVIDEO #if 1 r = ionvideo_assign_map(&vdec->vf_receiver_name, &vdec->vf_receiver_inst); @@ -1953,6 +1954,7 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k) goto error; } +#endif snprintf(vdec->vfm_map_chain, VDEC_MAP_NAME_SIZE, "%s %s", vdec->vf_provider_name, vdec->vf_receiver_name);