osd: meson-hwc screen always blank [1/1]
authorpengcheng chen <pengcheng.chen@amlogic.com>
Wed, 31 Oct 2018 11:32:59 +0000 (19:32 +0800)
committerTao Zeng <tao.zeng@amlogic.com>
Mon, 12 Nov 2018 03:22:30 +0000 (20:22 -0700)
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>
drivers/amlogic/media/osd/osd_hw.c

index 93e5ebd..a6903eb 100644 (file)
@@ -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;