summaryrefslogtreecommitdiff
path: root/extra/xf86-video-mach64/mach64-fix-pixmap.patch
blob: 6f1a6474813ff6ed8713be1983148bf9e4bb1805 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
diff --git a/src/aticonsole.c b/src/aticonsole.c
index 1be147e..6e742d9 100644
--- a/src/aticonsole.c
+++ b/src/aticonsole.c
@@ -28,6 +28,7 @@
 #include "config.h"
 #endif
 
+#include "xorgVersion.h"
 #include "ati.h"
 #include "aticonsole.h"
 #include "atii2c.h"
@@ -689,7 +690,9 @@ ATIEnterVT
     ScreenPtr   pScreen     = pScreenInfo->pScreen;
     ATIPtr      pATI        = ATIPTR(pScreenInfo);
     PixmapPtr   pScreenPixmap;
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
     DevUnion    PixmapPrivate;
+#endif
     Bool        Entered;
 
     if (!ATIEnterGraphics(NULL, pScreenInfo, pATI))
@@ -714,19 +717,24 @@ ATIEnterVT
     }
 
     pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
+
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
     PixmapPrivate = pScreenPixmap->devPrivate;
     if (!PixmapPrivate.ptr)
         pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate;
+#endif
 
     /* Tell framebuffer about remapped aperture */
     Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap,
         -1, -1, -1, -1, -1, pATI->pMemory);
 
+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
     if (!PixmapPrivate.ptr)
     {
         pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate;
         pScreenPixmap->devPrivate.ptr = NULL;
     }
+#endif
 
 #ifdef XF86DRI_DEVEL