From e7e934364a8bd8e3dc953e9ecc3dff7269ae9a9b Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Fri, 18 Jan 2019 03:25:21 +0800 Subject: [PATCH] vpp: add osd and video zorder control [2/6] PD#SWPL-85 Problem: Upper layer need control osd and video layer zorder Solution: 1.Add video layer zorder interface by sysfs and ioctl 2.Switch the osd and video layer order in vsync Verify: Verify on U212 Change-Id: Ic50e81784b865cc57e4ab9a63d74806f7a8721cf Signed-off-by: Brian Zhu Conflicts: drivers/amlogic/media/video_sink/video.c include/linux/amlogic/media/video_sink/vpp.h --- drivers/amlogic/media/video_sink/video.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c index 42328cdcf26a..1d2300c77497 100644 --- a/drivers/amlogic/media/video_sink/video.c +++ b/drivers/amlogic/media/video_sink/video.c @@ -456,6 +456,8 @@ static u32 reference_zorder = 128; static s32 black_threshold_width = 20; static s32 black_threshold_height = 30; +static u32 reference_zorder = 128; + #define MAX_ZOOM_RATIO 300 #define VPP_PREBLEND_VD_V_END_LIMIT 2304