diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:28 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:28 +0000 |
| commit | b058394c8c71b0d84f512416b19d165f1da57985 (patch) | |
| tree | 1b4ae69754ad1a3006e87b95f5ec835dfe85af73 | |
| parent | bacb9bacd1d956ffe98e7bef95805bf6055f72af (diff) | |
| download | xorg-driver-xf86-video-fbdev-XINERAMA_2.tar.gz | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
| -rw-r--r-- | src/fbdev.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/fbdev.c b/src/fbdev.c index de568f6..2553fff 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.44 2003/09/24 02:43:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.45 2004/01/11 18:42:59 dawes Exp $ */ /* * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> @@ -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"); } |