osd: osd: recovey mode always blank [1/1]
authorJian Cao <jian.cao@amlogic.com>
Fri, 30 Nov 2018 07:55:52 +0000 (15:55 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Fri, 30 Nov 2018 11:57:20 +0000 (03:57 -0800)
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>
drivers/amlogic/media/osd/osd_hw.c

index f0a3a2c..16c6a83 100644 (file)
@@ -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;