From: zyw <zyw@rock-chips.com>
Date: Tue, 10 May 2011 12:07:17 +0000 (+0800)
Subject: modify for disbale hwc reload
X-Git-Tag: firefly_0821_release~10340
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=3b42285ad2a7f1aaf4d93123c2c576234c81f21f

modify for disbale hwc reload
---

diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c
index 162649d4969d..05b61fc60284 100755
--- a/drivers/video/rk29_fb.c
+++ b/drivers/video/rk29_fb.c
@@ -115,7 +115,7 @@ char cursor_img[] = {
 #define LcdRdReg(inf, addr)             (inf->preg->addr)
 #define LcdSetBit(inf, addr, msk)       inf->preg->addr=((inf->regbak.addr) |= (msk))
 #define LcdClrBit(inf, addr, msk)       inf->preg->addr=((inf->regbak.addr) &= ~(msk))
-#define LcdSetRegBit(inf, addr, msk)    inf->preg->addr=((inf->preg->addr) |= (msk))
+#define LcdSetRegisterBit(inf, addr, msk)    inf->preg->addr=((inf->preg->addr) |= (msk))
 #define LcdMskReg(inf, addr, msk, val)  (inf->regbak.addr)&=~(msk);   inf->preg->addr=(inf->regbak.addr|=(val))
 
 
@@ -318,7 +318,7 @@ int mcu_do_refresh(struct rk29fb_inf *inf)
             if(inf->cur_screen->refresh)    inf->cur_screen->refresh(REFRESH_PRE);
             inf->mcu_needflush = 0;
             inf->mcu_isrcnt = 0;
-            LcdSetRegBit(inf, MCU_TIMING_CTRL, m_MCU_HOLDMODE_FRAME_ST);
+            LcdSetRegisterBit(inf, MCU_TIMING_CTRL, m_MCU_HOLDMODE_FRAME_ST);
         }
     }
     return 0;
@@ -849,7 +849,7 @@ int rk29_set_cursor_img(struct rk29fb_inf *inf, char *data)
 		rk29_set_cursor_img_transform(cursor_img);
 	}
 	LcdWrReg(inf, HWC_MST, __pa(rk29_cursor_buf));
-	LcdSetBit(inf, SYS_CONFIG,m_HWC_RELOAD_EN);
+	LcdSetRegisterBit(inf, SYS_CONFIG,m_HWC_RELOAD_EN);
 	LcdWrReg(inf, REG_CFG_DONE, 0x01);
     return 0;
 }
@@ -2244,7 +2244,7 @@ static irqreturn_t rk29fb_irq(int irq, void *dev_id)
                     inf->cur_screen->refresh(REFRESH_PRE);
                 inf->mcu_needflush = 0;
                 inf->mcu_isrcnt = 0;
-                LcdSetRegBit(inf, MCU_TIMING_CTRL, m_MCU_HOLDMODE_FRAME_ST);
+                LcdSetRegisterBit(inf, MCU_TIMING_CTRL, m_MCU_HOLDMODE_FRAME_ST);
             } else {
                 if(inf->cur_screen->refresh)
                     inf->cur_screen->refresh(REFRESH_END);