From: Jian Cao <jian.cao@amlogic.com>
Date: Fri, 30 Nov 2018 07:55:52 +0000 (+0800)
Subject: osd: osd: recovey mode always blank [1/1]
X-Git-Tag: hardkernel-4.9.236-104~2116
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c1269ec8484555e4dce5a8d5c9617797bcd5010;p=platform%2Fkernel%2Flinux-amlogic.git

osd: osd: recovey mode always blank [1/1]

PD#TV-1287

Problem:
recovey mode always blank

Solution:
set right condition to enable free_scale

Verify:
verified on P321 board

Change-Id: I2f70b9c5436b30156f157a3297a11a2ef1cfec67
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 f0a3a2cb..16c6a83 100644
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -2608,8 +2608,10 @@ static void osd_set_free_scale_enable_mode1(u32 index, u32 enable)
 
 void osd_set_free_scale_enable_hw(u32 index, u32 enable)
 {
-	if (osd_hw.free_scale_mode[index] &&
-		(index != osd_hw.osd_meson_dev.viu2_index)) {
+	if (osd_hw.free_scale_mode[index]
+		&& (osd_hw.osd_meson_dev.has_viu2 ?
+			((index != osd_hw.osd_meson_dev.viu2_index) ?
+				1 : 0) : 1)) {
 		osd_set_free_scale_enable_mode1(index, enable);
 		if (osd_hw.osd_meson_dev.osd_ver == OSD_NORMAL) {
 			u32 height_dst, height_src;