diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:40 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:30:40 +0000 |
| commit | 607017c4537d564e4da896a0d98b6a8cf74b47c8 (patch) | |
| tree | 971aeff8805763ab3a8399ffc64019eb0cc0e4e5 | |
| parent | bacb9bacd1d956ffe98e7bef95805bf6055f72af (diff) | |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
| -rw-r--r-- | man/fbdev.man | 2 | ||||
| -rw-r--r-- | src/fbdev.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/man/fbdev.man b/man/fbdev.man index f6a6f7d..9291851 100644 --- a/man/fbdev.man +++ b/man/fbdev.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.3 2001/10/02 15:57:32 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH FBDEV __drivermansuffix__ __vendorversion__ diff --git a/src/fbdev.c b/src/fbdev.c index de568f6..f531a19 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -409,7 +409,8 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(fPtr->pEnt->device->options,"fbdev"))) return FALSE; default_depth = fbdevHWGetDepth(pScrn,&fbbpp); - if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp,0)) + if (!xf86SetDepthBpp(pScrn, default_depth, default_depth, fbbpp, + Support24bppFb | Support32bppFb | SupportConvert32to24 | PreferConvert32to24)) return FALSE; xf86PrintDepthBpp(pScrn); @@ -792,7 +793,8 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) FBDevDGAInit(pScrn, pScreen); else { xf86DrvMsg(scrnIndex, X_INFO, "Rotated display, disabling DGA\n"); - + xf86DrvMsg(scrnIndex, X_INFO, "Enabling Driver rotation, disabling RandR\n"); + xf86DisableRandR(); if (pScrn->bitsPerPixel == 24) xf86DrvMsg(scrnIndex, X_WARNING, "Rotation might be broken in 24 bpp\n"); } |