From 54d3171e9e79d138283d200156eb0ae6a4f06188 Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Thu, 12 Apr 2018 16:21:36 +0800 Subject: [PATCH] video: change the correct config define for notify amvideo PD#163615: video: change the correct config define for notify amvideo Change-Id: I57a049060e355b396591003463454292e10ad164 Signed-off-by: Brian Zhu --- drivers/amlogic/media/osd/osd_hw.c | 2 +- include/linux/amlogic/media/video_sink/video.h | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 8414e25a0e93..1fb087d32557 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -1230,7 +1230,7 @@ static int notify_to_amvideo(void) "osd notify_to_amvideo vpp misc:0x%08x, mask:0x%08x\n", para[0], para[1]); if (osd_hw.hw_rdma_en) { -#ifdef CONFIG_AMLOGIC_VIDEO +#ifdef CONFIG_AMLOGIC_MEDIA_VIDEO amvideo_notifier_call_chain( AMVIDEO_UPDATE_OSD_MODE, (void *)¶[0]); diff --git a/include/linux/amlogic/media/video_sink/video.h b/include/linux/amlogic/media/video_sink/video.h index 17c57fc73449..2d159229a729 100644 --- a/include/linux/amlogic/media/video_sink/video.h +++ b/include/linux/amlogic/media/video_sink/video.h @@ -263,10 +263,17 @@ u32 get_blackout_policy(void); int get_video0_frame_info(struct vframe_s *vf); #define AMVIDEO_UPDATE_OSD_MODE 0x00000001 +#ifdef CONFIG_AMLOGIC_MEDIA_VIDEO +int amvideo_notifier_call_chain(unsigned long val, void *v); +#else +static inline int amvideo_notifier_call_chain(unsigned long val, void *v) +{ + return 0; +} +#endif int query_video_status(int type, int *value); int get_video0_frame_info(struct vframe_s *vf); -int amvideo_notifier_call_chain(unsigned long val, void *v); struct device *get_video_device(void); extern unsigned int DI_POST_REG_RD(unsigned int addr); extern int DI_POST_WR_REG_BITS(u32 adr, u32 val, u32 start, u32 len);