summaryrefslogtreecommitdiff
authorPengcheng Chen <pengcheng.chen@amlogic.com>2019-10-12 09:25:45 (GMT)
committer Jianxin Pan <jianxin.pan@amlogic.com>2019-10-16 02:59:06 (GMT)
commit2730374b2100df0f34f3713d31efb9bb3c7cd676 (patch)
treefe2b81becbbfde730cf39d4c99287ef1243f3b43
parentb2fa5a5c2f12ebf63d4d5a24c75502c38b1f51b4 (diff)
downloadcommon-2730374b2100df0f34f3713d31efb9bb3c7cd676.zip
common-2730374b2100df0f34f3713d31efb9bb3c7cd676.tar.gz
common-2730374b2100df0f34f3713d31efb9bb3c7cd676.tar.bz2
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 <pengcheng.chen@amlogic.com>
Diffstat
-rw-r--r--drivers/amlogic/media/osd/osd_hw.c3
1 files changed, 2 insertions, 1 deletions
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;