di: play 1080i timing always print di err[1/1]

PD#SWPL-5807

Problem:
1080i always print di err,modify di pre idle register
define are wrong

Solution:
1.modify register define according g12a

Verify:
g12a

Change-Id: I13400d8b18e0e85894ba8d10afc0ae119874aab4
Signed-off-by: Yong Qin <yong.qin@amlogic.com>

diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c
index fffd4fd..aefef18 100644 (file)
--- a/drivers/amlogic/media/deinterlace/deinterlace.c
+++ b/drivers/amlogic/media/deinterlace/deinterlace.c
@@ -129,7 +129,7 @@ static di_dev_t *de_devp;
 static dev_t di_devno;
 static struct class *di_clsp;
 
-static const char version_s[] = "2019-03-13b";
+static const char version_s[] = "2019-03-14a";
 
 static int bypass_state = 1;
 static int bypass_all;

diff --git a/drivers/amlogic/media/deinterlace/deinterlace_hw.c b/drivers/amlogic/media/deinterlace/deinterlace_hw.c
index 972ed8e..9c613ae 100644 (file)
--- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c
+++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c
@@ -3467,12 +3467,12 @@ bool di_pre_idle(void)
 {
        bool ret = false;
 
-       if (is_meson_tl1_cpu()) {
-               if ((RDMA_RD(VPU_ARB_DBG_STAT_L1C1_TL1) &
+       if (cpu_after_eq(MESON_CPU_MAJOR_ID_G12A)) {
+               if ((RDMA_RD(DI_ARB_DBG_STAT_L1C1) &
                        PRE_ID_MASK_TL1) == PRE_ID_MASK_TL1)
                        ret = true;
        } else {
-               if ((RDMA_RD(VPU_ARB_DBG_STAT_L1C1) &
+               if ((RDMA_RD(DI_ARB_DBG_STAT_L1C1_OLD) &
                        PRE_ID_MASK) == PRE_ID_MASK)
                        ret = true;
        }
@@ -3489,18 +3489,18 @@ void di_arb_sw(bool on)
        u32 WRARB_onval;
        u32 WRARB_offval;
 
-       if (is_meson_tl1_cpu()) {
-               REG_VPU_WRARB_REQEN_SLV_L1C1 = VPU_WRARB_REQEN_SLV_L1C1_TL1;
-               REG_VPU_RDARB_REQEN_SLV_L1C1 = VPU_RDARB_REQEN_SLV_L1C1_TL1;
-               REG_VPU_ARB_DBG_STAT_L1C1 = VPU_ARB_DBG_STAT_L1C1_TL1;
+       if (cpu_after_eq(MESON_CPU_MAJOR_ID_G12A)) {
+               REG_VPU_WRARB_REQEN_SLV_L1C1 = DI_WRARB_REQEN_SLV_L1C1;
+               REG_VPU_RDARB_REQEN_SLV_L1C1 = DI_RDARB_REQEN_SLV_L1C1;
+               REG_VPU_ARB_DBG_STAT_L1C1 = DI_ARB_DBG_STAT_L1C1;
                if (on)
                        WRARB_onval = 0x3f;
                else
                        WRARB_offval = 0x3e;
        } else {
-               REG_VPU_WRARB_REQEN_SLV_L1C1 = VPU_WRARB_REQEN_SLV_L1C1;
-               REG_VPU_RDARB_REQEN_SLV_L1C1 = VPU_RDARB_REQEN_SLV_L1C1;
-               REG_VPU_ARB_DBG_STAT_L1C1 = VPU_ARB_DBG_STAT_L1C1;
+               REG_VPU_WRARB_REQEN_SLV_L1C1 = DI_WRARB_REQEN_SLV_L1C1_OLD;
+               REG_VPU_RDARB_REQEN_SLV_L1C1 = DI_RDARB_REQEN_SLV_L1C1_OLD;
+               REG_VPU_ARB_DBG_STAT_L1C1 = DI_ARB_DBG_STAT_L1C1_OLD;
                if (on)
                        WRARB_onval = 0x3f;
                else

diff --git a/drivers/amlogic/media/deinterlace/register.h b/drivers/amlogic/media/deinterlace/register.h
index cc73dc2..5ce602d 100644 (file)
--- a/drivers/amlogic/media/deinterlace/register.h
+++ b/drivers/amlogic/media/deinterlace/register.h
@@ -44,14 +44,9 @@ void DI_VSYNC_WR_MPEG_REG_BITS(unsigned int addr,
 
 #define HHI_VPU_CLKB_CNTL      0x83
 
-#define VPU_WRARB_REQEN_SLV_L1C1       0x2795
-#define VPU_RDARB_REQEN_SLV_L1C1       0x2791
-#define VPU_ARB_DBG_STAT_L1C1          0x27b4
-
-#define VPU_WRARB_REQEN_SLV_L1C1_TL1   0x2055
-#define VPU_RDARB_REQEN_SLV_L1C1_TL1   0x2051
-#define VPU_ARB_DBG_STAT_L1C1_TL1              0x205a
-
+#define DI_WRARB_REQEN_SLV_L1C1_OLD    0x2795
+#define DI_RDARB_REQEN_SLV_L1C1_OLD    0x2791
+#define DI_ARB_DBG_STAT_L1C1_OLD               0x27b4
 
 #define VIUB_SW_RESET                                  0x2001
 #define VIUB_SW_RESET0                                 0x2002