From: Jian Cao <jian.cao@amlogic.com>
Date: Tue, 25 Jun 2019 13:04:05 +0000 (+0800)
Subject: osd: modify VIU_MISC_CTRL1 conditions [1/1]
X-Git-Tag: khadas-vims-v0.9.6-release~283
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69821db360e24bf0606cc846ae397538f2638adc;p=platform%2Fkernel%2Flinux-amlogic.git

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 <jian.cao@amlogic.com>
---

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)