rk3288 lcdc: fix muti layer sel error

diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
index 9c2d8550e8899fa1feb435a6addc4e9843aa4143..7c52273cc0eb9a94d5b415f8c52c3b4406ee981b 100755 (executable)
--- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
@@ -548,7 +548,6 @@ static int rk3288_win_0_1_reg_update(struct rk_lcdc_driver *dev_drv,int win_id)
        struct rk_lcdc_win *win = dev_drv->win[win_id];
        unsigned int mask, val, off;
        off = win_id * 0x40;
-       
        if(win->state == 1){
                mask =  m_WIN0_EN | m_WIN0_DATA_FMT | m_WIN0_FMT_10 |
                        m_WIN0_LB_MODE | m_WIN0_RB_SWAP;
@@ -874,23 +873,15 @@ static int rk3288_load_screen(struct rk_lcdc_driver *dev_drv, bool initscreen)
                case SCREEN_HDMI:
                        face = OUT_RGB_AAA;
                        mask = m_HDMI_OUT_EN;
-                       val = v_HDMI_OUT_EN(1);
-                       /*v = 1 << (4+16);
-                       v |= (lcdc_dev->id << 4);*/     
+                       val = v_HDMI_OUT_EN(1);         
                        break;
                case SCREEN_MIPI:
                        mask = m_MIPI_OUT_EN;
-                       val = v_MIPI_OUT_EN(1);
-                       /*v = (1 << (6+16))||(1 << (9+16));
-                       v |= (lcdc_dev->id << 6);
-                       v |= (lcdc_dev->id << 9);*/             
+                       val = v_MIPI_OUT_EN(1);                 
                        break;
                case SCREEN_DUAL_MIPI:
                        mask = m_MIPI_OUT_EN | m_DOUB_CHANNEL_EN;
-                       val = v_MIPI_OUT_EN(1) | v_DOUB_CHANNEL_EN(1);
-                       /*v = (1 << (6+16))||(1 << (9+16));
-                       v |= (lcdc_dev->id << 6);
-                       v |= (lcdc_dev->id << 9);*/     
+                       val = v_MIPI_OUT_EN(1) | v_DOUB_CHANNEL_EN(1);  
                        break;
                case SCREEN_EDP:
                        face = OUT_RGB_AAA;  /*RGB AAA output*/
@@ -898,9 +889,7 @@ static int rk3288_load_screen(struct rk_lcdc_driver *dev_drv, bool initscreen)
                        val = v_DITHER_DOWN_EN(0) | v_DITHER_UP_EN(0);
                        lcdc_msk_reg(lcdc_dev, DSP_CTRL1, mask, val);
                        mask = m_EDP_OUT_EN;
-                       val = v_EDP_OUT_EN(1);
-                       /*v = 1 << (5+16);
-                       v |= (lcdc_dev->id << 5);*/             
+                       val = v_EDP_OUT_EN(1);          
                        break;
                }
                lcdc_msk_reg(lcdc_dev, SYS_CTRL, mask, val);
@@ -1222,13 +1211,11 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
        unsigned long flags;
 #endif
        win = dev_drv->win[win_id];
-       /*lcdc_dev->atv_layer_cnt = dev_drv->atv_layer_cnt;*/
-       if (!screen) {
+       if (!screen) {
                dev_err(dev_drv->dev, "screen is null!\n");
                return -ENOENT;
        }
-       /*overlay*/
-       if(win_id == 0){
+       if(win_id == 0){
                win0_display(lcdc_dev, win);
        }else if(win_id == 1){
                win1_display(lcdc_dev, win);
@@ -1240,9 +1227,7 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
                dev_err(dev_drv->dev, "invalid win number:%d!\n", win_id);
                return -EINVAL;
        }
-
-
-
+ 
        /*this is the first frame of the system ,enable frame start interrupt */
        if ((dev_drv->first_frame)) {
                dev_drv->first_frame = 0;
@@ -1254,7 +1239,7 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
                    v_DSP_LINE_FLAG_NUM(screen->mode.vsync_len + screen->mode.upper_margin +
                    screen->mode.yres -1);
                lcdc_msk_reg(lcdc_dev, INTR_CTRL0, mask, val);
- #if 0
+#if 0
                 mask = m_WIN0_EMPTY_INTR_EN | m_WIN1_EMPTY_INTR_EN | m_WIN2_EMPTY_INTR_EN |
                         m_WIN3_EMPTY_INTR_EN |m_HWC_EMPTY_INTR_EN | m_POST_BUF_EMPTY_INTR_EN |
                         m_PWM_GEN_INTR_EN;
@@ -1262,8 +1247,7 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
                         v_WIN3_EMPTY_INTR_EN(1)| v_HWC_EMPTY_INTR_EN(1) | v_POST_BUF_EMPTY_INTR_EN(1) |
                         v_PWM_GEN_INTR_EN(1);
                 lcdc_msk_reg(lcdc_dev, INTR_CTRL1, mask, val);
-#endif
-               /*lcdc_cfg_done(lcdc_dev);*/
+#endif 
        }
 #if defined(WAIT_FOR_SYNC)
        spin_lock_irqsave(&dev_drv->cpl_lock, flags);
@@ -1277,9 +1261,7 @@ static int rk3288_lcdc_pan_display(struct rk_lcdc_driver *dev_drv, int win_id)
                dev_info(dev_drv->dev, "wait for new frame start time out!\n");
                return -ETIMEDOUT;
        }
-#endif
-       /*dev_drv->ops->ovl_mgr(dev_drv, 0, 1);*/
-       /*rk3288_lcdc_reg_update(dev_drv);*/
+#endif 
        return 0;
 }
 
