summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich-at-freedesktop-dot-org>2004-10-12 19:13:43 +0000
committerEgbert Eich <eich-at-freedesktop-dot-org>2004-10-12 19:13:43 +0000
commit065888a754046b8952a64b6f89c92552cad5069f (patch)
tree9eea763c907b8411fe548598745969d3d7772755
parentaf23d1c097c2c770ffe450ed30886c3a6615bfdb (diff)
Set fbdev mode as the default mode on PPC (Olaf Hering).
Added support for IBM space saver keyboard (Stefan Dirsch). Added support for Cherry CyMotion Master XPress (Marcus Schaefer). Change order of SetDisplayDevice(), HWRestore(), UnbindGART() and RestoreBIOSMemSize() to be exactly opposite to the Save procedure in EnterVT() (Matthias Hopf, Alan Hourihane). Fix text mode restauration by removing the assumption that the register which determines which head is programmed is set. to the active head by the BIOS (Mark Vojkovich). When I wrote the resource code 5 years ago I made some assumptions which turned out to be false: I've assumed that the bus number of the PCI hostbridge would be the PCI bus the bridge links to. This is not correct. Fixing this assumption is not easy. However I hope that the attached patch will make the system work regardless as it 'ignores' host bridges from which the target bus is not known. This should not matter at all as we really don't care about host bridges (unless we have bridge specific code which retrieves information about the bridge). Fixed server crash on reset when a structure allocated in PreInit() was freed on CloseScreen(). Fixed ring buffer lock ups that happened because the structure that contained ringbuffer data was not zeroed after allocation. Fixed numerous warnings due to signed unsigned comparisons. programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c: (NVBacklightEnable): Changed the order in which the sequencer registers and the backlight control registers are written. The sequencer control register need to be written first otherwise DPMS screen blanking produces vertical bars on a mobile device. lib/Xau/Imakefile: Build libXau static library PIC so it can be linked into toolkits that would like to wrap its functionality.
-rw-r--r--src/r128_driver.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/r128_driver.c b/src/r128_driver.c
index fb9dd6d..6b75633 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1916,7 +1916,12 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ShowCache enabled\n");
}
- if (xf86ReturnOptValBool(info->Options, OPTION_FBDEV, FALSE)) {
+#ifdef __powerpc__
+ if (xf86ReturnOptValBool(info->Options, OPTION_FBDEV, TRUE))
+#else
+ if (xf86ReturnOptValBool(info->Options, OPTION_FBDEV, FALSE))
+#endif
+ {
info->FBDev = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"Using framebuffer device\n");