Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 6488867c 编写于 作者: F Florian Tobias Schandinat
浏览文件
操作

Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next

上级 4d740801 4ce36bbb
展开全部 隐藏空白更改
内联 并排
Showing with 391 addition and 916 deletion
drivers/video/via/dvi.c
浏览文件 @ 6488867c
...@@ -172,30 +172,20 @@ static int tmds_register_read_bytes(int index, u8 *buff, int buff_len) ...@@ -172,30 +172,20 @@ static int tmds_register_read_bytes(int index, u8 *buff, int buff_len)
} }
/* DVI Set Mode */ /* DVI Set Mode */
void viafb_dvi_set_mode(struct VideoModeTable *mode, int mode_bpp, void viafb_dvi_set_mode(const struct fb_var_screeninfo *var, int iga)
int set_iga)
{ {
struct VideoModeTable *rb_mode; struct fb_var_screeninfo dvi_var = *var;
struct crt_mode_table *pDviTiming; struct crt_mode_table *rb_mode;
unsigned long desirePixelClock, maxPixelClock; int maxPixelClock;
pDviTiming = mode->crtc;
desirePixelClock = pDviTiming->refresh_rate maxPixelClock = viaparinfo->shared->tmds_setting_info.max_pixel_clock;
* pDviTiming->crtc.hor_total * pDviTiming->crtc.ver_total if (maxPixelClock && PICOS2KHZ(var->pixclock) / 1000 > maxPixelClock) {
/ 1000000; rb_mode = viafb_get_best_rb_mode(var->xres, var->yres, 60);
maxPixelClock = (unsigned long)viaparinfo-> if (rb_mode)
tmds_setting_info->max_pixel_clock; viafb_fill_var_timing_info(&dvi_var, rb_mode);
DEBUG_MSG(KERN_INFO "\nDVI_set_mode!!\n");
if ((maxPixelClock != 0) && (desirePixelClock > maxPixelClock)) {
rb_mode = viafb_get_rb_mode(mode->crtc[0].crtc.hor_addr,
mode->crtc[0].crtc.ver_addr);
if (rb_mode) {
mode = rb_mode;
pDviTiming = rb_mode->crtc;
}
} }
viafb_fill_crtc_timing(pDviTiming, mode, mode_bpp / 8, set_iga);
viafb_fill_crtc_timing(&dvi_var, iga);
} }
/* Sense DVI Connector */ /* Sense DVI Connector */
......
drivers/video/via/dvi.h
浏览文件 @ 6488867c
...@@ -59,7 +59,6 @@ void viafb_dvi_enable(void); ...@@ -59,7 +59,6 @@ void viafb_dvi_enable(void);
bool __devinit viafb_tmds_trasmitter_identify(void); bool __devinit viafb_tmds_trasmitter_identify(void);
void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip, void __devinit viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
struct tmds_setting_information *tmds_setting); struct tmds_setting_information *tmds_setting);
void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp, void viafb_dvi_set_mode(const struct fb_var_screeninfo *var, int iga);
int set_iga);
#endif /* __DVI_H__ */ #endif /* __DVI_H__ */
drivers/video/via/global.c
浏览文件 @ 6488867c
...@@ -35,6 +35,8 @@ int viafb_LCD_ON ; ...@@ -35,6 +35,8 @@ int viafb_LCD_ON ;
int viafb_LCD2_ON; int viafb_LCD2_ON;
int viafb_SAMM_ON; int viafb_SAMM_ON;
int viafb_dual_fb; int viafb_dual_fb;
unsigned int viafb_second_xres = 640;
unsigned int viafb_second_yres = 480;
int viafb_hotplug_Xres = 640; int viafb_hotplug_Xres = 640;
int viafb_hotplug_Yres = 480; int viafb_hotplug_Yres = 480;
int viafb_hotplug_bpp = 32; int viafb_hotplug_bpp = 32;
......
drivers/video/via/global.h
浏览文件 @ 6488867c
...@@ -67,6 +67,8 @@ extern int viafb_lcd_dsp_method; ...@@ -67,6 +67,8 @@ extern int viafb_lcd_dsp_method;
extern int viafb_lcd_mode; extern int viafb_lcd_mode;
extern int viafb_CRT_ON; extern int viafb_CRT_ON;
extern unsigned int viafb_second_xres;
extern unsigned int viafb_second_yres;
extern int viafb_hotplug_Xres; extern int viafb_hotplug_Xres;
extern int viafb_hotplug_Yres; extern int viafb_hotplug_Yres;
extern int viafb_hotplug_bpp; extern int viafb_hotplug_bpp;
......
drivers/video/via/hw.c
浏览文件 @ 6488867c
此差异已折叠。
drivers/video/via/hw.h
浏览文件 @ 6488867c
...@@ -51,40 +51,6 @@ ...@@ -51,40 +51,6 @@
#define VIA_HSYNC_NEGATIVE 0x01 #define VIA_HSYNC_NEGATIVE 0x01
#define VIA_VSYNC_NEGATIVE 0x02 #define VIA_VSYNC_NEGATIVE 0x02
/***************************************************
* Definition IGA1 Design Method of CRTC Registers *
****************************************************/
#define IGA1_HOR_TOTAL_FORMULA(x) (((x)/8)-5)
#define IGA1_HOR_ADDR_FORMULA(x) (((x)/8)-1)
#define IGA1_HOR_BLANK_START_FORMULA(x) (((x)/8)-1)
#define IGA1_HOR_BLANK_END_FORMULA(x, y) (((x+y)/8)-1)
#define IGA1_HOR_SYNC_START_FORMULA(x) ((x)/8)
#define IGA1_HOR_SYNC_END_FORMULA(x, y) ((x+y)/8)
#define IGA1_VER_TOTAL_FORMULA(x) ((x)-2)
#define IGA1_VER_ADDR_FORMULA(x) ((x)-1)
#define IGA1_VER_BLANK_START_FORMULA(x) ((x)-1)
#define IGA1_VER_BLANK_END_FORMULA(x, y) ((x+y)-1)
#define IGA1_VER_SYNC_START_FORMULA(x) ((x)-1)
#define IGA1_VER_SYNC_END_FORMULA(x, y) ((x+y)-1)
/***************************************************
** Definition IGA2 Design Method of CRTC Registers *
****************************************************/
#define IGA2_HOR_TOTAL_FORMULA(x) ((x)-1)
#define IGA2_HOR_ADDR_FORMULA(x) ((x)-1)
#define IGA2_HOR_BLANK_START_FORMULA(x) ((x)-1)
#define IGA2_HOR_BLANK_END_FORMULA(x, y) ((x+y)-1)
#define IGA2_HOR_SYNC_START_FORMULA(x) ((x)-1)
#define IGA2_HOR_SYNC_END_FORMULA(x, y) ((x+y)-1)
#define IGA2_VER_TOTAL_FORMULA(x) ((x)-1)
#define IGA2_VER_ADDR_FORMULA(x) ((x)-1)
#define IGA2_VER_BLANK_START_FORMULA(x) ((x)-1)
#define IGA2_VER_BLANK_END_FORMULA(x, y) ((x+y)-1)
#define IGA2_VER_SYNC_START_FORMULA(x) ((x)-1)
#define IGA2_VER_SYNC_END_FORMULA(x, y) ((x+y)-1)
/**********************************************************/ /**********************************************************/
/* Definition IGA2 Design Method of CRTC Shadow Registers */ /* Definition IGA2 Design Method of CRTC Shadow Registers */
/**********************************************************/ /**********************************************************/
...@@ -97,33 +63,6 @@ ...@@ -97,33 +63,6 @@
#define IGA2_VER_SYNC_START_SHADOW_FORMULA(x) (x) #define IGA2_VER_SYNC_START_SHADOW_FORMULA(x) (x)
#define IGA2_VER_SYNC_END_SHADOW_FORMULA(x, y) (x+y) #define IGA2_VER_SYNC_END_SHADOW_FORMULA(x, y) (x+y)
/* Define Register Number for IGA1 CRTC Timing */
/* location: {CR00,0,7},{CR36,3,3} */
#define IGA1_HOR_TOTAL_REG_NUM 2
/* location: {CR01,0,7} */
#define IGA1_HOR_ADDR_REG_NUM 1
/* location: {CR02,0,7} */
#define IGA1_HOR_BLANK_START_REG_NUM 1
/* location: {CR03,0,4},{CR05,7,7},{CR33,5,5} */
#define IGA1_HOR_BLANK_END_REG_NUM 3
/* location: {CR04,0,7},{CR33,4,4} */
#define IGA1_HOR_SYNC_START_REG_NUM 2
/* location: {CR05,0,4} */
#define IGA1_HOR_SYNC_END_REG_NUM 1
/* location: {CR06,0,7},{CR07,0,0},{CR07,5,5},{CR35,0,0} */
#define IGA1_VER_TOTAL_REG_NUM 4
/* location: {CR12,0,7},{CR07,1,1},{CR07,6,6},{CR35,2,2} */
#define IGA1_VER_ADDR_REG_NUM 4
/* location: {CR15,0,7},{CR07,3,3},{CR09,5,5},{CR35,3,3} */
#define IGA1_VER_BLANK_START_REG_NUM 4
/* location: {CR16,0,7} */
#define IGA1_VER_BLANK_END_REG_NUM 1
/* location: {CR10,0,7},{CR07,2,2},{CR07,7,7},{CR35,1,1} */
#define IGA1_VER_SYNC_START_REG_NUM 4
/* location: {CR11,0,3} */
#define IGA1_VER_SYNC_END_REG_NUM 1
/* Define Register Number for IGA2 Shadow CRTC Timing */ /* Define Register Number for IGA2 Shadow CRTC Timing */
/* location: {CR6D,0,7},{CR71,3,3} */ /* location: {CR6D,0,7},{CR71,3,3} */
...@@ -143,37 +82,6 @@ ...@@ -143,37 +82,6 @@
/* location: {CR76,0,3} */ /* location: {CR76,0,3} */
#define IGA2_SHADOW_VER_SYNC_END_REG_NUM 1 #define IGA2_SHADOW_VER_SYNC_END_REG_NUM 1
/* Define Register Number for IGA2 CRTC Timing */
/* location: {CR50,0,7},{CR55,0,3} */
#define IGA2_HOR_TOTAL_REG_NUM 2
/* location: {CR51,0,7},{CR55,4,6} */
#define IGA2_HOR_ADDR_REG_NUM 2
/* location: {CR52,0,7},{CR54,0,2} */
#define IGA2_HOR_BLANK_START_REG_NUM 2
/* location: CLE266: {CR53,0,7},{CR54,3,5} => CLE266's CR5D[6]
is reserved, so it may have problem to set 1600x1200 on IGA2. */
/* Others: {CR53,0,7},{CR54,3,5},{CR5D,6,6} */
#define IGA2_HOR_BLANK_END_REG_NUM 3
/* location: {CR56,0,7},{CR54,6,7},{CR5C,7,7} */
/* VT3314 and Later: {CR56,0,7},{CR54,6,7},{CR5C,7,7}, {CR5D,7,7} */
#define IGA2_HOR_SYNC_START_REG_NUM 4
/* location: {CR57,0,7},{CR5C,6,6} */
#define IGA2_HOR_SYNC_END_REG_NUM 2
/* location: {CR58,0,7},{CR5D,0,2} */
#define IGA2_VER_TOTAL_REG_NUM 2
/* location: {CR59,0,7},{CR5D,3,5} */
#define IGA2_VER_ADDR_REG_NUM 2
/* location: {CR5A,0,7},{CR5C,0,2} */
#define IGA2_VER_BLANK_START_REG_NUM 2
/* location: {CR5E,0,7},{CR5C,3,5} */
#define IGA2_VER_BLANK_END_REG_NUM 2
/* location: {CR5E,0,7},{CR5F,5,7} */
#define IGA2_VER_SYNC_START_REG_NUM 2
/* location: {CR5F,0,4} */
#define IGA2_VER_SYNC_END_REG_NUM 1
/* Define Fetch Count Register*/ /* Define Fetch Count Register*/
/* location: {SR1C,0,7},{SR1D,0,1} */ /* location: {SR1C,0,7},{SR1D,0,1} */
...@@ -446,87 +354,12 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */ ...@@ -446,87 +354,12 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */
/* location: {CR78,0,7},{CR79,6,7} */ /* location: {CR78,0,7},{CR79,6,7} */
#define LCD_VER_SCALING_FACTOR_REG_NUM_CLE 2 #define LCD_VER_SCALING_FACTOR_REG_NUM_CLE 2
/************************************************
***** Define IGA1 Display Timing *****
************************************************/
struct io_register { struct io_register {
u8 io_addr; u8 io_addr;
u8 start_bit; u8 start_bit;
u8 end_bit; u8 end_bit;
}; };
/* IGA1 Horizontal Total */
struct iga1_hor_total {
int reg_num;
struct io_register reg[IGA1_HOR_TOTAL_REG_NUM];
};
/* IGA1 Horizontal Addressable Video */
struct iga1_hor_addr {
int reg_num;
struct io_register reg[IGA1_HOR_ADDR_REG_NUM];
};
/* IGA1 Horizontal Blank Start */
struct iga1_hor_blank_start {
int reg_num;
struct io_register reg[IGA1_HOR_BLANK_START_REG_NUM];
};
/* IGA1 Horizontal Blank End */
struct iga1_hor_blank_end {
int reg_num;
struct io_register reg[IGA1_HOR_BLANK_END_REG_NUM];
};
/* IGA1 Horizontal Sync Start */
struct iga1_hor_sync_start {
int reg_num;
struct io_register reg[IGA1_HOR_SYNC_START_REG_NUM];
};
/* IGA1 Horizontal Sync End */
struct iga1_hor_sync_end {
int reg_num;
struct io_register reg[IGA1_HOR_SYNC_END_REG_NUM];
};
/* IGA1 Vertical Total */
struct iga1_ver_total {
int reg_num;
struct io_register reg[IGA1_VER_TOTAL_REG_NUM];
};
/* IGA1 Vertical Addressable Video */
struct iga1_ver_addr {
int reg_num;
struct io_register reg[IGA1_VER_ADDR_REG_NUM];
};
/* IGA1 Vertical Blank Start */
struct iga1_ver_blank_start {
int reg_num;
struct io_register reg[IGA1_VER_BLANK_START_REG_NUM];
};
/* IGA1 Vertical Blank End */
struct iga1_ver_blank_end {
int reg_num;
struct io_register reg[IGA1_VER_BLANK_END_REG_NUM];
};
/* IGA1 Vertical Sync Start */
struct iga1_ver_sync_start {
int reg_num;
struct io_register reg[IGA1_VER_SYNC_START_REG_NUM];
};
/* IGA1 Vertical Sync End */
struct iga1_ver_sync_end {
int reg_num;
struct io_register reg[IGA1_VER_SYNC_END_REG_NUM];
};
/***************************************************** /*****************************************************
** Define IGA2 Shadow Display Timing **** ** Define IGA2 Shadow Display Timing ****
*****************************************************/ *****************************************************/
...@@ -579,82 +412,6 @@ struct iga2_shadow_ver_sync_end { ...@@ -579,82 +412,6 @@ struct iga2_shadow_ver_sync_end {
struct io_register reg[IGA2_SHADOW_VER_SYNC_END_REG_NUM]; struct io_register reg[IGA2_SHADOW_VER_SYNC_END_REG_NUM];
}; };
/*****************************************************
** Define IGA2 Display Timing ****
******************************************************/
/* IGA2 Horizontal Total */
struct iga2_hor_total {
int reg_num;
struct io_register reg[IGA2_HOR_TOTAL_REG_NUM];
};
/* IGA2 Horizontal Addressable Video */
struct iga2_hor_addr {
int reg_num;
struct io_register reg[IGA2_HOR_ADDR_REG_NUM];
};
/* IGA2 Horizontal Blank Start */
struct iga2_hor_blank_start {
int reg_num;
struct io_register reg[IGA2_HOR_BLANK_START_REG_NUM];
};
/* IGA2 Horizontal Blank End */
struct iga2_hor_blank_end {
int reg_num;
struct io_register reg[IGA2_HOR_BLANK_END_REG_NUM];
};
/* IGA2 Horizontal Sync Start */
struct iga2_hor_sync_start {
int reg_num;
struct io_register reg[IGA2_HOR_SYNC_START_REG_NUM];
};
/* IGA2 Horizontal Sync End */
struct iga2_hor_sync_end {
int reg_num;
struct io_register reg[IGA2_HOR_SYNC_END_REG_NUM];
};
/* IGA2 Vertical Total */
struct iga2_ver_total {
int reg_num;
struct io_register reg[IGA2_VER_TOTAL_REG_NUM];
};
/* IGA2 Vertical Addressable Video */
struct iga2_ver_addr {
int reg_num;
struct io_register reg[IGA2_VER_ADDR_REG_NUM];
};
/* IGA2 Vertical Blank Start */
struct iga2_ver_blank_start {
int reg_num;
struct io_register reg[IGA2_VER_BLANK_START_REG_NUM];
};
/* IGA2 Vertical Blank End */
struct iga2_ver_blank_end {
int reg_num;
struct io_register reg[IGA2_VER_BLANK_END_REG_NUM];
};
/* IGA2 Vertical Sync Start */
struct iga2_ver_sync_start {
int reg_num;
struct io_register reg[IGA2_VER_SYNC_START_REG_NUM];
};
/* IGA2 Vertical Sync End */
struct iga2_ver_sync_end {
int reg_num;
struct io_register reg[IGA2_VER_SYNC_END_REG_NUM];
};
/* IGA1 Fetch Count Register */ /* IGA1 Fetch Count Register */
struct iga1_fetch_count { struct iga1_fetch_count {
int reg_num; int reg_num;
...@@ -817,21 +574,6 @@ struct display_queue_expire_num { ...@@ -817,21 +574,6 @@ struct display_queue_expire_num {
iga2_display_queue_expire_num_reg; iga2_display_queue_expire_num_reg;
}; };
struct iga1_crtc_timing {
struct iga1_hor_total hor_total;
struct iga1_hor_addr hor_addr;
struct iga1_hor_blank_start hor_blank_start;
struct iga1_hor_blank_end hor_blank_end;
struct iga1_hor_sync_start hor_sync_start;
struct iga1_hor_sync_end hor_sync_end;
struct iga1_ver_total ver_total;
struct iga1_ver_addr ver_addr;
struct iga1_ver_blank_start ver_blank_start;
struct iga1_ver_blank_end ver_blank_end;
struct iga1_ver_sync_start ver_sync_start;
struct iga1_ver_sync_end ver_sync_end;
};
struct iga2_shadow_crtc_timing { struct iga2_shadow_crtc_timing {
struct iga2_shadow_hor_total hor_total_shadow; struct iga2_shadow_hor_total hor_total_shadow;
struct iga2_shadow_hor_blank_end hor_blank_end_shadow; struct iga2_shadow_hor_blank_end hor_blank_end_shadow;
...@@ -843,21 +585,6 @@ struct iga2_shadow_crtc_timing { ...@@ -843,21 +585,6 @@ struct iga2_shadow_crtc_timing {
struct iga2_shadow_ver_sync_end ver_sync_end_shadow; struct iga2_shadow_ver_sync_end ver_sync_end_shadow;
}; };
struct iga2_crtc_timing {
struct iga2_hor_total hor_total;
struct iga2_hor_addr hor_addr;
struct iga2_hor_blank_start hor_blank_start;
struct iga2_hor_blank_end hor_blank_end;
struct iga2_hor_sync_start hor_sync_start;
struct iga2_hor_sync_end hor_sync_end;
struct iga2_ver_total ver_total;
struct iga2_ver_addr ver_addr;
struct iga2_ver_blank_start ver_blank_start;
struct iga2_ver_blank_end ver_blank_end;
struct iga2_ver_sync_start ver_sync_start;
struct iga2_ver_sync_end ver_sync_end;
};
/* device ID */ /* device ID */
#define CLE266_FUNCTION3 0x3123 #define CLE266_FUNCTION3 0x3123
#define KM400_FUNCTION3 0x3205 #define KM400_FUNCTION3 0x3205
...@@ -910,9 +637,7 @@ extern int viafb_LCD_ON; ...@@ -910,9 +637,7 @@ extern int viafb_LCD_ON;
extern int viafb_DVI_ON; extern int viafb_DVI_ON;
extern int viafb_hotplug; extern int viafb_hotplug;
void viafb_fill_crtc_timing(struct crt_mode_table *crt_table, void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var, int iga);
struct VideoModeTable *video_mode, int bpp_byte, int set_iga);
void viafb_set_vclock(u32 CLK, int set_iga); void viafb_set_vclock(u32 CLK, int set_iga);
void viafb_load_reg(int timing_value, int viafb_load_reg_num, void viafb_load_reg(int timing_value, int viafb_load_reg_num,
struct io_register *reg, struct io_register *reg,
...@@ -932,13 +657,11 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active); ...@@ -932,13 +657,11 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active);
void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\ void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\
*p_gfx_dpa_setting); *p_gfx_dpa_setting);
int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, int viafb_setmode(int video_bpp, int video_bpp1);
struct VideoModeTable *vmode_tbl1, int video_bpp1); void viafb_fill_var_timing_info(struct fb_var_screeninfo *var,
void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh, struct crt_mode_table *mode);
struct VideoModeTable *vmode_tbl);
void __devinit viafb_init_chip_info(int chip_type); void __devinit viafb_init_chip_info(int chip_type);
void __devinit viafb_init_dac(int set_iga); void __devinit viafb_init_dac(int set_iga);
int viafb_get_pixclock(int hres, int vres, int vmode_refresh);
int viafb_get_refresh(int hres, int vres, u32 float_refresh); int viafb_get_refresh(int hres, int vres, u32 float_refresh);
void viafb_update_device_setting(int hres, int vres, int bpp, int flag); void viafb_update_device_setting(int hres, int vres, int bpp, int flag);
......
drivers/video/via/lcd.c
浏览文件 @ 6488867c
...@@ -548,9 +548,8 @@ static void lcd_patch_skew(struct lvds_setting_information ...@@ -548,9 +548,8 @@ static void lcd_patch_skew(struct lvds_setting_information
} }
/* LCD Set Mode */ /* LCD Set Mode */
void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, void viafb_lcd_set_mode(struct lvds_setting_information *plvds_setting_info,
struct lvds_setting_information *plvds_setting_info, struct lvds_chip_information *plvds_chip_info)
struct lvds_chip_information *plvds_chip_info)
{ {
int set_iga = plvds_setting_info->iga_path; int set_iga = plvds_setting_info->iga_path;
int mode_bpp = plvds_setting_info->bpp; int mode_bpp = plvds_setting_info->bpp;
...@@ -559,16 +558,15 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, ...@@ -559,16 +558,15 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
int panel_hres = plvds_setting_info->lcd_panel_hres; int panel_hres = plvds_setting_info->lcd_panel_hres;
int panel_vres = plvds_setting_info->lcd_panel_vres; int panel_vres = plvds_setting_info->lcd_panel_vres;
u32 clock; u32 clock;
struct display_timing mode_crt_reg, panel_crt_reg; struct display_timing mode_crt_reg, panel_crt_reg, timing;
struct crt_mode_table *panel_crt_table = NULL; struct crt_mode_table *mode_crt_table, *panel_crt_table;
struct VideoModeTable *vmode_tbl = viafb_get_mode(panel_hres,
panel_vres);
DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n"); DEBUG_MSG(KERN_INFO "viafb_lcd_set_mode!!\n");
/* Get mode table */ /* Get mode table */
mode_crt_table = viafb_get_best_mode(set_hres, set_vres, 60);
mode_crt_reg = mode_crt_table->crtc; mode_crt_reg = mode_crt_table->crtc;
/* Get panel table Pointer */ /* Get panel table Pointer */
panel_crt_table = vmode_tbl->crtc; panel_crt_table = viafb_get_best_mode(panel_hres, panel_vres, 60);
panel_crt_reg = panel_crt_table->crtc; panel_crt_reg = panel_crt_table->crtc;
DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n"); DEBUG_MSG(KERN_INFO "bellow viafb_lcd_set_mode!!\n");
if (VT1636_LVDS == plvds_chip_info->lvds_chip_name) if (VT1636_LVDS == plvds_chip_info->lvds_chip_name)
...@@ -576,31 +574,28 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, ...@@ -576,31 +574,28 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table,
clock = panel_crt_reg.hor_total * panel_crt_reg.ver_total clock = panel_crt_reg.hor_total * panel_crt_reg.ver_total
* panel_crt_table->refresh_rate; * panel_crt_table->refresh_rate;
plvds_setting_info->vclk = clock; plvds_setting_info->vclk = clock;
if (set_iga == IGA1) {
/* IGA1 doesn't have LCD scaling, so set it as centering. */ if (set_iga == IGA2 && (set_hres < panel_hres || set_vres < panel_vres)
viafb_load_crtc_timing(lcd_centering_timging && plvds_setting_info->display_method == LCD_EXPANDSION) {
(mode_crt_reg, panel_crt_reg), IGA1); timing = panel_crt_reg;
load_lcd_scaling(set_hres, set_vres, panel_hres, panel_vres);
} else { } else {
/* Expansion */ timing = lcd_centering_timging(mode_crt_reg, panel_crt_reg);
if (plvds_setting_info->display_method == LCD_EXPANDSION if (set_iga == IGA2)
&& (set_hres < panel_hres || set_vres < panel_vres)) { /* disable scaling */
/* expansion timing IGA2 loaded panel set timing*/ via_write_reg_mask(VIACR, 0x79, 0x00,
viafb_load_crtc_timing(panel_crt_reg, IGA2);
DEBUG_MSG(KERN_INFO "viafb_load_crtc_timing!!\n");
load_lcd_scaling(set_hres, set_vres, panel_hres,
panel_vres);
DEBUG_MSG(KERN_INFO "load_lcd_scaling!!\n");
} else { /* Centering */
/* centering timing IGA2 always loaded panel
and mode releative timing */
viafb_load_crtc_timing(lcd_centering_timging
(mode_crt_reg, panel_crt_reg), IGA2);
viafb_write_reg_mask(CR79, VIACR, 0x00,
BIT0 + BIT1 + BIT2); BIT0 + BIT1 + BIT2);
/* LCD scaling disabled */
}
} }
timing.hor_blank_end += timing.hor_blank_start;
timing.hor_sync_end += timing.hor_sync_start;
timing.ver_blank_end += timing.ver_blank_start;
timing.ver_sync_end += timing.ver_sync_start;
if (set_iga == IGA1)
via_set_primary_timing(&timing);
else if (set_iga == IGA2)
via_set_secondary_timing(&timing);
/* Fetch count for IGA2 only */ /* Fetch count for IGA2 only */
viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga); viafb_load_fetch_count_reg(set_hres, mode_bpp / 8, set_iga);
......
drivers/video/via/lcd.h
浏览文件 @ 6488867c
...@@ -76,16 +76,13 @@ void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information ...@@ -76,16 +76,13 @@ void __devinit viafb_init_lvds_output_interface(struct lvds_chip_information
*plvds_chip_info, *plvds_chip_info,
struct lvds_setting_information struct lvds_setting_information
*plvds_setting_info); *plvds_setting_info);
void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, void viafb_lcd_set_mode(struct lvds_setting_information *plvds_setting_info,
struct lvds_setting_information *plvds_setting_info, struct lvds_chip_information *plvds_chip_info);
struct lvds_chip_information *plvds_chip_info);
bool __devinit viafb_lvds_trasmitter_identify(void); bool __devinit viafb_lvds_trasmitter_identify(void);
void viafb_init_lvds_output_interface(struct lvds_chip_information void viafb_init_lvds_output_interface(struct lvds_chip_information
*plvds_chip_info, *plvds_chip_info,
struct lvds_setting_information struct lvds_setting_information
*plvds_setting_info); *plvds_setting_info);
bool viafb_lcd_get_mobile_state(bool *mobile); bool viafb_lcd_get_mobile_state(bool *mobile);
void viafb_load_crtc_timing(struct display_timing device_timing,
int set_iga);
#endif /* __LCD_H__ */ #endif /* __LCD_H__ */
drivers/video/via/share.h
浏览文件 @ 6488867c
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
#ifndef __SHARE_H__ #ifndef __SHARE_H__
#define __SHARE_H__ #define __SHARE_H__
#include "via_modesetting.h"
/* Define Bit Field */ /* Define Bit Field */
#define BIT0 0x01 #define BIT0 0x01
#define BIT1 0x02 #define BIT1 0x02
...@@ -634,10 +636,6 @@ ...@@ -634,10 +636,6 @@
#define V_SYNC_SATRT_SHADOW_INDEX 18 #define V_SYNC_SATRT_SHADOW_INDEX 18
#define V_SYNC_END_SHADOW_INDEX 19 #define V_SYNC_END_SHADOW_INDEX 19
/* Definition Video Mode Pixel Clock (picoseconds)
*/
#define RES_640X480_60HZ_PIXCLOCK 39722
/* LCD display method /* LCD display method
*/ */
#define LCD_EXPANDSION 0x00 #define LCD_EXPANDSION 0x00
...@@ -648,23 +646,6 @@ ...@@ -648,23 +646,6 @@
#define LCD_OPENLDI 0x00 #define LCD_OPENLDI 0x00
#define LCD_SPWG 0x01 #define LCD_SPWG 0x01
/* Define display timing
*/
struct display_timing {
u16 hor_total;
u16 hor_addr;
u16 hor_blank_start;
u16 hor_blank_end;
u16 hor_sync_start;
u16 hor_sync_end;
u16 ver_total;
u16 ver_addr;
u16 ver_blank_start;
u16 ver_blank_end;
u16 ver_sync_start;
u16 ver_sync_end;
};
struct crt_mode_table { struct crt_mode_table {
int refresh_rate; int refresh_rate;
int h_sync_polarity; int h_sync_polarity;
......
drivers/video/via/via-core.c
浏览文件 @ 6488867c
...@@ -35,7 +35,7 @@ static struct via_port_cfg adap_configs[] = { ...@@ -35,7 +35,7 @@ static struct via_port_cfg adap_configs[] = {
* The OLPC XO-1.5 puts the camera power and reset lines onto * The OLPC XO-1.5 puts the camera power and reset lines onto
* GPIO 2C. * GPIO 2C.
*/ */
static const struct via_port_cfg olpc_adap_configs[] = { static struct via_port_cfg olpc_adap_configs[] = {
[VIA_PORT_26] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x26 }, [VIA_PORT_26] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x26 },
[VIA_PORT_31] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x31 }, [VIA_PORT_31] = { VIA_PORT_I2C, VIA_MODE_I2C, VIASR, 0x31 },
[VIA_PORT_25] = { VIA_PORT_GPIO, VIA_MODE_GPIO, VIASR, 0x25 }, [VIA_PORT_25] = { VIA_PORT_GPIO, VIA_MODE_GPIO, VIASR, 0x25 },
......
drivers/video/via/via_modesetting.c
浏览文件 @ 6488867c
...@@ -29,6 +29,110 @@ ...@@ -29,6 +29,110 @@
#include "share.h" #include "share.h"
#include "debug.h" #include "debug.h"
void via_set_primary_timing(const struct display_timing *timing)
{
struct display_timing raw;
raw.hor_total = timing->hor_total / 8 - 5;
raw.hor_addr = timing->hor_addr / 8 - 1;
raw.hor_blank_start = timing->hor_blank_start / 8 - 1;
raw.hor_blank_end = timing->hor_blank_end / 8 - 1;
raw.hor_sync_start = timing->hor_sync_start / 8;
raw.hor_sync_end = timing->hor_sync_end / 8;
raw.ver_total = timing->ver_total - 2;
raw.ver_addr = timing->ver_addr - 1;
raw.ver_blank_start = timing->ver_blank_start - 1;
raw.ver_blank_end = timing->ver_blank_end - 1;
raw.ver_sync_start = timing->ver_sync_start - 1;
raw.ver_sync_end = timing->ver_sync_end - 1;
/* unlock timing registers */
via_write_reg_mask(VIACR, 0x11, 0x00, 0x80);
via_write_reg(VIACR, 0x00, raw.hor_total & 0xFF);
via_write_reg(VIACR, 0x01, raw.hor_addr & 0xFF);
via_write_reg(VIACR, 0x02, raw.hor_blank_start & 0xFF);
via_write_reg_mask(VIACR, 0x03, raw.hor_blank_end & 0x1F, 0x1F);
via_write_reg(VIACR, 0x04, raw.hor_sync_start & 0xFF);
via_write_reg_mask(VIACR, 0x05, (raw.hor_sync_end & 0x1F)
| (raw.hor_blank_end << (7 - 5) & 0x80), 0x9F);
via_write_reg(VIACR, 0x06, raw.ver_total & 0xFF);
via_write_reg_mask(VIACR, 0x07, (raw.ver_total >> 8 & 0x01)
| (raw.ver_addr >> (8 - 1) & 0x02)
| (raw.ver_sync_start >> (8 - 2) & 0x04)
| (raw.ver_blank_start >> (8 - 3) & 0x08)
| (raw.ver_total >> (9 - 5) & 0x20)
| (raw.ver_addr >> (9 - 6) & 0x40)
| (raw.ver_sync_start >> (9 - 7) & 0x80), 0xEF);
via_write_reg_mask(VIACR, 0x09, raw.ver_blank_start >> (9 - 5) & 0x20,
0x20);
via_write_reg(VIACR, 0x10, raw.ver_sync_start & 0xFF);
via_write_reg_mask(VIACR, 0x11, raw.ver_sync_end & 0x0F, 0x0F);
via_write_reg(VIACR, 0x12, raw.ver_addr & 0xFF);
via_write_reg(VIACR, 0x15, raw.ver_blank_start & 0xFF);
via_write_reg(VIACR, 0x16, raw.ver_blank_end & 0xFF);
via_write_reg_mask(VIACR, 0x33, (raw.hor_sync_start >> (8 - 4) & 0x10)
| (raw.hor_blank_end >> (6 - 5) & 0x20), 0x30);
via_write_reg_mask(VIACR, 0x35, (raw.ver_total >> 10 & 0x01)
| (raw.ver_sync_start >> (10 - 1) & 0x02)
| (raw.ver_addr >> (10 - 2) & 0x04)
| (raw.ver_blank_start >> (10 - 3) & 0x08), 0x0F);
via_write_reg_mask(VIACR, 0x36, raw.hor_total >> (8 - 3) & 0x08, 0x08);
/* lock timing registers */
via_write_reg_mask(VIACR, 0x11, 0x80, 0x80);
/* reset timing control */
via_write_reg_mask(VIACR, 0x17, 0x00, 0x80);
via_write_reg_mask(VIACR, 0x17, 0x80, 0x80);
}
void via_set_secondary_timing(const struct display_timing *timing)
{
struct display_timing raw;
raw.hor_total = timing->hor_total - 1;
raw.hor_addr = timing->hor_addr - 1;
raw.hor_blank_start = timing->hor_blank_start - 1;
raw.hor_blank_end = timing->hor_blank_end - 1;
raw.hor_sync_start = timing->hor_sync_start - 1;
raw.hor_sync_end = timing->hor_sync_end - 1;
raw.ver_total = timing->ver_total - 1;
raw.ver_addr = timing->ver_addr - 1;
raw.ver_blank_start = timing->ver_blank_start - 1;
raw.ver_blank_end = timing->ver_blank_end - 1;
raw.ver_sync_start = timing->ver_sync_start - 1;
raw.ver_sync_end = timing->ver_sync_end - 1;
via_write_reg(VIACR, 0x50, raw.hor_total & 0xFF);
via_write_reg(VIACR, 0x51, raw.hor_addr & 0xFF);
via_write_reg(VIACR, 0x52, raw.hor_blank_start & 0xFF);
via_write_reg(VIACR, 0x53, raw.hor_blank_end & 0xFF);
via_write_reg(VIACR, 0x54, (raw.hor_blank_start >> 8 & 0x07)
| (raw.hor_blank_end >> (8 - 3) & 0x38)
| (raw.hor_sync_start >> (8 - 6) & 0xC0));
via_write_reg_mask(VIACR, 0x55, (raw.hor_total >> 8 & 0x0F)
| (raw.hor_addr >> (8 - 4) & 0x70), 0x7F);
via_write_reg(VIACR, 0x56, raw.hor_sync_start & 0xFF);
via_write_reg(VIACR, 0x57, raw.hor_sync_end & 0xFF);
via_write_reg(VIACR, 0x58, raw.ver_total & 0xFF);
via_write_reg(VIACR, 0x59, raw.ver_addr & 0xFF);
via_write_reg(VIACR, 0x5A, raw.ver_blank_start & 0xFF);
via_write_reg(VIACR, 0x5B, raw.ver_blank_end & 0xFF);
via_write_reg(VIACR, 0x5C, (raw.ver_blank_start >> 8 & 0x07)
| (raw.ver_blank_end >> (8 - 3) & 0x38)
| (raw.hor_sync_end >> (8 - 6) & 0x40)
| (raw.hor_sync_start >> (10 - 7) & 0x80));
via_write_reg(VIACR, 0x5D, (raw.ver_total >> 8 & 0x07)
| (raw.ver_addr >> (8 - 3) & 0x38)
| (raw.hor_blank_end >> (11 - 6) & 0x40)
| (raw.hor_sync_start >> (11 - 7) & 0x80));
via_write_reg(VIACR, 0x5E, raw.ver_sync_start & 0xFF);
via_write_reg(VIACR, 0x5F, (raw.ver_sync_end & 0x1F)
| (raw.ver_sync_start >> (8 - 5) & 0xE0));
}
void via_set_primary_address(u32 addr) void via_set_primary_address(u32 addr)
{ {
DEBUG_MSG(KERN_DEBUG "via_set_primary_address(0x%08X)\n", addr); DEBUG_MSG(KERN_DEBUG "via_set_primary_address(0x%08X)\n", addr);
......
drivers/video/via/via_modesetting.h
浏览文件 @ 6488867c
...@@ -33,6 +33,24 @@ ...@@ -33,6 +33,24 @@
#define VIA_PITCH_MAX 0x3FF8 #define VIA_PITCH_MAX 0x3FF8
struct display_timing {
u16 hor_total;
u16 hor_addr;
u16 hor_blank_start;
u16 hor_blank_end;
u16 hor_sync_start;
u16 hor_sync_end;
u16 ver_total;
u16 ver_addr;
u16 ver_blank_start;
u16 ver_blank_end;
u16 ver_sync_start;
u16 ver_sync_end;
};
void via_set_primary_timing(const struct display_timing *timing);
void via_set_secondary_timing(const struct display_timing *timing);
void via_set_primary_address(u32 addr); void via_set_primary_address(u32 addr);
void via_set_secondary_address(u32 addr); void via_set_secondary_address(u32 addr);
void via_set_primary_pitch(u32 pitch); void via_set_primary_pitch(u32 pitch);
......
drivers/video/via/viafbdev.c
浏览文件 @ 6488867c
...@@ -38,8 +38,6 @@ static char *viafb_mode1; ...@@ -38,8 +38,6 @@ static char *viafb_mode1;
static int viafb_bpp = 32; static int viafb_bpp = 32;
static int viafb_bpp1 = 32; static int viafb_bpp1 = 32;
static unsigned int viafb_second_xres = 640;
static unsigned int viafb_second_yres = 480;
static unsigned int viafb_second_offset; static unsigned int viafb_second_offset;
static int viafb_second_size; static int viafb_second_size;
...@@ -201,7 +199,6 @@ static int viafb_check_var(struct fb_var_screeninfo *var, ...@@ -201,7 +199,6 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
struct fb_info *info) struct fb_info *info)
{ {
int depth, refresh; int depth, refresh;
struct VideoModeTable *vmode_entry;
struct viafb_par *ppar = info->par; struct viafb_par *ppar = info->par;
u32 line; u32 line;
...@@ -211,8 +208,10 @@ static int viafb_check_var(struct fb_var_screeninfo *var, ...@@ -211,8 +208,10 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE) if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE)
return -EINVAL; return -EINVAL;
vmode_entry = viafb_get_mode(var->xres, var->yres); /* the refresh rate is not important here, as we only want to know
if (!vmode_entry) { * whether the resolution exists
*/
if (!viafb_get_best_mode(var->xres, var->yres, 60)) {
DEBUG_MSG(KERN_INFO DEBUG_MSG(KERN_INFO
"viafb: Mode %dx%dx%d not supported!!\n", "viafb: Mode %dx%dx%d not supported!!\n",
var->xres, var->yres, var->bits_per_pixel); var->xres, var->yres, var->bits_per_pixel);
...@@ -254,7 +253,8 @@ static int viafb_check_var(struct fb_var_screeninfo *var, ...@@ -254,7 +253,8 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
get_var_refresh(var)); get_var_refresh(var));
/* Adjust var according to our driver's own table */ /* Adjust var according to our driver's own table */
viafb_fill_var_timing_info(var, refresh, vmode_entry); viafb_fill_var_timing_info(var,
viafb_get_best_mode(var->xres, var->yres, refresh));
if (var->accel_flags & FB_ACCELF_TEXT && if (var->accel_flags & FB_ACCELF_TEXT &&
!ppar->shared->vdev->engine_mmio) !ppar->shared->vdev->engine_mmio)
var->accel_flags = 0; var->accel_flags = 0;
...@@ -265,7 +265,6 @@ static int viafb_check_var(struct fb_var_screeninfo *var, ...@@ -265,7 +265,6 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
static int viafb_set_par(struct fb_info *info) static int viafb_set_par(struct fb_info *info)
{ {
struct viafb_par *viapar = info->par; struct viafb_par *viapar = info->par;
struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL;
int refresh; int refresh;
DEBUG_MSG(KERN_INFO "viafb_set_par!\n"); DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
...@@ -274,10 +273,7 @@ static int viafb_set_par(struct fb_info *info) ...@@ -274,10 +273,7 @@ static int viafb_set_par(struct fb_info *info)
viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres, viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres,
viafbinfo->var.bits_per_pixel, 0); viafbinfo->var.bits_per_pixel, 0);
vmode_entry = viafb_get_mode(viafbinfo->var.xres, viafbinfo->var.yres);
if (viafb_dual_fb) { if (viafb_dual_fb) {
vmode_entry1 = viafb_get_mode(viafbinfo1->var.xres,
viafbinfo1->var.yres);
viafb_update_device_setting(viafbinfo1->var.xres, viafb_update_device_setting(viafbinfo1->var.xres,
viafbinfo1->var.yres, viafbinfo1->var.bits_per_pixel, viafbinfo1->var.yres, viafbinfo1->var.bits_per_pixel,
1); 1);
...@@ -285,8 +281,6 @@ static int viafb_set_par(struct fb_info *info) ...@@ -285,8 +281,6 @@ static int viafb_set_par(struct fb_info *info)
DEBUG_MSG(KERN_INFO DEBUG_MSG(KERN_INFO
"viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n", "viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",
viafb_second_xres, viafb_second_yres, viafb_bpp1); viafb_second_xres, viafb_second_yres, viafb_bpp1);
vmode_entry1 = viafb_get_mode(viafb_second_xres,
viafb_second_yres);
viafb_update_device_setting(viafb_second_xres, viafb_update_device_setting(viafb_second_xres,
viafb_second_yres, viafb_bpp1, 1); viafb_second_yres, viafb_bpp1, 1);
...@@ -294,7 +288,8 @@ static int viafb_set_par(struct fb_info *info) ...@@ -294,7 +288,8 @@ static int viafb_set_par(struct fb_info *info)
refresh = viafb_get_refresh(info->var.xres, info->var.yres, refresh = viafb_get_refresh(info->var.xres, info->var.yres,
get_var_refresh(&info->var)); get_var_refresh(&info->var));
if (vmode_entry) { if (viafb_get_best_mode(viafbinfo->var.xres, viafbinfo->var.yres,
refresh)) {
if (viafb_dual_fb && viapar->iga_path == IGA2) { if (viafb_dual_fb && viapar->iga_path == IGA2) {
viafb_bpp1 = info->var.bits_per_pixel; viafb_bpp1 = info->var.bits_per_pixel;
viafb_refresh1 = refresh; viafb_refresh1 = refresh;
...@@ -307,8 +302,7 @@ static int viafb_set_par(struct fb_info *info) ...@@ -307,8 +302,7 @@ static int viafb_set_par(struct fb_info *info)
info->flags &= ~FBINFO_HWACCEL_DISABLED; info->flags &= ~FBINFO_HWACCEL_DISABLED;
else else
info->flags |= FBINFO_HWACCEL_DISABLED; info->flags |= FBINFO_HWACCEL_DISABLED;
viafb_setmode(vmode_entry, info->var.bits_per_pixel, viafb_setmode(info->var.bits_per_pixel, viafb_bpp1);
vmode_entry1, viafb_bpp1);
viafb_pan_display(&info->var, info); viafb_pan_display(&info->var, info);
} }
...@@ -1164,7 +1158,8 @@ static ssize_t viafb_dvp0_proc_write(struct file *file, ...@@ -1164,7 +1158,8 @@ static ssize_t viafb_dvp0_proc_write(struct file *file,
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " "); value = strsep(&pbuf, " ");
if (value != NULL) { if (value != NULL) {
strict_strtoul(value, 0, (unsigned long *)&reg_val); if (kstrtou8(value, 0, &reg_val) < 0)
return -EINVAL;
DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i, DEBUG_MSG(KERN_INFO "DVP0:reg_val[%l]=:%x\n", i,
reg_val); reg_val);
switch (i) { switch (i) {
...@@ -1234,7 +1229,8 @@ static ssize_t viafb_dvp1_proc_write(struct file *file, ...@@ -1234,7 +1229,8 @@ static ssize_t viafb_dvp1_proc_write(struct file *file,
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
value = strsep(&pbuf, " "); value = strsep(&pbuf, " ");
if (value != NULL) { if (value != NULL) {
strict_strtoul(value, 0, (unsigned long *)&reg_val); if (kstrtou8(value, 0, &reg_val) < 0)
return -EINVAL;
switch (i) { switch (i) {
case 0: case 0:
viafb_write_reg_mask(CR9B, VIACR, viafb_write_reg_mask(CR9B, VIACR,
...@@ -1292,7 +1288,8 @@ static ssize_t viafb_dfph_proc_write(struct file *file, ...@@ -1292,7 +1288,8 @@ static ssize_t viafb_dfph_proc_write(struct file *file,
if (copy_from_user(&buf[0], buffer, length)) if (copy_from_user(&buf[0], buffer, length))
return -EFAULT; return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */ buf[length - 1] = '\0'; /*Ensure end string */
strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val); if (kstrtou8(buf, 0, &reg_val) < 0)
return -EINVAL;
viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f); viafb_write_reg_mask(CR97, VIACR, reg_val, 0x0f);
return count; return count;
} }
...@@ -1331,7 +1328,8 @@ static ssize_t viafb_dfpl_proc_write(struct file *file, ...@@ -1331,7 +1328,8 @@ static ssize_t viafb_dfpl_proc_write(struct file *file,
if (copy_from_user(&buf[0], buffer, length)) if (copy_from_user(&buf[0], buffer, length))
return -EFAULT; return -EFAULT;
buf[length - 1] = '\0'; /*Ensure end string */ buf[length - 1] = '\0'; /*Ensure end string */
strict_strtoul(&buf[0], 0, (unsigned long *)&reg_val); if (kstrtou8(buf, 0, &reg_val) < 0)
return -EINVAL;
viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f); viafb_write_reg_mask(CR99, VIACR, reg_val, 0x0f);
return count; return count;
} }
...@@ -1400,8 +1398,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file, ...@@ -1400,8 +1398,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " "); value = strsep(&pbuf, " ");
if (value != NULL) { if (value != NULL) {
strict_strtoul(value, 0, if (kstrtou8(value, 0, &reg_val.Data) < 0)
(unsigned long *)&reg_val.Data); return -EINVAL;
switch (i) { switch (i) {
case 0: case 0:
reg_val.Index = 0x08; reg_val.Index = 0x08;
...@@ -1437,8 +1435,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file, ...@@ -1437,8 +1435,8 @@ static ssize_t viafb_vt1636_proc_write(struct file *file,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
value = strsep(&pbuf, " "); value = strsep(&pbuf, " ");
if (value != NULL) { if (value != NULL) {
strict_strtoul(value, 0, if (kstrtou8(value, 0, &reg_val.Data) < 0)
(unsigned long *)&reg_val.Data); return -EINVAL;
switch (i) { switch (i) {
case 0: case 0:
reg_val.Index = 0x08; reg_val.Index = 0x08;
...@@ -1735,7 +1733,6 @@ static struct viafb_pm_hooks viafb_fb_pm_hooks = { ...@@ -1735,7 +1733,6 @@ static struct viafb_pm_hooks viafb_fb_pm_hooks = {
int __devinit via_fb_pci_probe(struct viafb_dev *vdev) int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
{ {
u32 default_xres, default_yres; u32 default_xres, default_yres;
struct VideoModeTable *vmode_entry;
struct fb_var_screeninfo default_var; struct fb_var_screeninfo default_var;
int rc; int rc;
u32 viafb_par_length; u32 viafb_par_length;
...@@ -1808,7 +1805,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) ...@@ -1808,7 +1805,6 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
} }
parse_mode(viafb_mode, &default_xres, &default_yres); parse_mode(viafb_mode, &default_xres, &default_yres);
vmode_entry = viafb_get_mode(default_xres, default_yres);
if (viafb_SAMM_ON == 1) if (viafb_SAMM_ON == 1)
parse_mode(viafb_mode1, &viafb_second_xres, parse_mode(viafb_mode1, &viafb_second_xres,
&viafb_second_yres); &viafb_second_yres);
...@@ -1818,9 +1814,8 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) ...@@ -1818,9 +1814,8 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
default_var.xres_virtual = default_xres; default_var.xres_virtual = default_xres;
default_var.yres_virtual = default_yres; default_var.yres_virtual = default_yres;
default_var.bits_per_pixel = viafb_bpp; default_var.bits_per_pixel = viafb_bpp;
viafb_fill_var_timing_info(&default_var, viafb_get_refresh( viafb_fill_var_timing_info(&default_var, viafb_get_best_mode(
default_var.xres, default_var.yres, viafb_refresh), default_var.xres, default_var.yres, viafb_refresh));
viafb_get_mode(default_var.xres, default_var.yres));
viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo); viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
viafbinfo->var = default_var; viafbinfo->var = default_var;
...@@ -1859,9 +1854,8 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev) ...@@ -1859,9 +1854,8 @@ int __devinit via_fb_pci_probe(struct viafb_dev *vdev)
default_var.xres_virtual = viafb_second_xres; default_var.xres_virtual = viafb_second_xres;
default_var.yres_virtual = viafb_second_yres; default_var.yres_virtual = viafb_second_yres;
default_var.bits_per_pixel = viafb_bpp1; default_var.bits_per_pixel = viafb_bpp1;
viafb_fill_var_timing_info(&default_var, viafb_get_refresh( viafb_fill_var_timing_info(&default_var, viafb_get_best_mode(
default_var.xres, default_var.yres, viafb_refresh1), default_var.xres, default_var.yres, viafb_refresh1));
viafb_get_mode(default_var.xres, default_var.yres));
viafb_setup_fixinfo(&viafbinfo1->fix, viaparinfo1); viafb_setup_fixinfo(&viafbinfo1->fix, viaparinfo1);
viafb_check_var(&default_var, viafbinfo1); viafb_check_var(&default_var, viafbinfo1);
...@@ -1956,61 +1950,67 @@ static int __init viafb_setup(void) ...@@ -1956,61 +1950,67 @@ static int __init viafb_setup(void)
if (!*this_opt) if (!*this_opt)
continue; continue;
if (!strncmp(this_opt, "viafb_mode1=", 12)) if (!strncmp(this_opt, "viafb_mode1=", 12)) {
viafb_mode1 = kstrdup(this_opt + 12, GFP_KERNEL); viafb_mode1 = kstrdup(this_opt + 12, GFP_KERNEL);
else if (!strncmp(this_opt, "viafb_mode=", 11)) } else if (!strncmp(this_opt, "viafb_mode=", 11)) {
viafb_mode = kstrdup(this_opt + 11, GFP_KERNEL); viafb_mode = kstrdup(this_opt + 11, GFP_KERNEL);
else if (!strncmp(this_opt, "viafb_bpp1=", 11)) } else if (!strncmp(this_opt, "viafb_bpp1=", 11)) {
strict_strtoul(this_opt + 11, 0, if (kstrtouint(this_opt + 11, 0, &viafb_bpp1) < 0)
(unsigned long *)&viafb_bpp1); return -EINVAL;
else if (!strncmp(this_opt, "viafb_bpp=", 10)) } else if (!strncmp(this_opt, "viafb_bpp=", 10)) {
strict_strtoul(this_opt + 10, 0, if (kstrtouint(this_opt + 10, 0, &viafb_bpp) < 0)
(unsigned long *)&viafb_bpp); return -EINVAL;
else if (!strncmp(this_opt, "viafb_refresh1=", 15)) } else if (!strncmp(this_opt, "viafb_refresh1=", 15)) {
strict_strtoul(this_opt + 15, 0, if (kstrtoint(this_opt + 15, 0, &viafb_refresh1) < 0)
(unsigned long *)&viafb_refresh1); return -EINVAL;
else if (!strncmp(this_opt, "viafb_refresh=", 14)) } else if (!strncmp(this_opt, "viafb_refresh=", 14)) {
strict_strtoul(this_opt + 14, 0, if (kstrtoint(this_opt + 14, 0, &viafb_refresh) < 0)
(unsigned long *)&viafb_refresh); return -EINVAL;
else if (!strncmp(this_opt, "viafb_lcd_dsp_method=", 21)) } else if (!strncmp(this_opt, "viafb_lcd_dsp_method=", 21)) {
strict_strtoul(this_opt + 21, 0, if (kstrtoint(this_opt + 21, 0,
(unsigned long *)&viafb_lcd_dsp_method); &viafb_lcd_dsp_method) < 0)
else if (!strncmp(this_opt, "viafb_lcd_panel_id=", 19)) return -EINVAL;
strict_strtoul(this_opt + 19, 0, } else if (!strncmp(this_opt, "viafb_lcd_panel_id=", 19)) {
(unsigned long *)&viafb_lcd_panel_id); if (kstrtoint(this_opt + 19, 0,
else if (!strncmp(this_opt, "viafb_accel=", 12)) &viafb_lcd_panel_id) < 0)
strict_strtoul(this_opt + 12, 0, return -EINVAL;
(unsigned long *)&viafb_accel); } else if (!strncmp(this_opt, "viafb_accel=", 12)) {
else if (!strncmp(this_opt, "viafb_SAMM_ON=", 14)) if (kstrtoint(this_opt + 12, 0, &viafb_accel) < 0)
strict_strtoul(this_opt + 14, 0, return -EINVAL;
(unsigned long *)&viafb_SAMM_ON); } else if (!strncmp(this_opt, "viafb_SAMM_ON=", 14)) {
else if (!strncmp(this_opt, "viafb_active_dev=", 17)) if (kstrtoint(this_opt + 14, 0, &viafb_SAMM_ON) < 0)
return -EINVAL;
} else if (!strncmp(this_opt, "viafb_active_dev=", 17)) {
viafb_active_dev = kstrdup(this_opt + 17, GFP_KERNEL); viafb_active_dev = kstrdup(this_opt + 17, GFP_KERNEL);
else if (!strncmp(this_opt, } else if (!strncmp(this_opt,
"viafb_display_hardware_layout=", 30)) "viafb_display_hardware_layout=", 30)) {
strict_strtoul(this_opt + 30, 0, if (kstrtoint(this_opt + 30, 0,
(unsigned long *)&viafb_display_hardware_layout); &viafb_display_hardware_layout) < 0)
else if (!strncmp(this_opt, "viafb_second_size=", 18)) return -EINVAL;
strict_strtoul(this_opt + 18, 0, } else if (!strncmp(this_opt, "viafb_second_size=", 18)) {
(unsigned long *)&viafb_second_size); if (kstrtoint(this_opt + 18, 0, &viafb_second_size) < 0)
else if (!strncmp(this_opt, return -EINVAL;
"viafb_platform_epia_dvi=", 24)) } else if (!strncmp(this_opt,
strict_strtoul(this_opt + 24, 0, "viafb_platform_epia_dvi=", 24)) {
(unsigned long *)&viafb_platform_epia_dvi); if (kstrtoint(this_opt + 24, 0,
else if (!strncmp(this_opt, &viafb_platform_epia_dvi) < 0)
"viafb_device_lcd_dualedge=", 26)) return -EINVAL;
strict_strtoul(this_opt + 26, 0, } else if (!strncmp(this_opt,
(unsigned long *)&viafb_device_lcd_dualedge); "viafb_device_lcd_dualedge=", 26)) {
else if (!strncmp(this_opt, "viafb_bus_width=", 16)) if (kstrtoint(this_opt + 26, 0,
strict_strtoul(this_opt + 16, 0, &viafb_device_lcd_dualedge) < 0)
(unsigned long *)&viafb_bus_width); return -EINVAL;
else if (!strncmp(this_opt, "viafb_lcd_mode=", 15)) } else if (!strncmp(this_opt, "viafb_bus_width=", 16)) {
strict_strtoul(this_opt + 15, 0, if (kstrtoint(this_opt + 16, 0, &viafb_bus_width) < 0)
(unsigned long *)&viafb_lcd_mode); return -EINVAL;
else if (!strncmp(this_opt, "viafb_lcd_port=", 15)) } else if (!strncmp(this_opt, "viafb_lcd_mode=", 15)) {
if (kstrtoint(this_opt + 15, 0, &viafb_lcd_mode) < 0)
return -EINVAL;
} else if (!strncmp(this_opt, "viafb_lcd_port=", 15)) {
viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL); viafb_lcd_port = kstrdup(this_opt + 15, GFP_KERNEL);
else if (!strncmp(this_opt, "viafb_dvi_port=", 15)) } else if (!strncmp(this_opt, "viafb_dvi_port=", 15)) {
viafb_dvi_port = kstrdup(this_opt + 15, GFP_KERNEL); viafb_dvi_port = kstrdup(this_opt + 15, GFP_KERNEL);
}
} }
return 0; return 0;
} }
...@@ -2034,9 +2034,9 @@ int __init viafb_init(void) ...@@ -2034,9 +2034,9 @@ int __init viafb_init(void)
return r; return r;
#endif #endif
if (parse_mode(viafb_mode, &dummy_x, &dummy_y) if (parse_mode(viafb_mode, &dummy_x, &dummy_y)
|| !viafb_get_mode(dummy_x, dummy_y) || !viafb_get_best_mode(dummy_x, dummy_y, viafb_refresh)
|| parse_mode(viafb_mode1, &dummy_x, &dummy_y) || parse_mode(viafb_mode1, &dummy_x, &dummy_y)
|| !viafb_get_mode(dummy_x, dummy_y) || !viafb_get_best_mode(dummy_x, dummy_y, viafb_refresh1)
|| viafb_bpp < 0 || viafb_bpp > 32 || viafb_bpp < 0 || viafb_bpp > 32
|| viafb_bpp1 < 0 || viafb_bpp1 > 32 || viafb_bpp1 < 0 || viafb_bpp1 > 32
|| parse_active_dev()) || parse_active_dev())
......
drivers/video/via/viamode.c
浏览文件 @ 6488867c
...@@ -281,7 +281,7 @@ static struct crt_mode_table CRTM640x480[] = { ...@@ -281,7 +281,7 @@ static struct crt_mode_table CRTM640x480[] = {
/*r_rate,hsp,vsp */ /*r_rate,hsp,vsp */
/*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
{REFRESH_60, M640X480_R60_HSP, M640X480_R60_VSP, {REFRESH_60, M640X480_R60_HSP, M640X480_R60_VSP,
{800, 640, 648, 144, 656, 96, 525, 480, 480, 45, 490, 2} }, {800, 640, 640, 160, 656, 96, 525, 480, 480, 45, 490, 2} },
{REFRESH_75, M640X480_R75_HSP, M640X480_R75_VSP, {REFRESH_75, M640X480_R75_HSP, M640X480_R75_VSP,
{840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} }, {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },
{REFRESH_85, M640X480_R85_HSP, M640X480_R85_VSP, {REFRESH_85, M640X480_R85_HSP, M640X480_R85_VSP,
...@@ -863,26 +863,56 @@ int NUM_TOTAL_CLE266_ModeXregs = ARRAY_SIZE(CLE266_ModeXregs); ...@@ -863,26 +863,56 @@ int NUM_TOTAL_CLE266_ModeXregs = ARRAY_SIZE(CLE266_ModeXregs);
int NUM_TOTAL_PATCH_MODE = ARRAY_SIZE(res_patch_table); int NUM_TOTAL_PATCH_MODE = ARRAY_SIZE(res_patch_table);
struct VideoModeTable *viafb_get_mode(int hres, int vres) static struct VideoModeTable *get_modes(struct VideoModeTable *vmt, int n,
int hres, int vres)
{ {
u32 i; int i;
for (i = 0; i < ARRAY_SIZE(viafb_modes); i++)
if (viafb_modes[i].mode_array && for (i = 0; i < n; i++)
viafb_modes[i].crtc[0].crtc.hor_addr == hres && if (vmt[i].mode_array &&
viafb_modes[i].crtc[0].crtc.ver_addr == vres) vmt[i].crtc[0].crtc.hor_addr == hres &&
vmt[i].crtc[0].crtc.ver_addr == vres)
return &viafb_modes[i]; return &viafb_modes[i];
return NULL; return NULL;
} }
struct VideoModeTable *viafb_get_rb_mode(int hres, int vres) static struct crt_mode_table *get_best_mode(struct VideoModeTable *vmt,
int refresh)
{ {
u32 i; struct crt_mode_table *best;
for (i = 0; i < ARRAY_SIZE(viafb_rb_modes); i++) int i;
if (viafb_rb_modes[i].mode_array &&
viafb_rb_modes[i].crtc[0].crtc.hor_addr == hres &&
viafb_rb_modes[i].crtc[0].crtc.ver_addr == vres)
return &viafb_rb_modes[i];
return NULL; if (!vmt)
return NULL;
best = &vmt->crtc[0];
for (i = 1; i < vmt->mode_array; i++) {
if (abs(vmt->crtc[i].refresh_rate - refresh)
< abs(best->refresh_rate - refresh))
best = &vmt->crtc[i];
}
return best;
}
static struct VideoModeTable *viafb_get_mode(int hres, int vres)
{
return get_modes(viafb_modes, ARRAY_SIZE(viafb_modes), hres, vres);
}
struct crt_mode_table *viafb_get_best_mode(int hres, int vres, int refresh)
{
return get_best_mode(viafb_get_mode(hres, vres), refresh);
}
static struct VideoModeTable *viafb_get_rb_mode(int hres, int vres)
{
return get_modes(viafb_rb_modes, ARRAY_SIZE(viafb_rb_modes), hres,
vres);
}
struct crt_mode_table *viafb_get_best_rb_mode(int hres, int vres, int refresh)
{
return get_best_mode(viafb_get_rb_mode(hres, vres), refresh);
} }
drivers/video/via/viamode.h
浏览文件 @ 6488867c
...@@ -60,7 +60,7 @@ extern struct io_reg PM1024x768[]; ...@@ -60,7 +60,7 @@ extern struct io_reg PM1024x768[];
extern struct patch_table res_patch_table[]; extern struct patch_table res_patch_table[];
extern struct VPITTable VPIT; extern struct VPITTable VPIT;
struct VideoModeTable *viafb_get_mode(int hres, int vres); struct crt_mode_table *viafb_get_best_mode(int hres, int vres, int refresh);
struct VideoModeTable *viafb_get_rb_mode(int hres, int vres); struct crt_mode_table *viafb_get_best_rb_mode(int hres, int vres, int refresh);
#endif /* __VIAMODE_H__ */ #endif /* __VIAMODE_H__ */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或