From: pengcheng chen <pengcheng.chen@amlogic.com>
Date: Wed, 31 Oct 2018 11:32:59 +0000 (+0800)
Subject: osd: meson-hwc screen always blank [1/1]
X-Git-Tag: khadas-vims-v0.9.6-release~1157
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fe7cbd416342560e1e8db7f57ea329416f48ee6;p=platform%2Fkernel%2Flinux-amlogic.git

osd: meson-hwc screen always blank [1/1]

PD#163001

Problem:
TL1 code merged caused meson-hwc screen always blank

Solution:
fix meson-hwc screen always blank

Verify:
verified in u200 board

Change-Id: I0a9371b42546e2713e6dcb926e7c94598e29da1d
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
---

diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c
index 93e5ebd..a6903eb 100644
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -7215,7 +7215,11 @@ static void set_blend_reg(struct layer_blend_reg_s *blend_reg)
 {
 	int i;
 	u32 reg_offset = 2;
+#ifdef OSD_BLEND_SHIFT_WORKAROUND
+	u32 osd_count = OSD_BLEND_LAYERS;
+#else
 	u32 osd_count = osd_hw.osd_meson_dev.viu1_osd_count;
+#endif
 
 	if (!blend_reg)
 		return;