osd: osd: reserve vs_ctrl bit for VPP [1/1]

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>

diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c
index b6a8c9b..efebb09 100644 (file)
--- a/drivers/amlogic/media/osd/osd_hw.c
+++ b/drivers/amlogic/media/osd/osd_hw.c
@@ -8449,7 +8449,7 @@ void osd_init_hw(u32 logo_loaded, u32 osd_probe,
                /* init vpu fifo control register */
                data32 = osd_reg_read(VPP_OFIFO_SIZE);
                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 + 1;
                } else