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: osd: reserve vs_ctrl bit for VPP [1/1]

Browse Source 
PD#172587

Problem:
reserve vs_ctrl bit for VPP

Solution:
Avoid operating VPP_OFIFO_SIZE bit19 on OSD code

Verify:
verified on t962x2_x301

Change-Id: Ic450d6f64e2349d97d02f0802058b4031564fea4
Signed-off-by: Jian Cao <jian.cao@amlogic.com>
This commit is contained in:
Jian Cao
2018-11-20 10:30:25 +08:00
committed by Jianxin Pan
parent 40bfe9715a
commit 3be570bc03
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8449,7 +8449,7 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe,
/* init vpu fifo control register */ /* init vpu fifo control register */
data32 = osd_reg_read(VPP_OFIFO_SIZE); data32 = osd_reg_read(VPP_OFIFO_SIZE);
if (osd_hw.osd_meson_dev.osd_ver >= OSD_HIGH_ONE) { if (osd_hw.osd_meson_dev.osd_ver >= OSD_HIGH_ONE) {
data32 = 0; /* reset value 0xfff0fff */ data32 &= ~((0xfff << 20) | 0x3fff);
data32 |= (osd_hw.osd_meson_dev.vpp_fifo_len) << 20; data32 |= (osd_hw.osd_meson_dev.vpp_fifo_len) << 20;
data32 |= osd_hw.osd_meson_dev.vpp_fifo_len + 1; data32 |= osd_hw.osd_meson_dev.vpp_fifo_len + 1;
} else } else