From 46dbc1ffc8fa4aeec6fc1f2d2c33dd2e6abad7ca Mon Sep 17 00:00:00 2001 From: Pengcheng Chen Date: Wed, 4 Mar 2020 10:27:56 +0800 Subject: [PATCH] osd: osd rdma recovery table init err [1/1] PD#SWPL-21602 Problem: some osd rdma regs not recovery success Solution: osd rdma recovery table init correctly Verify: verify by u212, tl1 Change-Id: I77915704c007639338bfc76ffa46f1bd8839afbd Signed-off-by: Pengcheng Chen --- drivers/amlogic/media/osd/osd_backup.c | 28 +++++++++++--------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/amlogic/media/osd/osd_backup.c b/drivers/amlogic/media/osd/osd_backup.c index 8209c6e206b8..d052bed4c29c 100644 --- a/drivers/amlogic/media/osd/osd_backup.c +++ b/drivers/amlogic/media/osd/osd_backup.c @@ -764,14 +764,12 @@ static void recovery_regs_init_g12a(void) gRecovery[i].table = (struct reg_item *)&osd12_recovery_table_g12a[0]; - if ((osd_hw.osd_meson_dev.viu1_osd_count - 1) == DEV_OSD3) { - i++; - gRecovery[i].base_addr = VIU_OSD3_CTRL_STAT; - gRecovery[i].size = sizeof(osd3_recovery_table_g12a) - / sizeof(struct reg_item); - gRecovery[i].table = - (struct reg_item *)&osd3_recovery_table_g12a[0]; - } + i++; + gRecovery[i].base_addr = VIU_OSD3_CTRL_STAT; + gRecovery[i].size = sizeof(osd3_recovery_table_g12a) + / sizeof(struct reg_item); + gRecovery[i].table = + (struct reg_item *)&osd3_recovery_table_g12a[0]; i++; gRecovery[i].base_addr = VPP_OSD_VSC_PHASE_STEP; @@ -787,14 +785,12 @@ static void recovery_regs_init_g12a(void) gRecovery[i].table = (struct reg_item *)&osd2_sc_recovery_table_g12a[0]; - if ((osd_hw.osd_meson_dev.viu1_osd_count - 1) == DEV_OSD3) { - i++; - gRecovery[i].base_addr = OSD34_SCALE_COEF_IDX; - gRecovery[i].size = sizeof(osd3_sc_recovery_table_g12a) - / sizeof(struct reg_item); - gRecovery[i].table = - (struct reg_item *)&osd3_sc_recovery_table_g12a[0]; - } + i++; + gRecovery[i].base_addr = OSD34_SCALE_COEF_IDX; + gRecovery[i].size = sizeof(osd3_sc_recovery_table_g12a) + / sizeof(struct reg_item); + gRecovery[i].table = + (struct reg_item *)&osd3_sc_recovery_table_g12a[0]; i++; gRecovery[i].base_addr = VPU_MAFBC_BLOCK_ID;