vpp: add video disable for g12 [1/1]
authorDezhi Kong <dezhi.kong@amlogic.com>
Fri, 19 Oct 2018 06:52:15 +0000 (14:52 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Thu, 25 Oct 2018 06:44:58 +0000 (23:44 -0700)
PD#174579

Problem:
osd shake once after quit local video play

Solution:
add video disable in advance for g12

Verify:
u211

Change-Id: Ic43693b25cf7bf8be24801a22ad36ac09c84a475
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>
drivers/amlogic/media/video_sink/video.c

index 1591bf2..a0e5167 100644 (file)
@@ -353,6 +353,10 @@ static u32 hdmiin_frame_check_cnt;
                CLEAR_VCBUS_REG_MASK(VPP_MISC + cur_dev->vpp_off, \
                VPP_VD1_PREBLEND | VPP_VD2_PREBLEND|\
                VPP_VD2_POSTBLEND | VPP_VD1_POSTBLEND); \
+               if (!legacy_vpp) { \
+                       WRITE_VCBUS_REG( \
+                       VD1_BLEND_SRC_CTRL + cur_dev->vpp_off, 0); \
+               } \
                WRITE_VCBUS_REG(AFBC_ENABLE, 0);\
                VIDEO_LAYER_OFF(); \
                VD1_MEM_POWER_OFF(); \
@@ -368,6 +372,10 @@ static u32 hdmiin_frame_check_cnt;
                CLEAR_VCBUS_REG_MASK(VPP_MISC + cur_dev->vpp_off, \
                VPP_VD1_PREBLEND | VPP_VD2_PREBLEND|\
                VPP_VD2_POSTBLEND | VPP_VD1_POSTBLEND); \
+               if (!legacy_vpp) { \
+                       WRITE_VCBUS_REG( \
+                       VD1_BLEND_SRC_CTRL + cur_dev->vpp_off, 0); \
+               } \
                WRITE_VCBUS_REG(AFBC_ENABLE, 0);\
                if (debug_flag & DEBUG_FLAG_BLACKOUT) {  \
                        pr_info("DisableVideoLayer_NoDelay()\n"); \