di: fix mc config issue

PD#173918: di: fix mc config issue

Change-Id: Iaa685cb579552fbc94889ca482b2ced72c899210
Signed-off-by: Dezhi Kong <dezhi.kong@amlogic.com>

diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c
index d3ce77c..95b48c8 100644 (file)
--- a/drivers/amlogic/media/deinterlace/deinterlace.c
+++ b/drivers/amlogic/media/deinterlace/deinterlace.c
@@ -123,7 +123,7 @@ static di_dev_t *de_devp;
 static dev_t di_devno;
 static struct class *di_clsp;
 
-static const char version_s[] = "2018-08-15a";
+static const char version_s[] = "2018-09-13a";
 
 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 7545e36..fa6fc88 100644 (file)
--- a/drivers/amlogic/media/deinterlace/deinterlace_hw.c
+++ b/drivers/amlogic/media/deinterlace/deinterlace_hw.c
@@ -2916,7 +2916,7 @@ static void mc_pre_mif_ctrl_g12(bool enable)
 
        mif_ctrl = enable ? 1 : 0;
        /* enable mcinfo rd mif */
-       RDMA_WR_BITS(DI_PRE_CTRL, 0, 10, 1);
+       RDMA_WR_BITS(DI_PRE_CTRL, mif_ctrl, 10, 1);
        /* enable mv wr mif */
        RDMA_WR_BITS(MCVECWR_CTRL, mif_ctrl, 12, 1);
        /* enable mcinfo wr mif */