summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2001-02-19 17:16:03 +0000
committerBill Nottingham <notting@redhat.com>2001-02-19 17:16:03 +0000
commitd66d02f2abbb998f1bdff2cf0a57550933d1c2d9 (patch)
tree39d66ce00a06e023c54f720d0edc83803349219c
parentae8adca6085a62c2d7a419165084e44d58aba3b8 (diff)
downloadanaconda-d66d02f2abbb998f1bdff2cf0a57550933d1c2d9.tar.gz
anaconda-d66d02f2abbb998f1bdff2cf0a57550933d1c2d9.tar.xz
anaconda-d66d02f2abbb998f1bdff2cf0a57550933d1c2d9.zip
explictly disable DRI on r128, mga for now
-rw-r--r--xf86config.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/xf86config.py b/xf86config.py
index a12798f6f..94feee712 100644
--- a/xf86config.py
+++ b/xf86config.py
@@ -468,8 +468,7 @@ EndSection
Section "Module"
Load "GLcore"
Load "dbe"
- Load "dri"
- Load "extmod"%(nonSparcMods)s%(pex5Mod)s
+ Load "extmod"%(nonSparcMods)s%(pex5Mod)s%(driMod)s
Load "glx"
Load "pex5"
Load "record"
@@ -1277,6 +1276,7 @@ Section "Screen"
"screenModes" : screens,
"nonSparcMods" : '\n\tLoad "fbdevhw"',
"pex5Mod" : '\n\tLoad "pex5"',
+ "driMod" : '\n\tLoad "dri"',
"XkbRules" : self.keyRules,
"XkbModel" : self.keyModel,
"XkbLayout" : self.keyLayout,
@@ -1312,6 +1312,9 @@ Section "Screen"
data["cardDriver"] = self.vidCards[self.primary]["DRIVER"]
if data["cardDriver"] == "i810":
data["videoRam"] = "\tVideoRam %s\n" % self.vidRam
+ # DRI HACK!
+ if data["cardDriver"] == "r128" or data["cardDriver"] == "mga":
+ data["driMod"] = '\n\t#Load "dri"'
else:
raise RuntimeError, "Don't know which XFree86-4.0 video driver to use!"
return XF86Config_4_template % data