From c94bbed6110bc589427091f3e3c2429fd7601c86 Mon Sep 17 00:00:00 2001 From: yxj Date: Sun, 28 Apr 2013 11:17:36 +0800 Subject: [PATCH] rk fb:support one lcdc dual dispaly on rk616 --- drivers/video/rockchip/rk_fb.c | 1 + include/linux/rk_screen.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c index 9a88e441eec5..59fbbf583251 100644 --- a/drivers/video/rockchip/rk_fb.c +++ b/drivers/video/rockchip/rk_fb.c @@ -885,6 +885,7 @@ int rk_fb_switch_screen(rk_screen *screen ,int enable ,int lcdc_id) dev_drv->screen1->screen_id = 1; dev_drv->screen0->lcdc_id = 1; //connect screen0 to output interface 1 dev_drv->cur_screen = dev_drv->screen1; + dev_drv->screen0->ext_screen = dev_drv->screen1; if(dev_drv->screen0->sscreen_get) { dev_drv->screen0->sscreen_get(dev_drv->screen0, diff --git a/include/linux/rk_screen.h b/include/linux/rk_screen.h index bafc21a269b5..21cf587dac2e 100644 --- a/include/linux/rk_screen.h +++ b/include/linux/rk_screen.h @@ -132,6 +132,7 @@ typedef struct rk29fb_screen { u16 vsync_len; u8 ft; //the time need to display one frame,in ms int *dsp_lut; //display lut + struct rk29fb_screen *ext_screen; #if defined(CONFIG_HDMI_DUAL_DISP) || defined(CONFIG_ONE_LCDC_DUAL_OUTPUT_INF) /* Scaler mode Timing */ u32 s_pixclock; @@ -147,6 +148,15 @@ typedef struct rk29fb_screen { bool s_hv_sync_inv; bool s_clk_inv; #endif + +#if defined(CONFIG_RK616_VIF) + u32 pll_cfg_val; //bellow are for jettaB + u32 frac; + u16 scl_vst; + u16 scl_hst; + u16 vif_vst; + u16 vif_hst; +#endif u8 hdmi_resolution; /* mcu need */ u8 mcu_wrperiod; -- 2.34.1