shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

osd: add osd reset logic for chip txl when hdr

Browse Source 
PD#172201: osd: add osd reset logic for chip txl when hdr

Change-Id: Iaf3f723cb3c515570c500614e8f720a72d5d8758
Signed-off-by: Brian Zhu <brian.zhu@amlogic.com>
This commit is contained in:
Brian Zhu
2018-08-31 17:28:07 +08:00
committed by Jianxin Pan
parent 16f3ec80a1
commit eff6776e7b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/amlogic/media/osd/osd_hw.c
View File

@@ -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))