osd: add osd blend bypass function for tm2 [2/3]
authoryao liu <yao.liu@amlogic.com>
Fri, 12 Jul 2019 09:33:50 +0000 (05:33 -0400)
committerTao Zeng <tao.zeng@amlogic.com>
Thu, 18 Jul 2019 05:26:17 +0000 (22:26 -0700)
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 <yao.liu@amlogic.com>
drivers/amlogic/media/osd/osd_hw.c

index 5c96e28..d914331 100644 (file)
@@ -7787,10 +7787,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;