@@ -2116,36 +2098,52 @@ static int rk3288_lcdc_ovl_mgr(struct rk_lcdc_driver *dev_drv, int swap,
        struct rk_lcdc_win *win = NULL;
        int i,ovl;
        unsigned int mask, val;
+       int z_order_num=0;
        int layer0_sel,layer1_sel,layer2_sel,layer3_sel;
-       for(i=0;i<4;i++){
-               win = dev_drv->win[i];
-               switch(win->z_order){
-               case 0:
-                       layer0_sel = win->id;
-                       break;
-               case 1:
-                       layer1_sel = win->id;
-                       break;
-               case 2:
-                       layer2_sel = win->id;
-                       break;
-               case 3:
-                       layer3_sel = win->id;
-                       break;
-               default:
-                       break;
+       if(swap == 0){
+               for(i=0;i<4;i++){
+                       win = dev_drv->win[i];
+                       if(win->state == 1){
+                               z_order_num++;
+                       }       
+               }
+               for(i=0;i<4;i++){
+                       win = dev_drv->win[i];
+                       if(win->state == 0)
+                               win->z_order = z_order_num++;
+                       switch(win->z_order){
+                       case 0:
+                               layer0_sel = win->id;
+                               break;
+                       case 1:
+                               layer1_sel = win->id;
+                               break;
+                       case 2:
+                               layer2_sel = win->id;
+                               break;
+                       case 3:
+                               layer3_sel = win->id;
+                               break;
+                       default:
+                               break;
+                       }
                }
+       }else{
+               layer0_sel = swap %10;;
+               layer1_sel = swap /10 % 10;
+               layer2_sel = swap / 100 %10;
+               layer3_sel = swap / 1000;
        }
-       
+
        spin_lock(&lcdc_dev->reg_lock);
        if(lcdc_dev->clk_on){
                if(set){
                        mask = m_DSP_LAYER0_SEL | m_DSP_LAYER1_SEL |
                                m_DSP_LAYER2_SEL | m_DSP_LAYER3_SEL;
-                       val  = v_DSP_LAYER0_SEL(0) |
-                               v_DSP_LAYER1_SEL(1) |
-                               v_DSP_LAYER2_SEL(2) |
-                               v_DSP_LAYER3_SEL(3);
+                       val  = v_DSP_LAYER0_SEL(layer0_sel) |
+                               v_DSP_LAYER1_SEL(layer1_sel) |
+                               v_DSP_LAYER2_SEL(layer2_sel) |
+                               v_DSP_LAYER3_SEL(layer3_sel);
                        lcdc_msk_reg(lcdc_dev,DSP_CTRL1,mask,val);
                }else{
                        layer0_sel = lcdc_read_bit(lcdc_dev, DSP_CTRL1, m_DSP_LAYER0_SEL);

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 071e9f900efd675a4c9321534d72e5623471b3d4..7037b7ac2542b49dfd94f08828e89a2fc6579925 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1097,7 +1097,8 @@ static void rk_fb_update_driver(struct rk_lcdc_win *win,struct rk_fb_reg_win_dat
                        }
                }
        }else{
-               win->state = 0;
+               //win->state = 0;
+               //win->z_order = -1;
        }
        #endif
 
@@ -1127,6 +1128,7 @@ static void rk_fb_update_reg(struct rk_lcdc_driver * dev_drv,struct rk_fb_reg_da
                        dev_drv->ops->set_par(dev_drv,i);
                        dev_drv->ops->pan_display(dev_drv,i);           
                }else{
+                       win->z_order = -1;
                        win->state = 0;
                }
        }
@@ -1261,6 +1263,7 @@ static int rk_fb_set_win_buffer(struct fb_info *info,
 #else
        ion_phys_addr_t phy_addr;
 #endif
+       reg_win_data->reg_area_data[0].smem_start = -1;
        reg_win_data->area_num = 0;
        if(win_par->area_par[0].phy_addr == 0){
                for(i=0;i<RK_WIN_MAX_AREA;i++){ 
@@ -1328,10 +1331,13 @@ static int rk_fb_set_win_buffer(struct fb_info *info,
        ppixel_a = ((fb_data_fmt == ARGB888)||(fb_data_fmt == ABGR888)) ? 1:0;
        global_a = (win_par->g_alpha_val == 0) ? 0:1;
        reg_win_data->alpha_en = ppixel_a | global_a;
-       
-       reg_win_data->z_order = win_par->z_order;
-       reg_win_data->win_id  = win_par->win_id;        
-       
+       if(reg_win_data->reg_area_data[0].smem_start > 0){
+               reg_win_data->z_order = win_par->z_order;
+               reg_win_data->win_id  = win_par->win_id;
+       }else{
+               reg_win_data->z_order = -1;
+               reg_win_data->win_id  = -1;
+       }
        for(i=0;i<reg_win_data->area_num;i++){
                dsp_height = reg_win_data->reg_area_data[i].ysize;
                reg_win_data->reg_area_data[i].xpos = win_par->area_par[i].xpos;//visiable pos in panel

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 6e349194dbcbd976d61492fe071d86a4c0af332d..bc03a575069db75b4ddbbdb9f39a25393324a65a 100755 (executable)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -293,7 +293,7 @@ struct rk_lcdc_win {
        bool state;             /*on or off*/
        u32 pseudo_pal[16];
        enum data_format format;
-       u8 z_order;             /*win sel layer*/
+       int z_order;            /*win sel layer*/
        u8 fmt_cfg;
        u8 fmt_10;;
        u8 swap_rb;