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: updated vinfo when it is not null every frame

Browse Source 
PD#167032: osd: updated vinfo when it is not null every frame

Change-Id: If914fc39d014e2a1c2db564d427292977edc7530
Signed-off-by: pengcheng chen <pengcheng.chen@amlogic.com>
This commit is contained in:
pengcheng chen
2018-05-24 14:43:55 +08:00
committed by Yixun Lan
parent 1708210d46
commit 278ced8afb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6418,15 +6418,15 @@ static void osd_setting_old_hwc(void)
int osd_setting_blend(void)
{
int ret;
const struct vinfo_s *vinfo;
struct vinfo_s *vinfo;
vinfo = get_current_vinfo();
if (vinfo) {
osd_hw.vinfo_width = vinfo->width;
osd_hw.vinfo_height = vinfo->height;
} else {
osd_hw.vinfo_width = 1920;
osd_hw.vinfo_height = 1080;
if ((strcmp(vinfo->name, "invalid")) &&
(strcmp(vinfo->name, "null"))) {
osd_hw.vinfo_width = vinfo->width;
osd_hw.vinfo_height = vinfo->height;
}
}
if (osd_hw.osd_meson_dev.osd_ver < OSD_HIGH_ONE)
@@ -7072,6 +7072,8 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe,
//osd_hw.osd_blend_mode = OSD_BLEND_NONE;
osd_hw.background_w = 1920;
osd_hw.background_h = 1080;
osd_hw.vinfo_width = 1920;
osd_hw.vinfo_height = 1080;
for (idx = 0; idx < osd_hw.osd_meson_dev.osd_count; idx++) {
osd_hw.premult_en[idx] = 0;
osd_hw.osd_afbcd[idx].format = COLOR_INDEX_32_ABGR;