diff options
| author | Mike Fulbright <msf@redhat.com> | 2000-08-22 23:05:40 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2000-08-22 23:05:40 +0000 |
| commit | 63c359c34eb603a4f72b5aa62cd76bf03329bc49 (patch) | |
| tree | 44f0f85903d5059d1d0dfebc05dfbada5a73ad66 | |
| parent | a473ae0ee04ffe220c3e7ced38ab259664c37806 (diff) | |
| download | anaconda-63c359c34eb603a4f72b5aa62cd76bf03329bc49.tar.gz anaconda-63c359c34eb603a4f72b5aa62cd76bf03329bc49.tar.xz anaconda-63c359c34eb603a4f72b5aa62cd76bf03329bc49.zip | |
1) Make 16bpp max depth available, 2) Write out videoram option for i810, 3) Remove 1600x1200 for 8 and 16bpp from vram <=4096 since these cards rarely have DAC to do it even if they have the RAM
| -rw-r--r-- | xf86config.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/xf86config.py b/xf86config.py index f177e5a62..407ed51e2 100644 --- a/xf86config.py +++ b/xf86config.py @@ -508,6 +508,7 @@ Section "Device" Driver "%(cardDriver)s" VendorName "%(cardVendor)s" BoardName "%(cardBoardName)s" +%(videoRam)s #BusID EndSection @@ -616,8 +617,8 @@ class XF86Config: modes["32"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"] return modes elif string.atoi(self.vidRam) >= 4096: - modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1600x1200"] - modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024", "1600x1200"] + modes["8"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"] + modes["16"] = ["640x480", "800x600", "1024x768", "1152x864", "1280x1024"] modes["32"] = ["640x480", "800x600", "1024x768", "1152x864"] return modes elif string.atoi(self.vidRam) >= 2048: @@ -1035,7 +1036,10 @@ Section "Screen" Monitor "%(monitorID)s" """ % tmp if maxdepth > 0: - screens = screens + " DefaultColorDepth %d\n" % maxdepth + if maxdepth > 16: + screens = screens + " DefaultColorDepth 16\n" + else: + screens = screens + " DefaultColorDepth %d\n" % maxdepth for depth in self.modes.keys (): if not self.modes[depth]: continue @@ -1149,10 +1153,14 @@ Section "Screen" "XkbVariant" : self.keyVariant, "XkbOptions" : self.keyOptions, "defaultDepth" : "", - "emulate3" : emulate3 } + "emulate3" : emulate3, + "videoRam" : "" } # self.vidCards[self.primary]["DRIVER"] = "vga" if maxdepth > 0: - data["defaultDepth"] = "\n\tDefaultDepth\t%d" % maxdepth + if maxdepth > 16: + data["defaultDepth"] = "\n\tDefaultDepth\t16" + else: + data["defaultDepth"] = "\n\tDefaultDepth\t%d" % maxdepth if test: data["pex5Mod"] = "" if iutil.getArch() == "sparc": @@ -1170,6 +1178,8 @@ Section "Screen" """ if self.vidCards[self.primary].has_key ("DRIVER"): data["cardDriver"] = self.vidCards[self.primary]["DRIVER"] + if data["cardDriver"] == "i810": + data["videoRam"] = "\tVideoRam %s\n" % self.vidRam else: raise RuntimeError, "Don't know which XFree86-4.0 video driver to use!" return XF86Config_4_template % data |