From 69821db360e24bf0606cc846ae397538f2638adc Mon Sep 17 00:00:00 2001 From: Jian Cao Date: Tue, 25 Jun 2019 21:04:05 +0800 Subject: [PATCH] osd: modify VIU_MISC_CTRL1 conditions [1/1] PD#SWPL-5522 Problem: S912 display S912 Android P support for osd Solution: modify VIU_MISC_CTRL1 for gxm Verify: verified on gxm-q201 Change-Id: I2bccfb3fe03864e55d41ab4f9ecf4db68d9dfbea Signed-off-by: Jian Cao --- drivers/amlogic/media/osd/osd_hw.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 0b947a8..8d6031c 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -5416,6 +5416,11 @@ static void osd_update_enable(u32 index) } VSYNCOSD_WR_MPEG_REG_BITS( osd_reg->osd_ctrl_stat2, 1, 15, 1); + if ((VSYNCOSD_RD_MPEG_REG(VIU_MISC_CTRL1) & + (0xff << 8)) != 0x9000) { + VSYNCOSD_WR_MPEG_REG_BITS( + VIU_MISC_CTRL1, 0x90, 8, 8); + } } else { if (osd_afbc_dec_enable) { VSYNCOSD_WR_MPEG_REG( @@ -5425,11 +5430,6 @@ static void osd_update_enable(u32 index) VSYNCOSD_WR_MPEG_REG_BITS( osd_reg->osd_ctrl_stat2, 0, 15, 1); } - if ((VSYNCOSD_RD_MPEG_REG(VIU_MISC_CTRL1) & - (0xff << 8)) != 0x9000) { - VSYNCOSD_WR_MPEG_REG_BITS( - VIU_MISC_CTRL1, 0x90, 8, 8); - } } else if (osd_hw.osd_meson_dev.afbc_type == MALI_AFBC) { if ((osd_hw.osd_afbcd[index].enable == ENABLE) -- 2.7.4