lcd_hdmi_xxx.c:fix compile err

diff --git a/drivers/video/display/screen/lcd_hdmi_1024x768.c b/drivers/video/display/screen/lcd_hdmi_1024x768.c
index ca64748ed13f4360c2a9d22f301c19986c0229b3..47124e315fa18f7454b0661745eb4ecc0db1e056 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_1024x768.c
+++ b/drivers/video/display/screen/lcd_hdmi_1024x768.c
@@ -275,4 +275,16 @@ void set_lcd_info(struct rk29fb_screen *screen,  struct rk29lcd_info *lcd_info )
 #ifdef CONFIG_RK610_LVDS\r
     screen->sscreen_set = rk610_lcd_scaler_set_param;\r
 #endif\r
-}
\ No newline at end of file
+}\r
+\r
+size_t get_fb_size(void)\r
+{\r
+       size_t size = 0;\r
+       #if defined(CONFIG_THREE_FB_BUFFER)\r
+               size = ((H_VD)*(V_VD)<<2)* 3; //three buffer\r
+       #else\r
+               size = ((H_VD)*(V_VD)<<2)<<1; //two buffer\r
+       #endif\r
+       return ALIGN(size,SZ_1M);\r
+}\r
+\r

diff --git a/drivers/video/display/screen/lcd_hdmi_1280x800.c b/drivers/video/display/screen/lcd_hdmi_1280x800.c
index a67e852c2b650874c95e297c7df25b0d8a00a32d..969196e4dbda5b9eee256af46706c7b52698974d 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_1280x800.c
+++ b/drivers/video/display/screen/lcd_hdmi_1280x800.c
@@ -280,4 +280,14 @@ void set_lcd_info(struct rk29fb_screen *screen,  struct rk29lcd_info *lcd_info )
 }\r
 \r
 \r
+size_t get_fb_size(void)\r
+{\r
+       size_t size = 0;\r
+       #if defined(CONFIG_THREE_FB_BUFFER)\r
+               size = ((H_VD)*(V_VD)<<2)* 3; //three buffer\r
+       #else\r
+               size = ((H_VD)*(V_VD)<<2)<<1; //two buffer\r
+       #endif\r
+       return ALIGN(size,SZ_1M);\r
+}\r
 \r

diff --git a/drivers/video/display/screen/lcd_hdmi_800x480.c b/drivers/video/display/screen/lcd_hdmi_800x480.c
index 66639130c964f1515f722377b68131199f49b3f9..cf2653c1e9e9d2d4d5c853a134fa063c27b4c982 100644 (file)
--- a/drivers/video/display/screen/lcd_hdmi_800x480.c
+++ b/drivers/video/display/screen/lcd_hdmi_800x480.c
@@ -1,20 +1,20 @@
-#include <linux/fb.h>\r
-#include <linux/delay.h>\r
-#include <mach/gpio.h>\r
-#include <mach/iomux.h>\r
-#include <mach/board.h>\r
-#include "screen.h"\r
-#include <linux/hdmi.h>\r
-#include "../../rk29_fb.h"\r
-#include "../transmitter/rk610_lcd.h"\r
-\r
-/* Base */\r
-#define OUT_TYPE               SCREEN_RGB\r
-\r
-#define OUT_FACE               OUT_P888  \r
-#define OUT_CLK                        33000000\r
-#define LCDC_ACLK        150000000//312000000           //29 lcdc axi DMA ƵÂÊ\r
-\r
+#include <linux/fb.h>
+#include <linux/delay.h>
+#include <mach/gpio.h>
+#include <mach/iomux.h>
+#include <mach/board.h>
+#include "screen.h"
+#include <linux/hdmi.h>
+#include "../../rk29_fb.h"
+#include "../transmitter/rk610_lcd.h"
+
+/* Base */
+#define OUT_TYPE               SCREEN_RGB
+
+#define OUT_FACE               OUT_P888  
+#define OUT_CLK                        33000000
+#define LCDC_ACLK        150000000//312000000           //29 lcdc axi DMA ƵÂÊ
+
 /* Timing */
 #define H_PW                   1
 #define H_BP                   88
@@ -24,253 +24,264 @@
 #define V_PW                   3
 #define V_BP                   29
 #define V_VD                   480
