---

yaml --- r: 105509 b: refs/heads/master c: 65e93e0 h: refs/heads/master i: 105507: d5f8d12 v: v3
git-mirror · Jul 24, 2008 · 4f53822 · 4f53822
1 parent d8e4ec7
commit 4f53822
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74a933feaf13f705e6c798d87efe6a9d758b3ca0
+refs/heads/master: 65e93e038c8a6eb65b6907d6aed22a8ff1029d3a
diff --git a/trunk/drivers/video/tridentfb.c b/trunk/drivers/video/tridentfb.c
@@ -1095,7 +1095,10 @@ static int tridentfb_set_par(struct fb_info *info)
 	vga_mm_wseq(par->io_virt, 4, 0x0E); /* memory mode enable bitmaps ?? */
 
 	/* divide clock by 2 if 32bpp chain4 mode display and CPU path */
-	write3CE(par, MiscExtFunc, (bpp == 32) ? 0x1A : 0x12);
+	tmp = read3CE(par, MiscExtFunc) & 0xF0;
+	if (bpp == 32)
+		tmp |= 8;
+	write3CE(par, MiscExtFunc, tmp | 0x12);
 	write3CE(par, 0x5, 0x40);	/* no CGA compat, allow 256 col */
 	write3CE(par, 0x6, 0x05);	/* graphics mode */
 	write3CE(par, 0x7, 0x0F);	/* planes? */