From eff6776e7be62aeff760e37df1d554fd65a477a2 Mon Sep 17 00:00:00 2001 From: Brian Zhu Date: Fri, 31 Aug 2018 17:28:07 +0800 Subject: [PATCH] osd: add osd reset logic for chip txl when hdr PD#172201: osd: add osd reset logic for chip txl when hdr Change-Id: Iaf3f723cb3c515570c500614e8f720a72d5d8758 Signed-off-by: Brian Zhu --- drivers/amlogic/media/osd/osd_hw.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index faf2f28..06d34a3 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -1477,7 +1477,6 @@ static u32 osd_get_hw_reset_flag(void) hw_reset_flag |= HW_RESET_AFBCD_REGS; break; case __MESON_CPU_MAJOR_ID_GXM: - case __MESON_CPU_MAJOR_ID_TXLX: /* same bit, but gxm only reset hardware, not top reg*/ if (osd_hw.osd_afbcd[OSD1].enable) hw_reset_flag |= HW_RESET_AFBCD_HARDWARE; @@ -7282,7 +7281,7 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe, else if (osd_meson->cpu_id == __MESON_CPU_MAJOR_ID_GXM) backup_regs_init(HW_RESET_OSD1_REGS); else if ((osd_meson->cpu_id >= __MESON_CPU_MAJOR_ID_GXL) - && (osd_meson->cpu_id < __MESON_CPU_MAJOR_ID_TXL)) + && (osd_meson->cpu_id <= __MESON_CPU_MAJOR_ID_TXL)) backup_regs_init(HW_RESET_OSD1_REGS); else if ((osd_meson->cpu_id == __MESON_CPU_MAJOR_ID_G12A) || (osd_meson->cpu_id == __MESON_CPU_MAJOR_ID_G12B)) -- 2.7.4