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

osd: fix osd suspend fail issue

Browse Source 
PD#164508: osd: fix osd suspend fail issue

Change-Id: I30c9efd77748a795b341ad4bedafa5f379ae52f1
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
This commit is contained in:
pengcheng chen
2018-04-18 15:53:37 +08:00
committed by Yixun Lan
parent 7f59a14a8f
commit 54050fcd54
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/amlogic/media/osd/osd.h
View File

@@ -504,6 +504,8 @@ struct hw_para_s {
u32 enable[HW_OSD_COUNT];
u32 powered[HW_OSD_COUNT];
u32 reg_status_save;
u32 reg_status_save1;
u32 reg_status_save2;
#ifdef FIQ_VSYNC
bridge_item_t fiq_handle_item;
#endif

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

@@ -6239,6 +6239,17 @@ void osd_suspend_hw(void)
notify_to_amvideo();
osd_reg_clr_mask(VPP_MISC, OSD_RELATIVE_BITS);
/* VSYNCOSD_CLR_MPEG_REG_MASK(VPP_MISC, OSD_RELATIVE_BITS); */
} else {
osd_hw.reg_status_save =
osd_reg_read(VIU_OSD_BLEND_CTRL);
osd_hw.reg_status_save1 =
osd_reg_read(OSD1_BLEND_SRC_CTRL);
osd_hw.reg_status_save2 =
osd_reg_read(OSD2_BLEND_SRC_CTRL);
osd_reg_clr_mask(VIU_OSD_BLEND_CTRL, 0xf0000);
osd_reg_clr_mask(OSD1_BLEND_SRC_CTRL, 0xf0f);
osd_reg_clr_mask(OSD2_BLEND_SRC_CTRL, 0xf0f);
}
osd_log_info("osd_suspended\n");
}
@@ -6270,6 +6281,13 @@ void osd_resume_hw(void)
1 << 0);
}
notify_to_amvideo();
} else {
osd_reg_set_mask(VIU_OSD_BLEND_CTRL,
osd_hw.reg_status_save);
osd_reg_set_mask(OSD1_BLEND_SRC_CTRL,
osd_hw.reg_status_save1);
osd_reg_set_mask(OSD2_BLEND_SRC_CTRL,
osd_hw.reg_status_save2);
}
osd_log_info("osd_resumed\n");
}