-#define V_FP                   13\r
-\r
-#define LCD_WIDTH       154\r
-#define LCD_HEIGHT      85\r
-\r
-/* scaler Timing    */\r
-//1920*1080*60\r
-\r
-#define S_OUT_CLK              SCALE_RATE(148500000,33000000)\r
-#define S_H_PW                 1\r
-#define S_H_BP                 88\r
-#define S_H_VD                 800\r
-#define S_H_FP                 211\r
-\r
-#define S_V_PW                 3\r
-#define S_V_BP                 10\r
-#define S_V_VD                 480\r
-#define S_V_FP                 7\r
-\r
-#define S_H_ST                 244\r
-#define S_V_ST                 11\r
-\r
-//1920*1080*50\r
-#define S1_OUT_CLK             SCALE_RATE(148500000,30375000)\r
-#define S1_H_PW                        1\r
-#define S1_H_BP                        88\r
-#define S1_H_VD                        800\r
-#define S1_H_FP                        326\r
-
-#define S1_V_PW                        3\r
-#define S1_V_BP                        9\r
-#define S1_V_VD                        480\r
-#define S1_V_FP                        8\r
-\r
-#define S1_H_ST                        270\r
-#define S1_V_ST                        13\r
-//1280*720*60\r
-#define S2_OUT_CLK             SCALE_RATE(74250000,33000000)\r
-#define S2_H_PW                        1\r
-#define S2_H_BP                        88\r
-#define S2_H_VD                        800\r
-#define S2_H_FP                        211\r
-
-#define S2_V_PW                        3\r
-#define S2_V_BP                        9\r
-#define S2_V_VD                        480\r
-#define S2_V_FP                        8\r
-\r
-#define S2_H_ST                        0\r
-#define S2_V_ST                        8\r
-//1280*720*50\r
-\r
-#define S3_OUT_CLK             SCALE_RATE(74250000,30375000)\r
-#define S3_H_PW                        1\r
-#define S3_H_BP                        88\r
-#define S3_H_VD                        800\r
-#define S3_H_FP                        326\r
-
-#define S3_V_PW                        3\r
-#define S3_V_BP                        9\r
-#define S3_V_VD                        480\r
-#define S3_V_FP                        8\r
-\r
-#define S3_H_ST                        0\r
-#define S3_V_ST                        8\r
-\r
-//720*576*50\r
-#define S4_OUT_CLK             SCALE_RATE(27000000,30000000)\r
-#define S4_H_PW                        1\r
-#define S4_H_BP                        88\r
-#define S4_H_VD                        800\r
-#define S4_H_FP                        263\r
-
-#define S4_V_PW                        3\r
-#define S4_V_BP                        9\r
-#define S4_V_VD                        480\r
-#define S4_V_FP                        28\r
-\r
-#define S4_H_ST                        0\r
-#define S4_V_ST                        33\r
-//720*480*60\r
-#define S5_OUT_CLK             SCALE_RATE(27000000,31500000)\r
-#define S5_H_PW                        1\r
-#define S5_H_BP                        88\r
-#define S5_H_VD                        800\r
-#define S5_H_FP                        112\r
-
-#define S5_V_PW                        3\r
-#define S5_V_BP                        9\r
-#define S5_V_VD                        480\r
-#define S5_V_FP                        28\r
-\r
-#define S5_H_ST                        0\r
-#define S5_V_ST                        29\r
-\r
-#define S_DCLK_POL       0\r
-\r
-/* Other */\r
-#define DCLK_POL               0\r
-#define SWAP_RB                        0 \r
-#ifdef  CONFIG_HDMI_DUAL_DISP\r
-static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution)\r
-{\r
-    screen->s_clk_inv = S_DCLK_POL;\r
-    screen->s_den_inv = 0;\r
-    screen->s_hv_sync_inv = 0;\r
-    switch(hdmi_resolution){\r
-    case HDMI_1920x1080p_60Hz:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S_OUT_CLK;\r
-               screen->s_hsync_len = S_H_PW;\r
-               screen->s_left_margin = S_H_BP;\r
-               screen->s_right_margin = S_H_FP;\r
-               screen->s_hsync_len = S_H_PW;\r
-               screen->s_upper_margin = S_V_BP;\r
-               screen->s_lower_margin = S_V_FP;\r
-               screen->s_vsync_len = S_V_PW;\r
-               screen->s_hsync_st = S_H_ST;\r
-               screen->s_vsync_st = S_V_ST;\r
-               break;\r
-       case HDMI_1920x1080p_50Hz:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S1_OUT_CLK;\r
-               screen->s_hsync_len = S1_H_PW;\r
-               screen->s_left_margin = S1_H_BP;\r
-               screen->s_right_margin = S1_H_FP;\r
-               screen->s_hsync_len = S1_H_PW;\r
-               screen->s_upper_margin = S1_V_BP;\r
-               screen->s_lower_margin = S1_V_FP;\r
-               screen->s_vsync_len = S1_V_PW;\r
-               screen->s_hsync_st = S1_H_ST;\r
-               screen->s_vsync_st = S1_V_ST;\r
-               break;\r
-    case HDMI_1280x720p_60Hz:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S2_OUT_CLK;\r
-               screen->s_hsync_len = S2_H_PW;\r
-               screen->s_left_margin = S2_H_BP;\r
-               screen->s_right_margin = S2_H_FP;\r
-               screen->s_hsync_len = S2_H_PW;\r
-               screen->s_upper_margin = S2_V_BP;\r
-               screen->s_lower_margin = S2_V_FP;\r
-               screen->s_vsync_len = S2_V_PW;\r
-               screen->s_hsync_st = S2_H_ST;\r
-               screen->s_vsync_st = S2_V_ST;\r
-               break;\r
-    case HDMI_1280x720p_50Hz:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S3_OUT_CLK;\r
-               screen->s_hsync_len = S3_H_PW;\r
-               screen->s_left_margin = S3_H_BP;\r
-               screen->s_right_margin = S3_H_FP;\r
-               screen->s_hsync_len = S3_H_PW;\r
-               screen->s_upper_margin = S3_V_BP;\r
-               screen->s_lower_margin = S3_V_FP;\r
-               screen->s_vsync_len = S3_V_PW;\r
-               screen->s_hsync_st = S3_H_ST;\r
-               screen->s_vsync_st = S3_V_ST;\r
-               break;\r
-    case HDMI_720x576p_50Hz_4x3:\r
-    case HDMI_720x576p_50Hz_16x9:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S4_OUT_CLK;\r
-               screen->s_hsync_len = S4_H_PW;\r
-               screen->s_left_margin = S4_H_BP;\r
-               screen->s_right_margin = S4_H_FP;\r
-               screen->s_hsync_len = S4_H_PW;\r
-               screen->s_upper_margin = S4_V_BP;\r
-               screen->s_lower_margin = S4_V_FP;\r
-               screen->s_vsync_len = S4_V_PW;\r
-               screen->s_hsync_st = S4_H_ST;\r
-               screen->s_vsync_st = S4_V_ST;\r
-               break;\r
-    case HDMI_720x480p_60Hz_16x9:\r
-    case HDMI_720x480p_60Hz_4x3:\r
-                /* Scaler Timing    */\r
-            screen->hdmi_resolution = hdmi_resolution;\r
-               screen->s_pixclock = S5_OUT_CLK;\r
-               screen->s_hsync_len = S5_H_PW;\r
-               screen->s_left_margin = S5_H_BP;\r
-               screen->s_right_margin = S5_H_FP;\r
-               screen->s_hsync_len = S5_H_PW;\r
-               screen->s_upper_margin = S5_V_BP;\r
-               screen->s_lower_margin = S5_V_FP;\r
-               screen->s_vsync_len = S5_V_PW;\r
-               screen->s_hsync_st = S5_H_ST;\r
-               screen->s_vsync_st = S5_V_ST;\r
-               break;\r
-    default :\r
-            printk("%s lcd not support dual display at this hdmi resolution %d \n",__func__,hdmi_resolution);\r
-            return -1;\r
-               break;\r
-       }\r
-       \r
-       return 0;\r
-}\r
-#else\r
-static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution){}\r
-#endif\r
-\r
-void set_lcd_info(struct rk29fb_screen *screen,  struct rk29lcd_info *lcd_info )\r
-{\r
-    /* screen type & face */\r
-    screen->type = OUT_TYPE;\r
-    screen->face = OUT_FACE;\r
-\r
-    /* Screen size */\r
-    screen->x_res = H_VD;\r
-    screen->y_res = V_VD;\r
-\r
-    screen->width = LCD_WIDTH;\r
-    screen->height = LCD_HEIGHT;\r
-\r
-    /* Timing */\r
-    screen->lcdc_aclk = LCDC_ACLK;\r
-    screen->pixclock = OUT_CLK;\r
-       screen->left_margin = H_BP;\r
-       screen->right_margin = H_FP;\r
-       screen->hsync_len = H_PW;\r
-       screen->upper_margin = V_BP;\r
-       screen->lower_margin = V_FP;\r
-       screen->vsync_len = V_PW;\r
-       \r
-       /* Pin polarity */\r
-       screen->pin_hsync = 0;\r
-       screen->pin_vsync = 0;\r
-       screen->pin_den = 0;\r
-       screen->pin_dclk = DCLK_POL;\r
-\r
-       /* Swap rule */\r
-    screen->swap_rb = SWAP_RB;\r
-    screen->swap_rg = 0;\r
-    screen->swap_gb = 0;\r
-    screen->swap_delta = 0;\r
-    screen->swap_dumy = 0;\r
-\r
-    /* Operation function*/\r
-    screen->init = NULL;\r
-    screen->standby = NULL;\r
-    screen->sscreen_get = set_scaler_info;\r
-#ifdef CONFIG_RK610_LVDS\r
-    screen->sscreen_set = rk610_lcd_scaler_set_param;\r
-#endif\r
-}\r
-\r
+#define V_FP                   13
+
+#define LCD_WIDTH       154
+#define LCD_HEIGHT      85
+
+/* scaler Timing    */
+//1920*1080*60
+
+#define S_OUT_CLK              SCALE_RATE(148500000,33000000)
+#define S_H_PW                 1
+#define S_H_BP                 88
+#define S_H_VD                 800
+#define S_H_FP                 211
+
+#define S_V_PW                 3
+#define S_V_BP                 10
+#define S_V_VD                 480
+#define S_V_FP                 7
+
+#define S_H_ST                 244
+#define S_V_ST                 11
+
+//1920*1080*50
+#define S1_OUT_CLK             SCALE_RATE(148500000,30375000)
+#define S1_H_PW                        1
+#define S1_H_BP                        88
+#define S1_H_VD                        800
+#define S1_H_FP                        326
+
+#define S1_V_PW                        3
+#define S1_V_BP                        9
+#define S1_V_VD                        480
+#define S1_V_FP                        8
+
+#define S1_H_ST                        270
+#define S1_V_ST                        13
+//1280*720*60
+#define S2_OUT_CLK             SCALE_RATE(74250000,33000000)
+#define S2_H_PW                        1
+#define S2_H_BP                        88
+#define S2_H_VD                        800
+#define S2_H_FP                        211
+
+#define S2_V_PW                        3
+#define S2_V_BP                        9
+#define S2_V_VD                        480
+#define S2_V_FP                        8
+
+#define S2_H_ST                        0
+#define S2_V_ST                        8
+//1280*720*50
+
+#define S3_OUT_CLK             SCALE_RATE(74250000,30375000)
+#define S3_H_PW                        1
+#define S3_H_BP                        88
+#define S3_H_VD                        800
+#define S3_H_FP                        326
+
+#define S3_V_PW                        3
+#define S3_V_BP                        9
+#define S3_V_VD                        480
+#define S3_V_FP                        8
+
+#define S3_H_ST                        0
+#define S3_V_ST                        8
+
+//720*576*50
+#define S4_OUT_CLK             SCALE_RATE(27000000,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             SCALE_RATE(27000000,31500000)
+#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       0
+
+/* Other */
+#define DCLK_POL               0
+#define SWAP_RB                        0 
+#ifdef  CONFIG_HDMI_DUAL_DISP
+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;
+    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->hdmi_resolution = hdmi_resolution;
+               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_4x3:
+    case HDMI_720x576p_50Hz_16x9:
+                /* 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_16x9:
+    case HDMI_720x480p_60Hz_4x3:
+                /* 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
+static int set_scaler_info(struct rk29fb_screen *screen, u8 hdmi_resolution){}
+#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 size */
+    screen->x_res = H_VD;
+    screen->y_res = V_VD;
+
+    screen->width = LCD_WIDTH;
+    screen->height = LCD_HEIGHT;
+
+    /* 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;
+       screen->upper_margin = V_BP;
+       screen->lower_margin = V_FP;
+       screen->vsync_len = V_PW;
+       
+       /* Pin polarity */
+       screen->pin_hsync = 0;
+       screen->pin_vsync = 0;
+       screen->pin_den = 0;
+       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->sscreen_get = set_scaler_info;
+#ifdef CONFIG_RK610_LVDS
+    screen->sscreen_set = rk610_lcd_scaler_set_param;
+#endif
+}
+
+size_t get_fb_size(void)
+{
+       size_t size = 0;
+       #if defined(CONFIG_THREE_FB_BUFFER)
+               size = ((H_VD)*(V_VD)<<2)* 3; //three buffer
+       #else
+               size = ((H_VD)*(V_VD)<<2)<<1; //two buffer
+       #endif
+       return ALIGN(size,SZ_1M);
+}
+