Hi Harald, Here's a tested patch to add OLPC panel support to viafb, also pushed to olpc-2.6/xo-1.5. Please review and send upstream.
Thanks! - Chris. From: Chris Ball <[email protected]> Date: Sun, 7 Jun 2009 13:59:51 -0400 Subject: [PATCH] viafb: Add 1200x900 DCON/LCD panel modes for OLPC XO-1.5 Signed-off-by: Chris Ball <[email protected]> --- drivers/video/via/hw.c | 1 + drivers/video/via/ioctl.h | 2 +- drivers/video/via/lcd.c | 10 ++++++++++ drivers/video/via/lcd.h | 2 ++ drivers/video/via/share.h | 8 ++++++++ drivers/video/via/viafbdev.c | 1 + drivers/video/via/viamode.c | 14 ++++++++++++++ drivers/video/via/viamode.h | 6 ++++-- 8 files changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c index e14b852..93437e4 100644 --- a/drivers/video/via/hw.c +++ b/drivers/video/via/hw.c @@ -69,6 +69,7 @@ static struct pll_map pll_value[] = { CX700_52_977M, VX855_52_977M}, {CLK_56_250M, CLE266_PLL_56_250M, K800_PLL_56_250M, CX700_56_250M, VX855_56_250M}, + {CLK_57_275M, 0, 0, 0, VX855_57_275M}, {CLK_60_466M, CLE266_PLL_60_466M, K800_PLL_60_466M, CX700_60_466M, VX855_60_466M}, {CLK_61_500M, CLE266_PLL_61_500M, K800_PLL_61_500M, diff --git a/drivers/video/via/ioctl.h b/drivers/video/via/ioctl.h index 842fe30..9ae03ba 100644 --- a/drivers/video/via/ioctl.h +++ b/drivers/video/via/ioctl.h @@ -77,7 +77,7 @@ /*SAMM operation flag*/ #define OP_SAMM 0x80 -#define LCD_PANEL_ID_MAXIMUM 22 +#define LCD_PANEL_ID_MAXIMUM 23 #define STATE_ON 0x1 #define STATE_OFF 0x0 diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c index 6c7290a..19a68aa 100644 --- a/drivers/video/via/lcd.c +++ b/drivers/video/via/lcd.c @@ -455,6 +455,16 @@ static int fp_id_to_vindex(int panel_id) viaparinfo->lvds_setting_info->LCDDithering = 1; return VIA_RES_480X640; break; + case 0x17: + /* OLPC XO-1.5 panel */ + viaparinfo->lvds_setting_info->lcd_panel_hres = 1200; + viaparinfo->lvds_setting_info->lcd_panel_vres = 900; + viaparinfo->lvds_setting_info->lcd_panel_id = + LCD_PANEL_IDD_1200X900; + viaparinfo->lvds_setting_info->device_lcd_dualedge = 0; + viaparinfo->lvds_setting_info->LCDDithering = 0; + return VIA_RES_1200X900; + break; default: viaparinfo->lvds_setting_info->lcd_panel_hres = 800; viaparinfo->lvds_setting_info->lcd_panel_vres = 600; diff --git a/drivers/video/via/lcd.h b/drivers/video/via/lcd.h index 071f47c..9762ec6 100644 --- a/drivers/video/via/lcd.h +++ b/drivers/video/via/lcd.h @@ -60,6 +60,8 @@ #define LCD_PANEL_IDB_1360X768 0x0B /* Resolution: 480x640, Channel: single, Dithering: Enable */ #define LCD_PANEL_IDC_480X640 0x0C +/* Resolution: 1200x900, Channel: single, Dithering: Disable */ +#define LCD_PANEL_IDD_1200X900 0x0D extern int viafb_LCD2_ON; diff --git a/drivers/video/via/share.h b/drivers/video/via/share.h index 1eacd1c..6fb6f9d 100644 --- a/drivers/video/via/share.h +++ b/drivers/video/via/share.h @@ -86,6 +86,7 @@ #define VIA_RES_1920X1200 38 #define VIA_RES_2048X1536 39 #define VIA_RES_480X640 40 +#define VIA_RES_1200X900 41 /*Reduce Blanking*/ #define VIA_RES_1360X768_RB 131 @@ -626,6 +627,10 @@ #define M1200X720_R60_HSP NEGATIVE #define M1200X720_R60_VSP POSITIVE +/* 1200x...@60 Sync Polarity (DCON) */ +#define M1200X900_R60_HSP NEGATIVE +#define M1200X900_R60_VSP NEGATIVE + /* 1280x...@60 Sync Polarity (GTF Mode) */ #define M1280x600_R60_HSP NEGATIVE #define M1280x600_R60_VSP POSITIVE @@ -707,6 +712,7 @@ #define CLK_52_406M 52406000 #define CLK_52_977M 52977000 #define CLK_56_250M 56250000 +#define CLK_57_275M 57275000 #define CLK_60_466M 60466000 #define CLK_61_500M 61500000 #define CLK_65_000M 65000000 @@ -995,6 +1001,7 @@ #define VX855_52_406M 0x00580C03 #define VX855_52_977M 0x00940C05 #define VX855_56_250M 0x009D0C05 +#define VX855_57_275M 0x009D8C85 /* Used by XO panel */ #define VX855_60_466M 0x00A90C05 #define VX855_61_500M 0x00AC0C05 #define VX855_65_000M 0x006D0C03 @@ -1121,6 +1128,7 @@ #define RES_1600X1200_60HZ_PIXCLOCK 6172 #define RES_1600X1200_75HZ_PIXCLOCK 4938 #define RES_1280X720_60HZ_PIXCLOCK 13426 +#define RES_1200X900_60HZ_PIXCLOCK 17459 #define RES_1920X1080_60HZ_PIXCLOCK 5787 #define RES_1400X1050_60HZ_PIXCLOCK 8214 #define RES_1400X1050_75HZ_PIXCLOCK 6410 diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index e9ce3fe..0262015 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -88,6 +88,7 @@ static const struct viafb_modeinfo viafb_modentry[] = { {1088, 612, VIA_RES_1088X612, "1088x612"}, {1152, 720, VIA_RES_1152X720, "1152x720"}, {1200, 720, VIA_RES_1200X720, "1200x720"}, + {1200, 900, VIA_RES_1200X900, "1200x900"}, {1280, 600, VIA_RES_1280X600, "1280x600"}, {1360, 768, VIA_RES_1360X768, "1360x768"}, {1440, 900, VIA_RES_1440X900, "1440x900"}, diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c index 209c3af..9590baf 100644 --- a/drivers/video/via/viamode.c +++ b/drivers/video/via/viamode.c @@ -66,6 +66,7 @@ struct res_map_refresh res_map_refresh_tbl[] = { {1088, 612, RES_1088X612_60HZ_PIXCLOCK, 60}, {1152, 720, RES_1152X720_60HZ_PIXCLOCK, 60}, {1200, 720, RES_1200X720_60HZ_PIXCLOCK, 60}, + {1200, 900, RES_1200X900_60HZ_PIXCLOCK, 60}, {1280, 600, RES_1280X600_60HZ_PIXCLOCK, 60}, {1280, 720, RES_1280X720_50HZ_PIXCLOCK, 50}, {1280, 768, RES_1280X768_50HZ_PIXCLOCK, 50}, @@ -839,6 +840,16 @@ struct crt_mode_table CRTM1200x720[] = { {1568, 1200, 1200, 368, 1256, 128, 746, 720, 720, 26, 721, 3} } }; +/* 1200x900 (DCON) */ +struct crt_mode_table DCON1200x900[] = { + /* r_rate, vclk, hsp, vsp */ + {REFRESH_60, CLK_57_275M, M1200X900_R60_HSP, M1200X900_R60_VSP, + /* The correct htotal is 1240, but this doesn't raster on VX855. */ + /* Via suggested changing to a multiple of 16, hence 1264. */ + /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ + {1264, 1200, 1200, 64, 1211, 32, 912, 900, 900, 12, 901, 10} } +}; + /* 1280x600 (GTF) */ struct crt_mode_table CRTM1280x600[] = { /* r_rate, vclk, hsp, vsp */ @@ -1026,6 +1037,9 @@ struct VideoModeTable CLE266Modes[] = { /* Display : 1200x720 (GTF) */ {VIA_RES_1200X720, CRTM1200x720, ARRAY_SIZE(CRTM1200x720)}, + /* Display : 1200x900 (DCON) */ + {VIA_RES_1200X900, DCON1200x900, ARRAY_SIZE(DCON1200x900)}, + /* Display : 1280x600 (GTF) */ {VIA_RES_1280X600, CRTM1280x600, ARRAY_SIZE(CRTM1280x600)}, diff --git a/drivers/video/via/viamode.h b/drivers/video/via/viamode.h index 3636694..fbde8d4 100644 --- a/drivers/video/via/viamode.h +++ b/drivers/video/via/viamode.h @@ -132,6 +132,8 @@ extern struct crt_mode_table CRTM1088x612[1]; extern struct crt_mode_table CRTM1152x720[1]; /* 1200x720 (GTF) */ extern struct crt_mode_table CRTM1200x720[1]; +/* 1200x900 (DCON) */ +extern struct crt_mode_table DCON1200x900[1]; /* 1280x600 (GTF) */ extern struct crt_mode_table CRTM1280x600[1]; /* 1360x768 (CVT) */ @@ -160,12 +162,12 @@ extern struct crt_mode_table CRTM1920x1200[1]; extern struct crt_mode_table CRTM1920x1200_RB[1]; /* 2048x1536 (CVT) */ extern struct crt_mode_table CRTM2048x1536[1]; -extern struct VideoModeTable CLE266Modes[47]; +extern struct VideoModeTable CLE266Modes[48]; extern struct crt_mode_table CEAM1280x720[1]; extern struct crt_mode_table CEAM1920x1080[1]; extern struct VideoModeTable CEA_HDMI_Modes[2]; -extern struct res_map_refresh res_map_refresh_tbl[61]; +extern struct res_map_refresh res_map_refresh_tbl[62]; extern struct io_reg CN400_ModeXregs[52]; extern struct io_reg CN700_ModeXregs[66]; extern struct io_reg KM400_ModeXregs[55]; -- 1.6.2.2 _______________________________________________ Devel mailing list [email protected] http://lists.laptop.org/listinfo/devel
