---

yaml --- r: 271337 b: refs/heads/master c: 0492262 h: refs/heads/master i: 271335: a009892 v: v3
git-mirror · Aug 5, 2011 · 77dc1c2 · 77dc1c2
1 parent c2d431a
commit 77dc1c2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92746c3c82135b13d7fb1bbdebbabb0faedd8433
+refs/heads/master: 0492262281b82e71c6063e35ef73a33fad93cc6d
diff --git a/trunk/drivers/video/via/hw.c b/trunk/drivers/video/via/hw.c
@@ -1488,20 +1488,6 @@ void viafb_fill_crtc_timing(struct VideoModeTable *video_mode, int bpp_byte,
 	}
 
 	crt_reg = crt_table[index].crtc;
-
-	/* Mode 640x480 has border, but LCD/DFP didn't have border. */
-	/* So we would delete border. */
-	if ((viafb_LCD_ON | viafb_DVI_ON)
-	    && video_mode->crtc[0].crtc.hor_addr == 640
-	    && video_mode->crtc[0].crtc.ver_addr == 480
-	    && refresh == 60) {
-		/* The border is 8 pixels. */
-		crt_reg.hor_blank_start = crt_reg.hor_blank_start - 8;
-
-		/* Blanking time should add left and right borders. */
-		crt_reg.hor_blank_end = crt_reg.hor_blank_end + 16;
-	}
-
 	crt_reg.hor_blank_end += crt_reg.hor_blank_start;
 	crt_reg.hor_sync_end += crt_reg.hor_sync_start;
 	crt_reg.ver_blank_end += crt_reg.ver_blank_start;

diff --git a/trunk/drivers/video/via/viamode.c b/trunk/drivers/video/via/viamode.c
@@ -281,7 +281,7 @@ static struct crt_mode_table CRTM640x480[] = {
 	/*r_rate,hsp,vsp */
 	/*HT,  HA,  HBS, HBE, HSS, HSE, VT,  VA,  VBS, VBE, VSS, VSE */
 	{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,
 	 {840, 640, 640, 200, 656, 64, 500, 480, 480, 20, 481, 3} },
 	{REFRESH_85, M640X480_R85_HSP, M640X480_R85_VSP,