rk_fb: add support hdmi display for new rk fb

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 3a38c611b79687c6798ae08e8d9dc47181412473..fe86fbac2a750c4b814dfe52ea57877460a89b2b 100755 (executable)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -1110,6 +1110,9 @@ static void rk_fb_update_reg(struct rk_lcdc_driver * dev_drv,struct rk_fb_reg_da
        struct rk_lcdc_win *win;
        ktime_t timestamp = dev_drv->vsync_info.timestamp;
        //struct rk_fb_reg_win_data old_reg_win_data[RK30_MAX_LAYER_SUPPORT];
+       struct rk_fb *rk_fb =  platform_get_drvdata(fb_pdev);
+       struct rk_lcdc_driver *ext_dev_drv;
+       struct rk_lcdc_win *ext_win;
 
        dev_drv->atv_layer_cnt = regs->win_num;
        for(i=0;i<dev_drv->lcdc_win_num;i++){ 
@@ -1129,6 +1132,53 @@ static void rk_fb_update_reg(struct rk_lcdc_driver * dev_drv,struct rk_fb_reg_da
                dev_drv->ops->pan_display(dev_drv,i);
        }
        dev_drv->ops->ovl_mgr(dev_drv, 0, 1);
+
+       if(rk_fb->disp_mode == DUAL && hdmi_switch_complete) {
+               for (i = 0; i < rk_fb->num_lcdc; i++) {
+                       if(rk_fb->lcdc_dev_drv[i]->prop == EXTEND) {
+                               ext_dev_drv = rk_fb->lcdc_dev_drv[i];
+                               break;
+                       }
+               }
+               if (i == rk_fb->num_lcdc) {
+                       printk(KERN_ERR "hdmi lcdc driver not found!\n");
+                       goto ext_win_exit;
+               }
+
+               //hdmi just need set win0 only(win0 have only one area),other win is disable
+               ext_win = ext_dev_drv->win[0];
+               for(j = 0;j < regs->win_num; j++) {
+                       if(0 == regs->reg_win_data[j].win_id)
+                               break;
+               }
+               if(j < regs->win_num){
+                       rk_fb_update_driver(ext_win, &regs->reg_win_data[j]);
+                       ext_win->area[0].xpos = (ext_dev_drv->cur_screen->mode.xres - ext_dev_drv->cur_screen->xsize)>>1;
+                       ext_win->area[0].ypos = (ext_dev_drv->cur_screen->mode.yres - ext_dev_drv->cur_screen->ysize)>>1;
+                       ext_win->area[0].xsize = ext_dev_drv->cur_screen->xsize;
+                       ext_win->area[0].ysize = ext_dev_drv->cur_screen->ysize;
+                       ext_win->state = 1;
+               }
+               else {
+                       ext_win->state = 0;
+               }
+
+               if (ext_win->area[0].xact < ext_win->area[0].yact) {
+                       ext_win->area[0].xact = win->area[0].yact;
+                       ext_win->area[0].yact = win->area[0].xact;
+                       ext_win->area[0].xvir = win->area[0].yact;
+               }
+
+               //disable the other win,except win0
+               for(i = 1; i < ext_dev_drv->lcdc_win_num; i ++) {
+                       ext_win = ext_dev_drv->win[i];
+                       ext_win->state = 0;
+               }
+               ext_dev_drv->ops->set_par(ext_dev_drv, 0);
+               ext_dev_drv->ops->pan_display(ext_dev_drv, 0);
+               ext_dev_drv->ops->cfg_done(ext_dev_drv);
+       }
+ext_win_exit:
        dev_drv->ops->cfg_done(dev_drv);
 
 #if 0
@@ -2394,7 +2444,7 @@ int rk_fb_disp_scale(u8 scale_x, u8 scale_y, u8 lcdc_id)
        struct rk_lcdc_driver *dev_drv = NULL;
        u16 screen_x, screen_y;
        u16 xpos, ypos;
-       u16 xsize, ysize;
+       //u16 xsize, ysize;
        char name[6];
        int i = 0;
        sprintf(name, "lcdc%d", lcdc_id);
@@ -2435,12 +2485,12 @@ int rk_fb_disp_scale(u8 scale_x, u8 scale_y, u8 lcdc_id)
        {
                xpos = (screen_x-screen_x*scale_x/100)>>1;
                ypos = (screen_y-screen_y*scale_y/100)>>1;
-               xsize = screen_x*scale_x/100;
-               ysize = screen_y*scale_y/100;
+               dev_drv->cur_screen->xsize = screen_x*scale_x/100;
+               dev_drv->cur_screen->ysize = screen_y*scale_y/100;
                var->nonstd &= 0xff;
                var->nonstd |= (xpos<<8) + (ypos<<20);
                var->grayscale &= 0xff;
-               var->grayscale |= (xsize<<8) + (ysize<<20);
+               var->grayscale |= (dev_drv->cur_screen->xsize<<8) + (dev_drv->cur_screen->ysize<<20);
        }
 
        info->fbops->fb_set_par(info);
@@ -2602,6 +2652,7 @@ static int init_lcdc_device_driver(struct rk_fb *rk_fb,
        
        screen->screen_id = 0;
        screen->lcdc_id = dev_drv->id;
+       rk_fb_set_prmry_screen(screen);
        dev_drv->screen0 = screen;
        dev_drv->cur_screen = screen;
        /* devie use one lcdc + rk61x scaler for dual display*/

diff --git a/drivers/video/rockchip/screen/rk_screen.c b/drivers/video/rockchip/screen/rk_screen.c
index 5579d28077387add02fee89d103150e277ac2016..085463475317f8b4073282d2e65167752d795aea 100644 (file)
--- a/drivers/video/rockchip/screen/rk_screen.c
+++ b/drivers/video/rockchip/screen/rk_screen.c
@@ -2,6 +2,7 @@
 #include <linux/rk_fb.h>
 #include <linux/device.h>
 #include "lcd.h"
+#include "../hdmi/rk_hdmi.h"
 
 static struct rk_screen *rk_screen;
 int  rk_fb_get_prmry_screen(struct rk_screen *screen)
@@ -10,6 +11,12 @@ int  rk_fb_get_prmry_screen(struct rk_screen *screen)
        return 0;
 }
 
+int rk_fb_set_prmry_screen(struct rk_screen *screen)
+{
+       rk_screen->lcdc_id = screen->lcdc_id;
+       rk_screen->screen_id = screen->screen_id;
+       return 0;
+}
 
 size_t get_fb_size(void)
 {

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 30221d03d9e8d533c094d4e080a5035bda70d329..091e1137e7f4ddb7246bc0b31b13519a7fae06a8 100755 (executable)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -541,6 +541,7 @@ extern int rk_fb_register(struct rk_lcdc_driver *dev_drv,
 extern int rk_fb_unregister(struct rk_lcdc_driver *dev_drv);
 extern struct rk_lcdc_driver *rk_get_lcdc_drv(char *name);
 extern int rk_fb_get_prmry_screen( struct rk_screen *screen);
+extern int rk_fb_set_prmry_screen(struct rk_screen *screen);
 extern u32 rk_fb_get_prmry_screen_pixclock(void);
 extern int rk_disp_pwr_ctr_parse_dt(struct rk_lcdc_driver *dev_drv);
 extern int rk_disp_pwr_enable(struct rk_lcdc_driver *dev_drv);