From e87ae0b3d17c5f780b4936839b76bdc9fcafe6ab Mon Sep 17 00:00:00 2001 From: Pengcheng Chen Date: Sat, 12 Oct 2019 17:25:45 +0800 Subject: [PATCH] osd: set gxm afbc hardware reset correctly [1/1] PD#SWPL-13524 Problem: gxm afbc hardware reset is not set. Solution: set gxm afbc hardware reset correctly Verify: Verified on S912 Change-Id: Iccde705fe408852671d367f1b3853a7055bdf050 Signed-off-by: Pengcheng Chen --- drivers/amlogic/media/osd/osd_hw.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/amlogic/media/osd/osd_hw.c b/drivers/amlogic/media/osd/osd_hw.c index 05f7278..affbc2f 100644 --- a/drivers/amlogic/media/osd/osd_hw.c +++ b/drivers/amlogic/media/osd/osd_hw.c @@ -2080,7 +2080,8 @@ void osd_hw_reset(void) && !(backup_mask & HW_RESET_OSD1_REGS)) reset_bit &= ~HW_RESET_OSD1_REGS; - if ((osd_hw.osd_meson_dev.afbc_type == MESON_AFBC) + if (((get_cpu_type() == MESON_CPU_MAJOR_ID_GXTVBB) && + (osd_hw.osd_meson_dev.afbc_type == MESON_AFBC)) && (reset_bit & HW_RESET_AFBCD_REGS) && !(backup_mask & HW_RESET_AFBCD_REGS)) reset_bit &= ~HW_RESET_AFBCD_REGS; -- 2.7.4