From: yxj Date: Fri, 7 Sep 2012 07:32:25 +0000 (+0800) Subject: lcd hsd100pxn:add scale config for rk2928 X-Git-Tag: firefly_0821_release~8702 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5738a62d20bbb1bba59fdf01e99a75449ea4aebd;p=firefly-linux-kernel-4.4.55.git lcd hsd100pxn:add scale config for rk2928 --- diff --git a/drivers/video/display/screen/lcd_hsd100pxn.c b/drivers/video/display/screen/lcd_hsd100pxn.c index b0215a213953..15613eb435e9 100755 --- a/drivers/video/display/screen/lcd_hsd100pxn.c +++ b/drivers/video/display/screen/lcd_hsd100pxn.c @@ -4,6 +4,7 @@ #include #include #include +#include "../../rockchip/hdmi/rk_hdmi.h" #include "screen.h" @@ -29,25 +30,227 @@ #define LCD_HEIGHT 152 /* Other */ #define DCLK_POL 1 -#define SWAP_RB 0 +#define SWAP_RB 0 + + +#ifdef CONFIG_ONE_LCDC_DUAL_OUTPUT_INF +/* scaler Timing */ +//1920*1080*60 + +#define S_OUT_CLK 64512000 +#define S_H_PW 114 +#define S_H_BP 210 +#define S_H_VD 1024 +#define S_H_FP 0 + +#define S_V_PW 4 +#define S_V_BP 10 +#define S_V_VD 768 +#define S_V_FP 0 + +#define S_H_ST 0 +#define S_V_ST 23 + +//1920*1080*50 +#define S1_OUT_CLK 53760000 +#define S1_H_PW 114 +#define S1_H_BP 210 +#define S1_H_VD 1024 +#define S1_H_FP 0 + +#define S1_V_PW 4 +#define S1_V_BP 10 +#define S1_V_VD 768 +#define S1_V_FP 0 + +#define S1_H_ST 0 +#define S1_V_ST 23 +//1280*720*60 +#define S2_OUT_CLK 64512000 +#define S2_H_PW 114 +#define S2_H_BP 210 +#define S2_H_VD 1024 +#define S2_H_FP 0 + +#define S2_V_PW 4 +#define S2_V_BP 10 +#define S2_V_VD 768 +#define S2_V_FP 0 + +#define S2_H_ST 0 +#define S2_V_ST 23 +//1280*720*50 + +#define S3_OUT_CLK 53760000 +#define S3_H_PW 114 +#define S3_H_BP 210 +#define S3_H_VD 1024 +#define S3_H_FP 0 + +#define S3_V_PW 4 +#define S3_V_BP 10 +#define S3_V_VD 768 +#define S3_V_FP 0 + +#define S3_H_ST 0 +#define S3_V_ST 23 + +//720*576*50 +#define S4_OUT_CLK 30000000 +#define S4_H_PW 1 +#define S4_H_BP 88 +#define S4_H_VD 800 +#define S4_H_FP 263 + +#define S4_V_PW 3 +#define S4_V_BP 9 +#define S4_V_VD 480 +#define S4_V_FP 28 + +#define S4_H_ST 0 +#define S4_V_ST 33 +//720*480*60 +#define S5_OUT_CLK 30000000 +#define S5_H_PW 1 +#define S5_H_BP 88 +#define S5_H_VD 800 +#define S5_H_FP 112 + +#define S5_V_PW 3 +#define S5_V_BP 9 +#define S5_V_VD 480 +#define S5_V_FP 28 + +#define S5_H_ST 0 +#define S5_V_ST 29 + +#define S_DCLK_POL 1 + + +static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution) +{ + screen->s_clk_inv = S_DCLK_POL; + screen->s_den_inv = 0; + screen->s_hv_sync_inv = 0; + + printk("%s>>>>>>>>mode:%d\n",__func__,hdmi_resolution); + switch(hdmi_resolution){ + case HDMI_1920x1080p_60Hz: + /* Scaler Timing */ + screen->hdmi_resolution = hdmi_resolution; + screen->s_pixclock = S_OUT_CLK; + screen->s_hsync_len = S_H_PW; + screen->s_left_margin = S_H_BP; + screen->s_right_margin = S_H_FP; + screen->s_hsync_len = S_H_PW; + screen->s_upper_margin = S_V_BP; + screen->s_lower_margin = S_V_FP; + screen->s_vsync_len = S_V_PW; + screen->s_hsync_st = S_H_ST; + screen->s_vsync_st = S_V_ST; + break; + case HDMI_1920x1080p_50Hz: + /* Scaler Timing */ + screen->s_pixclock = S1_OUT_CLK; + screen->s_hsync_len = S1_H_PW; + screen->s_left_margin = S1_H_BP; + screen->s_right_margin = S1_H_FP; + screen->s_hsync_len = S1_H_PW; + screen->s_upper_margin = S1_V_BP; + screen->s_lower_margin = S1_V_FP; + screen->s_vsync_len = S1_V_PW; + screen->s_hsync_st = S1_H_ST; + screen->s_vsync_st = S1_V_ST; + break; + case HDMI_1280x720p_60Hz: + /* Scaler Timing */ + screen->hdmi_resolution = hdmi_resolution; + screen->s_pixclock = S2_OUT_CLK; + screen->s_hsync_len = S2_H_PW; + screen->s_left_margin = S2_H_BP; + screen->s_right_margin = S2_H_FP; + screen->s_hsync_len = S2_H_PW; + screen->s_upper_margin = S2_V_BP; + screen->s_lower_margin = S2_V_FP; + screen->s_vsync_len = S2_V_PW; + screen->s_hsync_st = S2_H_ST; + screen->s_vsync_st = S2_V_ST; + break; + case HDMI_1280x720p_50Hz: + /* Scaler Timing */ + screen->hdmi_resolution = hdmi_resolution; + screen->s_pixclock = S3_OUT_CLK; + screen->s_hsync_len = S3_H_PW; + screen->s_left_margin = S3_H_BP; + screen->s_right_margin = S3_H_FP; + screen->s_hsync_len = S3_H_PW; + screen->s_upper_margin = S3_V_BP; + screen->s_lower_margin = S3_V_FP; + screen->s_vsync_len = S3_V_PW; + screen->s_hsync_st = S3_H_ST; + screen->s_vsync_st = S3_V_ST; + break; + case HDMI_720x576p_50Hz_4_3: + case HDMI_720x576p_50Hz_16_9: + /* Scaler Timing */ + screen->hdmi_resolution = hdmi_resolution; + screen->s_pixclock = S4_OUT_CLK; + screen->s_hsync_len = S4_H_PW; + screen->s_left_margin = S4_H_BP; + screen->s_right_margin = S4_H_FP; + screen->s_hsync_len = S4_H_PW; + screen->s_upper_margin = S4_V_BP; + screen->s_lower_margin = S4_V_FP; + screen->s_vsync_len = S4_V_PW; + screen->s_hsync_st = S4_H_ST; + screen->s_vsync_st = S4_V_ST; + break; + case HDMI_720x480p_60Hz_16_9: + case HDMI_720x480p_60Hz_4_3: + /* Scaler Timing */ + screen->hdmi_resolution = hdmi_resolution; + screen->s_pixclock = S5_OUT_CLK; + screen->s_hsync_len = S5_H_PW; + screen->s_left_margin = S5_H_BP; + screen->s_right_margin = S5_H_FP; + screen->s_hsync_len = S5_H_PW; + screen->s_upper_margin = S5_V_BP; + screen->s_lower_margin = S5_V_FP; + screen->s_vsync_len = S5_V_PW; + screen->s_hsync_st = S5_H_ST; + screen->s_vsync_st = S5_V_ST; + break; + default : + printk("%s lcd not support dual display at this hdmi resolution %d \n",__func__,hdmi_resolution); + return -1; + break; + } + + return 0; +} +#else +#define set_scaler_info NULL +#endif + + void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info ) { - /* screen type & face */ - screen->type = OUT_TYPE; - screen->face = OUT_FACE; - screen->hw_format = 1; + /* screen type & face */ + screen->type = OUT_TYPE; + screen->face = OUT_FACE; + screen->hw_format = 1; - /* Screen size */ - screen->x_res = H_VD; - screen->y_res = V_VD; + /* Screen size */ + screen->x_res = H_VD; + screen->y_res = V_VD; - screen->width = LCD_WIDTH; - screen->height = LCD_HEIGHT; + screen->width = LCD_WIDTH; + screen->height = LCD_HEIGHT; - /* Timing */ - screen->lcdc_aclk = LCDC_ACLK; - screen->pixclock = OUT_CLK; + /* Timing */ + screen->lcdc_aclk = LCDC_ACLK; + screen->pixclock = OUT_CLK; screen->left_margin = H_BP; screen->right_margin = H_FP; screen->hsync_len = H_PW; @@ -62,15 +265,27 @@ void set_lcd_info(struct rk29fb_screen *screen, struct rk29lcd_info *lcd_info ) screen->pin_dclk = DCLK_POL; /* Swap rule */ - screen->swap_rb = SWAP_RB; - screen->swap_rg = 0; - screen->swap_gb = 0; - screen->swap_delta = 0; - screen->swap_dumy = 0; - - /* Operation function*/ - screen->init = NULL; - screen->standby = NULL; + screen->swap_rb = SWAP_RB; + screen->swap_rg = 0; + screen->swap_gb = 0; + screen->swap_delta = 0; + screen->swap_dumy = 0; + + /* Operation function*/ + screen->init = NULL; + screen->standby = NULL; + + screen->sscreen_get = set_scaler_info; + screen->s_pixclock = OUT_CLK; + screen->s_hsync_len = H_PW; + screen->s_left_margin = H_BP; + screen->s_right_margin = H_FP; + screen->s_hsync_len = H_PW; + screen->s_upper_margin = V_BP; + screen->s_lower_margin = V_FP; + screen->s_vsync_len = V_PW; + screen->s_hsync_st = 0; + screen->s_vsync_st = 0; }