From 3acd0397282b207e2432c36ccae44bc574f1651c Mon Sep 17 00:00:00 2001 From: Pengcheng Chen Date: Tue, 31 Dec 2019 16:56:22 +0800 Subject: [PATCH] osd: fix osd v/h filter mode not update [1/1] PD#SWPL-19237 Problem: osd v/h filter not update Solution: update osd v/h filter mode correctly Verify: ac214 Change-Id: I8f84faed59f269e61d55073b1f24af5d766cfd80 Signed-off-by: Pengcheng Chen --- drivers/amlogic/media/osd/osd_hw.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 573d6a34f768..bc7572087c7e 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -8557,7 +8557,6 @@ static int osd_setting_order(u32 output_index) struct layer_blend_reg_s *blend_reg; struct hw_osd_blending_s *blending; u32 osd_count = osd_hw.osd_meson_dev.viu1_osd_count; - bool update = false; int line1; int line2; int active_begin_line; @@ -8662,13 +8661,12 @@ static int osd_setting_order(u32 output_index) osd_hw.reg[DISP_GEOMETRY].update_func(i); osd_hw.reg[OSD_GBL_ALPHA].update_func(i); osd_hw.reg[DISP_OSD_REVERSE].update_func(i); + osd_set_scan_mode(i); osd_hw.reg[OSD_FREESCALE_COEF].update_func(i); - if (update || osd_update_window_axis) { - osd_set_scan_mode(i); - osd_update_window_axis = false; - } osd_hw.reg[DISP_FREESCALE_ENABLE] .update_func(i); + if (osd_update_window_axis) + osd_update_window_axis = false; if (osd_hw.premult_en[i] && !osd_hw.blend_bypass) VSYNCOSD_WR_MPEG_REG_BITS( osd_reg->osd_mali_unpack_ctrl, 0x1, 28, 1);