Revert "rk2928 lcdc: default use win1,modify DBG macro"

win1 has no scal function,but we need it in hdmi mode.

This reverts commit 09a350428d352e8abd977a2e27175a065b70b186.

diff --git a/drivers/video/rockchip/lcdc/rk2928_lcdc.c b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
index d64c682ef0bd902183cf173b760d4b962058e3c3..529a5353ae59277d5104070368814a935d27f314 100644 (file)
--- a/drivers/video/rockchip/lcdc/rk2928_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk2928_lcdc.c
@@ -39,9 +39,9 @@
 
 
 
-static int dbg_thresd = 0;
+static int dbg_thresd = 2;
 module_param(dbg_thresd, int, S_IRUGO|S_IWUSR);
-#define DBG(level,x...) do { if(unlikely(dbg_thresd >= level)) printk(KERN_INFO x); } while (0)
+#define DBG(level,x...) do { if(unlikely(dbg_thresd > level)) printk(KERN_INFO x); } while (0)
 
 
 
@@ -747,8 +747,8 @@ int rk2928_lcdc_ioctl(struct rk_lcdc_device_driver * dev_drv,unsigned int cmd, u
        switch(cmd)
        {
                case FBIOGET_PANEL_SIZE:    //get panel size
-                       panel_size[0] = dev_drv->screen0->x_res;
-                       panel_size[1] = dev_drv->screen0->y_res;
+                       panel_size[0] = lcdc_dev->screen->x_res;
+                       panel_size[1] = lcdc_dev->screen->y_res;
                        if(copy_to_user(argp, panel_size, 8)) 
                                return -EFAULT;
                        break;
@@ -959,7 +959,7 @@ static int rk2928_fb_layer_remap(struct rk_lcdc_device_driver *dev_drv,
         mutex_lock(&dev_drv->fb_win_id_mutex);
        if(order == FB_DEFAULT_ORDER)
        {
-               order = FB0_WIN1_FB1_WIN0_FB2_WIN2;
+               order = FB0_WIN0_FB1_WIN1_FB2_WIN2;
        }
         dev_drv->fb2_win_id  = order/100;
         dev_drv->fb1_win_id = (order/10)%10;