summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-09-02 14:36:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-02 19:21:39 -0700
commitbf6910c0afb1e416a99ad5b2296e088449fbe481 (patch)
treea10d4ac4f37bfe58dce2bff6e6a2b0fc1c41b8d7
parenta8823aefd142d2a9c4b3661bf8712ccd2da1b220 (diff)
downloadop-kernel-dev-bf6910c0afb1e416a99ad5b2296e088449fbe481.zip
op-kernel-dev-bf6910c0afb1e416a99ad5b2296e088449fbe481.tar.gz
tdfxfb: fix SDRAM memory size detection
Fix memory detection on Voodoo3 cards with SDRAM memory. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/tdfxfb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 77aafcf..fa7cbec 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -426,7 +426,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
/* Banshee/Voodoo3 */
chip_size = 2;
- if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE))
+ if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE))
chip_size = 1;
} else {
/* Voodoo4/5 */
OpenPOWER on IntegriCloud