From 171dd19f8982d2c86a4a3ee747aa0418edb1ac89 Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Sat, 3 Feb 2018 23:29:41 +0800 Subject: [PATCH] video: disable blend ctrl when video off PD#156734: video: disable blend ctrl when video off Change-Id: I31bc906212dde34dd684ba3953ae8ada59107734 Signed-off-by: Brian Zhu --- drivers/amlogic/media/video_sink/video.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/amlogic/media/video_sink/video.c b/drivers/amlogic/media/video_sink/video.c index 43da56613ea7..99f41e89497f 100644 --- a/drivers/amlogic/media/video_sink/video.c +++ b/drivers/amlogic/media/video_sink/video.c @@ -5603,6 +5603,12 @@ SET_FILTER: VD1_IF0_GEN_REG + cur_dev->viu_off, 0); VSYNC_WR_MPEG_REG( VD2_IF0_GEN_REG + cur_dev->viu_off, 0); + if (!legacy_vpp) { + VSYNC_WR_MPEG_REG( + VD1_BLEND_SRC_CTRL + cur_dev->vpp_off, 0); + VSYNC_WR_MPEG_REG( + VD2_BLEND_SRC_CTRL + cur_dev->vpp_off, 0); + } } #ifdef CONFIG_AMLOGIC_MEDIA_VSYNC_RDMA @@ -8933,6 +8939,11 @@ static int __init video_early_init(void) WRITE_VCBUS_REG(VPP_SRSHARP0_CTRL, 0); WRITE_VCBUS_REG(VPP_SRSHARP1_CTRL, 0); + /* Temp force set dmc */ + if (!legacy_vpp) + WRITE_DMCREG( + DMC_AM0_CHAN_CTRL, + 0x8ff403cf); return 0; }