summaryrefslogtreecommitdiffstats
path: root/include/video
diff options
context:
space:
mode:
authorRichard Drummond <evilrich@rcdrummond.net>2005-05-01 08:59:25 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:25 -0700
commit333f981720d619e2038b980a55ad01b10580eb9f (patch)
tree419e52ba014d85275dd39614649e09a4c9c7245f /include/video
parent0fbe9cafff72799700713e6a9d5a4ec7191e8d19 (diff)
downloadlinux-333f981720d619e2038b980a55ad01b10580eb9f.tar.gz
linux-333f981720d619e2038b980a55ad01b10580eb9f.tar.bz2
linux-333f981720d619e2038b980a55ad01b10580eb9f.zip
[PATCH] Clean-up and bug fix for tdfxfb framebuffer size detection
Attached is a patch against 2.6.11.7 which tidies up the tdfxfb framebuffer size detection code a little and fixes the broken support for Voodoo4/5 cards. (I haven't tested this on a Voodoo5, however, because I don't have the hardware). Signed-off-by: Richard Drummond <evilrich@rcdrummond.net> Cc: <linux-fbdev-devel@lists.sourceforge.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/video')
-rw-r--r--include/video/tdfx.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/video/tdfx.h b/include/video/tdfx.h
index a896e4442060..04237676b17c 100644
--- a/include/video/tdfx.h
+++ b/include/video/tdfx.h
@@ -99,6 +99,8 @@
#define MISCINIT1_2DBLOCK_DIS BIT(15)
#define DRAMINIT0_SGRAM_NUM BIT(26)
#define DRAMINIT0_SGRAM_TYPE BIT(27)
+#define DRAMINIT0_SGRAM_TYPE_MASK (BIT(27)|BIT(28)|BIT(29))
+#define DRAMINIT0_SGRAM_TYPE_SHIFT 27
#define DRAMINIT1_MEM_SDRAM BIT(30)
#define VGAINIT0_VGA_DISABLE BIT(0)
#define VGAINIT0_EXT_TIMING BIT(1)