shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: modify VIU_MISC_CTRL1 conditions [1/1]

Browse Source 
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 <jian.cao@amlogic.com>
This commit is contained in:
Jian Cao
2019-06-25 21:04:05 +08:00
committed by Luan Yuan
parent 3227c3565d
commit 86ac09ecff
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -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)