summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2009-08-25 15:59:06 +0100
committerThomas White <taw@bitwiz.org.uk>2009-08-25 15:59:06 +0100
commita1f4b5a29a2dcecab97117258c7510baf6c6bf8a (patch)
tree0b85ffe412f8092d5964b79f7438e06d9ab4cc55
parentadc83129b1377fb8224d05a7e0379f885b519c38 (diff)
Fix DRI2 registration with recent X servers
-rw-r--r--src/glamo-dri2.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/glamo-dri2.c b/src/glamo-dri2.c
index 6198522..286094a 100644
--- a/src/glamo-dri2.c
+++ b/src/glamo-dri2.c
@@ -199,7 +199,7 @@ void driScreenInit(ScreenPtr pScreen)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"[glamo-dri] Name of DRM device is '%s'\n", p);
- dri2info.version = 1;
+ dri2info.version = DRI2INFOREC_VERSION;
dri2info.fd = pGlamo->drm_fd;
dri2info.deviceName = p;
dri2info.driverName = "glamo";
@@ -213,7 +213,13 @@ void driScreenInit(ScreenPtr pScreen)
#endif
dri2info.CopyRegion = glamoCopyRegion;
- if ( !DRI2ScreenInit(pScreen, &dri2info) ) return;
+ if ( !DRI2ScreenInit(pScreen, &dri2info) ) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "[glamo-dri] DRI2 initialisation failed\n");
+ } else {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "[glamo-dri] DRI2 initialisation succeeded\n");
+ }
}