From aa41df845eaf23d5eae19f019bd8cc04ba58d773 Mon Sep 17 00:00:00 2001 From: Jian Cao Date: Fri, 30 Nov 2018 15:55:52 +0800 Subject: [PATCH] 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 Conflicts: drivers/amlogic/media/osd/osd_hw.c --- drivers/amlogic/media/osd/osd_hw.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 8cfb51fd37a4..1924bfa57ef4 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -2442,7 +2442,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 != OSD4)) { + 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;