diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c index ab90d7aeb..a5e8604dc 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c @@ -26,7 +26,7 @@ * Dirk H. Hohndel (hohndel@suse.de), * Portions: the GGI project & confidential CYRIX databooks. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.14 2000/12/02 15:30:37 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.18 2001/02/16 01:45:45 dawes Exp $ */ #include "fb.h" #include "mibank.h" @@ -45,15 +45,12 @@ #include "cyrix.h" -#ifdef XFreeXDGA #define _XF86DGA_SERVER_ #include "extensions/xf86dgastr.h" -#endif -#ifdef DPMSExtension #include "opaque.h" +#define DPMS_SERVER #include "extensions/dpms.h" -#endif static OptionInfoPtr CYRIXAvailableOptions(int chip, int busid); static void CYRIXIdentify(int flags); @@ -104,7 +101,7 @@ enum GenericTypes { /* * This contains the functions needed by the server after loading the driver - * module. It must be supplied, and gets passed back by the ModuleInit + * module. It must be supplied, and gets passed back by the moduleSetup * function in the dynamic case. In the static case, a reference to this * is compiled in, and this requires that the name of this DriverRec be * an upper-case version of the driver name. @@ -112,7 +109,7 @@ enum GenericTypes { DriverRec CYRIX = { VERSION, - "accelerated driver for Cyrix integrated processors", + CYRIX_DRIVER_NAME, CYRIXIdentify, CYRIXProbe, CYRIXAvailableOptions, @@ -238,7 +235,6 @@ CYRIXFreeRec(ScrnInfoPtr pScrn) pScrn->driverPrivate = NULL; } -#ifdef DPMSExtension static void CYRIXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) { @@ -278,7 +274,6 @@ CYRIXDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int f outb(0x83C6, PMCont); outw(0x3C4, (temp<<8) | 0x0E); } -#endif /* Mandatory */ static void @@ -994,6 +989,8 @@ CYRIXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) return FALSE; } + miSetPixmapDepths (); + /* * Call the framebuffer layer's ScreenInit function, and fill in other * pScreen fields. @@ -1018,6 +1015,8 @@ CYRIXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!ret) return FALSE; + fbPictureInit (pScreen, 0, 0); + xf86SetBlackWhitePixels(pScreen); if (pScrn->bitsPerPixel > 8) { @@ -1084,9 +1083,7 @@ CYRIXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (!vgaHWHandleColormaps(pScreen)) return FALSE; -#ifdef DPMSExtension xf86DPMSInit(pScreen, (DPMSSetProcPtr)CYRIXDisplayPowerManagementSet, 0); -#endif pScrn->memPhysBase = pCyrix->FbAddress; pScrn->fbOffset = 0; |