From da29ea311227dc2d0e4e4a625383c67d38314d59 Mon Sep 17 00:00:00 2001 From: yao liu Date: Fri, 12 Jul 2019 05:33:50 -0400 Subject: [PATCH] osd: add osd blend bypass function for tm2 [2/3] PD#SWPL-6631 Problem: dv certification need osd blend bypass Solution: add osd blend bypass function Verify: verified on tm2 t96e2 Change-Id: I91ba9c622aacc7bc9ad657105fd5e53a3cee595b Signed-off-by: yao liu --- drivers/amlogic/media/osd/osd_hw.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index a482459abcd5..0fafd13d4eac 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -7830,10 +7830,14 @@ static void osd_set_freescale_new(u32 index, return; } output_index = get_output_device_id(index); - osd_hw.free_scale_enable[index] = 0x10001; - osd_hw.free_scale[index].h_enable = 1; - osd_hw.free_scale[index].v_enable = 1; - osd_hw.free_scale_mode[index] = 1; + + if (!(osd_hw.osd_display_debug && + !osd_hw.free_scale_enable[index])) { + osd_hw.free_scale_enable[index] = 0x10001; + osd_hw.free_scale[index].h_enable = 1; + osd_hw.free_scale[index].v_enable = 1; + osd_hw.free_scale_mode[index] = 1; + } osd_hw.free_src_data[index].x_start = osd_hw.src_data[index].x;