diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-07-22 00:40:11 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-07-22 00:40:11 +0100 |
| commit | c9f31330d7847820a9cabebc193f22a176690a67 (patch) | |
| tree | 216c4c4fdd154ec5292a7efef900fd3c46471b28 /src/glamo-driver.c | |
| parent | 72a3fcc25d026941c0a202cbc6364326b979c767 (diff) | |
Just backing up progress
Diffstat (limited to 'src/glamo-driver.c')
| -rw-r--r-- | src/glamo-driver.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/glamo-driver.c b/src/glamo-driver.c index a8541f3..f737725 100644 --- a/src/glamo-driver.c +++ b/src/glamo-driver.c @@ -37,7 +37,7 @@ #include "glamo.h" #include "glamo-regs.h" -#include "glamo-kms.driver.h" +#include "glamo-kms-driver.h" #include <fcntl.h> #include <unistd.h> @@ -183,7 +183,7 @@ GlamoSetup(pointer module, pointer opts, int *errmaj, int *errmin) #endif /* XFree86LOADER */ -static Bool +Bool GlamoGetRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate != NULL) @@ -193,7 +193,7 @@ GlamoGetRec(ScrnInfoPtr pScrn) return TRUE; } -static void +void GlamoFreeRec(ScrnInfoPtr pScrn) { if (pScrn->driverPrivate == NULL) @@ -298,10 +298,12 @@ GlamoProbe(DriverPtr drv, int flags) return FALSE; /* Is today a good day to use KMS? */ - if ( GlamoKernelModesettingAvailable(pScrn) ) { + if ( GlamoKernelModesettingAvailable() ) { foundScreen = TRUE; + pScrn = xf86AllocateScreen(drv, 0); + /* Plug in KMS functions instead of the conventional ones */ pScrn->driverVersion = GLAMO_VERSION; pScrn->driverName = GLAMO_DRIVER_NAME; @@ -318,8 +320,6 @@ GlamoProbe(DriverPtr drv, int flags) } else { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Not using KMS"); - if (!xf86LoadDrvSubModule(drv, "fbdevhw")) return FALSE; @@ -355,6 +355,10 @@ GlamoProbe(DriverPtr drv, int flags) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "using %s\n", dev ? dev : "default device"); + + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Not using KMS"); + } } } |