rk fb:add interface to get pixclock and primary screen

	fix one lcdc dual output

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
index 98fc16541124612a299e9f0667e2c485b2bc75cf..e9e6c85c854c707e6fbe4698414ae77cabacaba8 100644 (file)
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -114,6 +114,55 @@ struct rk_lcdc_device_driver * rk_get_lcdc_drv(char *name)
        return inf->lcdc_dev_drv[i];
        
 }
+
+static struct rk_lcdc_device_driver * rk_get_prmry_lcdc_drv(void)
+{
+       struct rk_fb_inf *inf =  platform_get_drvdata(g_fb_pdev);
+       struct rk_lcdc_device_driver *dev_drv = NULL;
+       int i = 0;
+       
+       for(i = 0; i < inf->num_lcdc;i++)
+       {
+               if(inf->lcdc_dev_drv[i]->screen_ctr_info->prop ==  PRMRY)
+               {
+                       dev_drv = inf->lcdc_dev_drv[i];
+                       break;
+               }
+       }
+
+       return dev_drv;
+}
+
+static struct rk_lcdc_device_driver * rk_get_extend_lcdc_drv(void)
+{
+       struct rk_fb_inf *inf =  platform_get_drvdata(g_fb_pdev);
+       struct rk_lcdc_device_driver *dev_drv = NULL;
+       int i = 0;
+       
+       for(i = 0; i < inf->num_lcdc; i++)
+       {
+               if(inf->lcdc_dev_drv[i]->screen_ctr_info->prop == EXTEND)
+               {
+                       dev_drv = inf->lcdc_dev_drv[i];
+                       break;
+               }
+       }
+
+       return dev_drv;
+}
+
+rk_screen *rk_fb_get_prmry_screen(void)
+{
+       struct rk_lcdc_device_driver *dev_drv = rk_get_prmry_lcdc_drv();
+       return dev_drv->screen0;
+       
+}
+
+u32 rk_fb_get_prmry_screen_pixclock(void)
+{
+       struct rk_lcdc_device_driver *dev_drv = rk_get_prmry_lcdc_drv();
+       return dev_drv->pixclock;
+}
 static int rk_fb_open(struct fb_info *info,int user)
 {
     struct rk_lcdc_device_driver * dev_drv = (struct rk_lcdc_device_driver * )info->par;
@@ -164,18 +213,6 @@ static int rk_fb_close(struct fb_info *info,int user)
                info->var.vsync_len = dev_drv->screen0->vsync_len;
                info->var.hsync_len = dev_drv->screen0->hsync_len;
     }
-       /*struct rk_lcdc_device_driver * dev_drv = (struct rk_lcdc_device_driver * )info->par;
-       int layer_id;
-       CHK_SUSPEND(dev_drv);
-       layer_id = get_fb_layer_id(&info->fix);
-       if(!dev_drv->layer_par[layer_id]->state)
-       {
-               return 0;
-       }
-       else
-       {
-               dev_drv->open(dev_drv,layer_id,0);
-       }*/
        
        return 0;
 }
@@ -822,8 +859,8 @@ int rk_fb_switch_screen(rk_screen *screen ,int enable ,int lcdc_id)
        struct fb_var_screeninfo *pmy_var = NULL;      //var for primary screen
        struct fb_info *pmy_info = NULL;
        struct fb_fix_screeninfo *pmy_fix = NULL;
-       int i;
 #endif
+       int i;
        struct fb_fix_screeninfo *hdmi_fix    = NULL;
        char name[6];
        int ret;
@@ -893,6 +930,10 @@ int rk_fb_switch_screen(rk_screen *screen ,int enable ,int lcdc_id)
                        dev_drv->cur_screen = dev_drv->screen0;
                        dev_drv->screen_ctr_info->set_screen_info(dev_drv->cur_screen,
                        dev_drv->screen_ctr_info->lcd_info);
+                       if(dev_drv->screen0->sscreen_set)
+                       {
+                               dev_drv->screen0->sscreen_set(dev_drv->screen0,0);
+                       }
                        
                }
        }

diff --git a/include/linux/rk_fb.h b/include/linux/rk_fb.h
index 04c266906c4d5408f58e091a92fff6851854d5b1..a9989ca56e14084c37372e7e49b332d81019466b 100644 (file)
--- a/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h
@@ -301,6 +301,9 @@ extern int rk_fb_register(struct rk_lcdc_device_driver *dev_drv,
 extern int rk_fb_unregister(struct rk_lcdc_device_driver *dev_drv);
 extern int get_fb_layer_id(struct fb_fix_screeninfo *fix);
 extern struct rk_lcdc_device_driver * rk_get_lcdc_drv(char *name);
+extern rk_screen * rk_fb_get_prmry_screen(void);
+u32 rk_fb_get_prmry_screen_pixclock(void);
+
 extern int rk_fb_switch_screen(rk_screen *screen ,int enable ,int lcdc_id);
 extern int rk_fb_disp_scale(u8 scale_x, u8 scale_y,u8 lcdc_id);
 extern int rkfb_create_sysfs(struct fb_info *fbi);