From 4f538228a39240544241e6f12817c219879f7d70 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Wed, 23 Jul 2008 21:31:00 -0700 Subject: [PATCH] --- yaml --- r: 105509 b: refs/heads/master c: 65e93e038c8a6eb65b6907d6aed22a8ff1029d3a h: refs/heads/master i: 105507: d5f8d12e8c26f22b94dcbd124431662bb73f444c v: v3 --- [refs] | 2 +- trunk/drivers/video/tridentfb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f7702d4c9c09..5e8b4377b097 100644 --- 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 index 62701c5570fd..26bc4d75d4fd 100644 --- 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? */