diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/ChangeLog xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/ChangeLog --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/ChangeLog 2012-05-04 22:21:30.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/ChangeLog 2012-06-06 14:16:20.000000000 +0000 @@ -1,9 +1,27 @@ -commit 4fbd90b57bb0fbe2a6fbba58c0f5aa53ee80f8f9 +commit c195ef11a9eead5d6158e5588b46b24984bb9111 Author: Robert Hooker -Date: Fri May 4 18:21:20 2012 -0400 +Date: Wed Jun 6 10:16:11 2012 -0400 Add debian tree from origin/debian-unstable +commit 68572c1e41cf6de2f0ef2c9442111384ce863308 +Author: Dave Airlie +Date: Wed Jun 6 10:42:26 2012 +0100 + + ati: only include deprecated file in one place. + + reduces warnings. + + Signed-off-by: Dave Airlie + +commit a9f3a66e355b9f19c312d399771fb1d8eb2e046d +Author: Dave Airlie +Date: Wed Jun 6 10:41:11 2012 +0100 + + mach64: port to new compat API. + + Signed-off-by: Dave Airlie + commit 84468ba28853fa57170025d9c25cb0029a386ff4 Author: Alan Coopersmith Date: Fri Mar 30 19:02:07 2012 -0700 diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/debian/changelog xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/debian/changelog --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/debian/changelog 2012-06-06 14:26:06.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/debian/changelog 2012-06-06 14:26:07.000000000 +0000 @@ -1,10 +1,10 @@ -xserver-xorg-video-mach64 (6.9.1+git20120504.84468ba2-0ubuntu0sarvatt~precise) precise; urgency=low +xserver-xorg-video-mach64 (6.9.1+git20120606.68572c1e-0ubuntu0sarvatt~precise) precise; urgency=low - * Checkout from git 20120504 (master branch) up to commit - 84468ba28853fa57170025d9c25cb0029a386ff4 + * Checkout from git 20120606 (master branch) up to commit + 68572c1e41cf6de2f0ef2c9442111384ce863308 * Only added debian/ tree from origin/debian-unstable - -- Robert Hooker Fri, 04 May 2012 18:21:30 -0400 + -- Robert Hooker Wed, 06 Jun 2012 10:16:21 -0400 xserver-xorg-video-mach64 (6.9.1-2) unstable; urgency=low diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/.lastcommit xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/.lastcommit --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/.lastcommit 2012-05-04 22:21:20.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/.lastcommit 2012-06-06 14:16:11.000000000 +0000 @@ -1 +1 @@ -commit 84468ba28853fa57170025d9c25cb0029a386ff4 +commit 68572c1e41cf6de2f0ef2c9442111384ce863308 diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiadjust.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiadjust.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiadjust.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiadjust.c 2012-06-06 14:16:11.000000000 +0000 @@ -25,12 +25,14 @@ #endif #include "ati.h" -#include "atiadjust.h" +#include "atistruct.h" #include "atichip.h" #include "atilock.h" #include "atimach64io.h" #include "atiwonderio.h" +#include "atiadjust.h" + /* * The display start address is expressed in units of 32-bit (VGA) or 64-bit * (accelerator) words where all planar modes are considered as 4bpp modes. @@ -83,15 +85,9 @@ * window. */ void -ATIAdjustFrame -( - int scrnIndex, - int x, - int y, - int flags -) +ATIAdjustFrame(ADJUST_FRAME_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[scrnIndex]; + SCRN_INFO_PTR(arg); ATIPtr pATI = ATIPTR(pScreenInfo); int Base, xy; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiadjust.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiadjust.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiadjust.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiadjust.h 2012-06-06 14:16:11.000000000 +0000 @@ -26,6 +26,6 @@ #include "atipriv.h" extern void ATIAdjustPreInit(ATIPtr); -extern void ATIAdjustFrame(int, int, int, int); +extern void ATIAdjustFrame(ADJUST_FRAME_ARGS_DECL); #endif /* ___ATIADJUST_H___ */ diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/aticonsole.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/aticonsole.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/aticonsole.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/aticonsole.c 2012-06-06 14:16:11.000000000 +0000 @@ -30,7 +30,6 @@ #include "xorgVersion.h" #include "ati.h" -#include "aticonsole.h" #include "atii2c.h" #include "atilock.h" #include "atimach64.h" @@ -39,6 +38,7 @@ #include "atistruct.h" #include "ativga.h" #include "atividmem.h" +#include "aticonsole.h" #ifdef XF86DRI_DEVEL #include "mach64_common.h" @@ -75,7 +75,7 @@ if (!pScreen) return TRUE; - pScreenInfo = xf86Screens[pScreen->myNum]; + pScreenInfo = xf86ScreenToScrn(pScreen); if (!pScreenInfo->vtSema) return TRUE; @@ -558,8 +558,8 @@ (void)ATISaveScreen(pScreen, SCREEN_SAVER_ON); /* Position the screen */ - (*pScreenInfo->AdjustFrame)(pScreenInfo->scrnIndex, - pScreenInfo->frameX0, pScreenInfo->frameY0, 0); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, + pScreenInfo->frameX0, pScreenInfo->frameY0)); SetTimeSinceLastInputEvent(); @@ -621,18 +621,13 @@ * This function switches to another graphics video state. */ Bool -ATISwitchMode -( - int iScreen, - DisplayModePtr pMode, - int flags -) +ATISwitchMode(SWITCH_MODE_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ATIPtr pATI = ATIPTR(pScreenInfo); /* Calculate new hardware data */ - if (!ATIModeCalculate(iScreen, pATI, &pATI->NewHW, pMode)) + if (!ATIModeCalculate(pScreenInfo->scrnIndex, pATI, &pATI->NewHW, pMode)) return FALSE; /* Set new hardware state */ @@ -680,13 +675,9 @@ * This function sets the server's virtual console to a graphics video state. */ Bool -ATIEnterVT -( - int iScreen, - int flags -) +ATIEnterVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); PixmapPtr pScreenPixmap; @@ -757,13 +748,9 @@ * entry. */ void -ATILeaveVT -( - int iScreen, - int flags -) +ATILeaveVT(VT_FUNC_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); @@ -786,16 +773,12 @@ * This function frees all driver data related to a screen. */ void -ATIFreeScreen -( - int iScreen, - int flags -) +ATIFreeScreen(FREE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ATIPtr pATI = ATIPTR(pScreenInfo); - ATII2CFreeScreen(iScreen); + ATII2CFreeScreen(pScreenInfo->scrnIndex); #ifndef AVOID_CPIO diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/aticonsole.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/aticonsole.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/aticonsole.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/aticonsole.h 2012-06-06 14:16:11.000000000 +0000 @@ -33,11 +33,11 @@ extern Bool ATIEnterGraphics(ScreenPtr, ScrnInfoPtr, ATIPtr); extern void ATILeaveGraphics(ScrnInfoPtr, ATIPtr); -extern Bool ATISwitchMode(int, DisplayModePtr, int); +extern Bool ATISwitchMode(SWITCH_MODE_ARGS_DECL); -extern Bool ATIEnterVT(int, int); -extern void ATILeaveVT(int, int); +extern Bool ATIEnterVT(VT_FUNC_ARGS_DECL); +extern void ATILeaveVT(VT_FUNC_ARGS_DECL); -extern void ATIFreeScreen(int, int); +extern void ATIFreeScreen(FREE_SCREEN_ARGS_DECL); #endif /* ___ATICONSOLE_H___ */ diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atidga.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atidga.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atidga.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atidga.c 2012-06-06 14:16:11.000000000 +0000 @@ -28,12 +28,12 @@ #include #include "ati.h" -#include "atiadjust.h" #include "atichip.h" #include "atidac.h" #include "atidga.h" #include "atimode.h" #include "atistruct.h" +#include "atiadjust.h" #include "dgaproc.h" @@ -94,7 +94,6 @@ { ATIPtr pATI = ATIPTR(pScreenInfo); DisplayModePtr pMode; - int iScreen = pScreenInfo->scrnIndex; int frameX0, frameY0; if (pDGAMode) @@ -128,11 +127,11 @@ ATIAdjustPreInit(pATI); ATIModePreInit(pScreenInfo, pATI, &pATI->NewHW); - if (!(*pScreenInfo->SwitchMode)(iScreen, pMode, 0)) + if (!(*pScreenInfo->SwitchMode)(SWITCH_MODE_ARGS(pScreenInfo, pMode))) return FALSE; if (!pDGAMode) pATI->currentMode = NULL; - (*pScreenInfo->AdjustFrame)(iScreen, frameX0, frameY0, 0); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, frameX0, frameY0)); return TRUE; } @@ -151,7 +150,7 @@ int flags ) { - (*pScreenInfo->AdjustFrame)(pScreenInfo->pScreen->myNum, x, y, flags); + (*pScreenInfo->AdjustFrame)(ADJUST_FRAME_ARGS(pScreenInfo, x, y)); } /* diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atidri.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atidri.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atidri.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atidri.c 2012-06-06 14:16:11.000000000 +0000 @@ -67,7 +67,7 @@ */ static Bool ATIInitVisualConfigs( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); int numConfigs = 0; __GLXvisualConfig *pConfigs = NULL; @@ -290,7 +290,7 @@ */ static void ATIEnterServer( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if ( pATI->directRenderingEnabled ) { @@ -336,7 +336,7 @@ #ifdef USE_XAA static void ATIDRITransitionTo2d(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if (pATI->backArea) { @@ -352,7 +352,7 @@ static void ATIDRITransitionTo3d(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); FBAreaPtr fbArea; int width, height; @@ -406,31 +406,31 @@ #ifdef USE_EXA static void ATIDRITransitionTo2d_EXA(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; - exaEnableDisableFBAccess(pScreen->myNum, FALSE); + exaEnableDisableFBAccess(SCREEN_ARG(pScreen), FALSE); pATI->pExa->offScreenBase = pATIDRIServer->backOffset; - exaEnableDisableFBAccess(pScreen->myNum, TRUE); + exaEnableDisableFBAccess(SCREEN_ARG(pScreen), TRUE); pATI->have3DWindows = FALSE; } static void ATIDRITransitionTo3d_EXA(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; - exaEnableDisableFBAccess(pScreen->myNum, FALSE); + exaEnableDisableFBAccess(SCREEN_ARG(pScreen), FALSE); pATI->pExa->offScreenBase = pATIDRIServer->textureOffset + pATIDRIServer->textureSize; - exaEnableDisableFBAccess(pScreen->myNum, TRUE); + exaEnableDisableFBAccess(SCREEN_ARG(pScreen), TRUE); pATI->have3DWindows = TRUE; } @@ -441,7 +441,7 @@ { #ifdef USE_XAA ScreenPtr pScreen = pWin->drawable.pScreen; - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; XAAInfoRecPtr pXAAInfo = pATI->pXAAInfo; @@ -508,7 +508,7 @@ { #ifdef USE_XAA ScreenPtr pScreen = pWin->drawable.pScreen; - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); XAAInfoRecPtr pXAAInfo = pATI->pXAAInfo; @@ -686,7 +686,7 @@ static Bool ATIDRISetBufSize( ScreenPtr pScreen, unsigned int maxSize ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -716,7 +716,7 @@ static Bool ATIDRISetAgpMode( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -791,7 +791,7 @@ */ static Bool ATIDRIAgpInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -961,7 +961,7 @@ static Bool ATIDRIPciInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1013,7 +1013,7 @@ */ static Bool ATIDRIMapInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1036,7 +1036,7 @@ /* Initialize the kernel data structures. */ static Bool ATIDRIKernelInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; drmMach64Init info; @@ -1077,7 +1077,7 @@ */ static Bool ATIDRIAddBuffers( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1109,7 +1109,7 @@ static Bool ATIDRIMapBuffers( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1129,7 +1129,7 @@ static Bool ATIDRIIrqInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if ( pATI->irq <= 0 ) { @@ -1173,7 +1173,7 @@ */ Bool ATIDRIScreenInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); DRIInfoPtr pDRIInfo; ATIDRIPtr pATIDRI; @@ -1445,7 +1445,7 @@ */ Bool ATIDRIFinishScreenInit( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATISAREAPrivPtr pSAREAPriv; ATIDRIPtr pATIDRI; @@ -1538,7 +1538,7 @@ */ void ATIDRIResume( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -1558,7 +1558,7 @@ */ void ATIDRICloseScreen( ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; drmMach64Init info; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ati.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ati.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ati.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ati.h 2012-06-06 14:16:11.000000000 +0000 @@ -25,7 +25,6 @@ #include #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xf86.h" diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64accel.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64accel.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64accel.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64accel.c 2012-06-06 14:16:11.000000000 +0000 @@ -976,7 +976,7 @@ ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); XAAInfoRecPtr pXAAInfo; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64cursor.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64cursor.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64cursor.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64cursor.c 2012-06-06 14:16:11.000000000 +0000 @@ -346,7 +346,7 @@ CursorPtr pCursor ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if (!pATI->CursorBase) @@ -367,7 +367,7 @@ ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); xf86CursorInfoPtr pCursorInfo; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64exa.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64exa.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64exa.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64exa.c 2012-06-06 14:16:11.000000000 +0000 @@ -108,7 +108,7 @@ static void Mach64WaitMarker(ScreenPtr pScreenInfo, int Marker) { - ATIMach64Sync(xf86Screens[pScreenInfo->myNum]); + ATIMach64Sync(xf86ScreenToScrn(pScreenInfo)); } static Bool @@ -159,7 +159,7 @@ unsigned int offset, unsigned int pitch) { #if 0 - ScrnInfoPtr pScreenInfo = xf86Screens[pPix->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPix->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); if (pitch % pATI->pExa->pixmapPitchAlign != 0) @@ -207,7 +207,7 @@ Pixel planemask ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); CARD32 src_pitch_offset, dst_pitch_offset, dp_pix_width; @@ -259,7 +259,7 @@ int h ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDstPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDstPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); srcX *= pATI->XModifier; @@ -319,7 +319,7 @@ Pixel fg ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); CARD32 dst_pitch_offset, dp_pix_width; @@ -358,7 +358,7 @@ int y2 ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPixmap->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPixmap->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); int x = x1; @@ -468,7 +468,7 @@ static void Mach64SetupMemEXA(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); int cpp = (pScreenInfo->bitsPerPixel + 7) / 8; @@ -634,7 +634,7 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen) { - ScrnInfoPtr pScreenInfo = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ExaDriverPtr pExa; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64probe.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64probe.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64probe.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64probe.c 2012-06-06 14:16:11.000000000 +0000 @@ -38,6 +38,8 @@ #include "atiadjust.h" #include "ativalid.h" +#include "xf86PciInfo.h" + #ifndef XSERVER_LIBPCIACCESS static Bool Mach64Probe(DriverPtr pDriver, int flags); #endif diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64render.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64render.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64render.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64render.c 2012-06-06 14:16:11.000000000 +0000 @@ -583,7 +583,7 @@ static Bool Mach64PrepareTexture(PicturePtr pPict, PixmapPtr pPix) { - ScrnInfoPtr pScreenInfo = xf86Screens[pPix->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pPix->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -671,7 +671,7 @@ PixmapPtr pDst ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -818,7 +818,7 @@ int h ) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); Mach64ContextRegs3D *m3d = &pATI->m3d; @@ -895,7 +895,7 @@ void Mach64DoneComposite(PixmapPtr pDst) { - ScrnInfoPtr pScreenInfo = xf86Screens[pDst->drawable.pScreen->myNum]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pDst->drawable.pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRISync(pScreenInfo); diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64xv.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64xv.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atimach64xv.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atimach64xv.c 2012-06-06 14:16:11.000000000 +0000 @@ -524,7 +524,7 @@ FBLinearPtr pLinear ) { - ATIPtr pATI = ATIPTR(xf86Screens[pLinear->pScreen->myNum]); + ATIPtr pATI = ATIPTR(xf86ScreenToScrn(pLinear->pScreen)); pATI->pXVBuffer = NULL; outf(OVERLAY_SCALE_CNTL, SCALE_EN); @@ -1349,7 +1349,7 @@ XF86VideoAdaptorPtr **pppAdaptor ) { - ScreenPtr pScreen = screenInfo.screens[pScreenInfo->scrnIndex]; + ScreenPtr pScreen = xf86ScrnToScreen(pScreenInfo); ATIPtr pATI = ATIPTR(pScreenInfo); XF86VideoAdaptorPtr *ppAdaptor = NULL; XF86VideoAdaptorPtr pAdaptor; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atipreinit.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atipreinit.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atipreinit.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atipreinit.c 2012-06-06 14:16:11.000000000 +0000 @@ -28,7 +28,6 @@ #include #include "ati.h" -#include "atiadjust.h" #include "atiaudio.h" #include "atibus.h" #include "atichip.h" @@ -50,6 +49,7 @@ #include "atividmem.h" #include "atiwonderio.h" #include "atixv.h" +#include "atiadjust.h" #include "vbe.h" #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiscreen.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiscreen.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiscreen.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiscreen.c 2012-06-06 14:16:11.000000000 +0000 @@ -34,17 +34,17 @@ #include "ati.h" #include "atibus.h" #include "atichip.h" -#include "aticonsole.h" #include "aticursor.h" #include "atidac.h" #include "atidga.h" #include "atidri.h" #include "atimach64.h" #include "atimode.h" -#include "atiscreen.h" #include "atistruct.h" +#include "atiscreen.h" #include "atixv.h" #include "atimach64accel.h" +#include "aticonsole.h" #ifdef XF86DRI_DEVEL #include "mach64_dri.h" @@ -124,11 +124,10 @@ static Bool ATIMach64SetupMemXAA_NoDRI ( - int iScreen, + ScrnInfoPtr pScreenInfo, ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; ATIPtr pATI = ATIPTR(pScreenInfo); int maxScanlines = ATIMach64MaxY; @@ -166,11 +165,10 @@ static Bool ATIMach64SetupMemXAA ( - int iScreen, + ScrnInfoPtr pScreenInfo, ScreenPtr pScreen ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; ATIPtr pATI = ATIPTR(pScreenInfo); ATIDRIServerInfoPtr pATIDRIServer = pATI->pDRIServerInfo; @@ -276,7 +274,7 @@ if (scanlines > ATIMach64MaxY) scanlines = ATIMach64MaxY; if ( pATIDRIServer->IsPCI && pATIDRIServer->textureSize == 0 ) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Not enough memory for local textures, disabling DRI\n"); ATIDRICloseScreen(pScreen); pATI->directRenderingEnabled = FALSE; @@ -322,13 +320,13 @@ } - xf86DrvMsg(iScreen, X_INFO, "Will use %d kB of offscreen memory for XAA\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use %d kB of offscreen memory for XAA\n", (offscreenBytes - pATIDRIServer->textureSize)/1024); - xf86DrvMsg(iScreen, X_INFO, "Will use back buffer at offset 0x%x\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use back buffer at offset 0x%x\n", pATIDRIServer->backOffset); - xf86DrvMsg(iScreen, X_INFO, "Will use depth buffer at offset 0x%x\n", + xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Will use depth buffer at offset 0x%x\n", pATIDRIServer->depthOffset); if (pATIDRIServer->textureSize > 0) { @@ -350,15 +348,9 @@ * This function is called by DIX to initialise the screen. */ Bool -ATIScreenInit -( - int iScreen, - ScreenPtr pScreen, - int argc, - char **argv -) +ATIScreenInit(SCREEN_INIT_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); pointer pFB; int VisualMask; @@ -411,7 +403,7 @@ * 3D triangle setup (the VERTEX_* registers) */ if (pATI->Chip < ATI_CHIP_264GTPRO) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Direct rendering is not supported for ATI chips earlier than " "the ATI 3D Rage Pro.\n"); pATI->directRenderingEnabled = FALSE; @@ -428,13 +420,13 @@ + (pScreenInfo->virtualY * 2 / cpp); /* depth buffer (always 16-bit) */ if (!pATI->OptionAccel) { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "Acceleration disabled, not initializing the DRI\n"); pATI->directRenderingEnabled = FALSE; } else if ( maxY > requiredY ) { pATI->directRenderingEnabled = ATIDRIScreenInit(pScreen); } else { - xf86DrvMsg(iScreen, X_WARNING, + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, "DRI static buffer allocation failed -- " "need at least %d kB video memory\n", (pScreenInfo->displayWidth * requiredY * cpp ) / 1024); @@ -512,13 +504,13 @@ #ifdef XF86DRI_DEVEL if (pATI->directRenderingEnabled) { - if (!ATIMach64SetupMemXAA(iScreen, pScreen)) + if (!ATIMach64SetupMemXAA(pScreenInfo, pScreen)) return FALSE; } else #endif /* XF86DRI_DEVEL */ { - if (!ATIMach64SetupMemXAA_NoDRI(iScreen, pScreen)) + if (!ATIMach64SetupMemXAA_NoDRI(pScreenInfo, pScreen)) return FALSE; } @@ -620,13 +612,9 @@ * This function is called by DIX to close the screen. */ Bool -ATICloseScreen -( - int iScreen, - ScreenPtr pScreen -) +ATICloseScreen (CLOSE_SCREEN_ARGS_DECL) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); ATIPtr pATI = ATIPTR(pScreenInfo); #ifdef XF86DRI_DEVEL @@ -680,5 +668,5 @@ pScreenInfo->pScreen = NULL; pScreen->CloseScreen = pATI->CloseScreen; - return (*pScreen->CloseScreen)(iScreen, pScreen); + return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); } diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiscreen.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiscreen.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atiscreen.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atiscreen.h 2012-06-06 14:16:11.000000000 +0000 @@ -25,7 +25,7 @@ #include "screenint.h" -extern Bool ATIScreenInit(int, ScreenPtr, int, char **); -extern Bool ATICloseScreen(int, ScreenPtr); +extern Bool ATIScreenInit(SCREEN_INIT_ARGS_DECL); +extern Bool ATICloseScreen(CLOSE_SCREEN_ARGS_DECL); #endif /* ___ATISCREEN_H___ */ diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atistruct.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atistruct.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/atistruct.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/atistruct.h 2012-06-06 14:16:11.000000000 +0000 @@ -65,6 +65,8 @@ #include "atipcirename.h" +#include "compat-api.h" + #define CacheSlotOf(____Register) ((____Register) / UnitOf(DWORD_SELECT)) /* diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ativalid.c xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ativalid.c --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ativalid.c 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ativalid.c 2012-06-06 14:16:11.000000000 +0000 @@ -24,11 +24,11 @@ #include "config.h" #endif +#include "xf86.h" #include "atichip.h" #include "atistruct.h" #include "ativalid.h" -#include "xf86.h" /* * ATIValidMode -- @@ -38,13 +38,13 @@ ModeStatus ATIValidMode ( - int iScreen, + SCRN_ARG_TYPE arg, DisplayModePtr pMode, Bool Verbose, int flags ) { - ScrnInfoPtr pScreenInfo = xf86Screens[iScreen]; + SCRN_INFO_PTR(arg); ATIPtr pATI = ATIPTR(pScreenInfo); int HBlankWidth, HAdjust, VScan, VInterlace; diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ativalid.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ativalid.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/ativalid.h 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/ativalid.h 2012-06-06 14:16:11.000000000 +0000 @@ -25,6 +25,6 @@ #include "xf86str.h" -extern ModeStatus ATIValidMode(int, DisplayModePtr, Bool, int); +extern ModeStatus ATIValidMode(SCRN_ARG_TYPE arg, DisplayModePtr, Bool, int); #endif /* ___ATIVALID_H___ */ diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/compat-api.h xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/compat-api.h --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/compat-api.h 1970-01-01 00:00:00.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/compat-api.h 2012-06-06 14:16:11.000000000 +0000 @@ -0,0 +1,101 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Dave Airlie + */ + +/* this file provides API compat between server post 1.13 and pre it, + it should be reused inside as many drivers as possible */ +#ifndef COMPAT_API_H +#define COMPAT_API_H + +#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR +#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] +#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +#endif + +#ifndef XF86_HAS_SCRN_CONV +#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] +#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] +#endif + +#ifndef XF86_SCRN_INTERFACE + +#define SCRN_ARG_TYPE int +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = xf86Screens[(arg1)] + +#define SCREEN_ARG_TYPE int +#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] + +#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS scrnIndex, pScreen + +#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags +#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + +#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr pMode, int flags +#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + +#define FREE_SCREEN_ARGS_DECL int arg, int flags + +#define VT_FUNC_ARGS_DECL int arg, int flags +#define VT_FUNC_ARGS pScreenInfo->scrnIndex, 0 + +#define XF86_SCRN_ARG(x) ((x)->scrnIndex) +#define SCREEN_ARG(x) ((x)->myNum) +#else +#define SCRN_ARG_TYPE ScrnInfoPtr +#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScreenInfo = (arg1) + +#define SCREEN_ARG_TYPE ScreenPtr +#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) + +#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask +#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + +#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen +#define CLOSE_SCREEN_ARGS pScreen + +#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y +#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y + +#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr pMode +#define SWITCH_MODE_ARGS(arg, m) arg, m + +#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg + +#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg +#define VT_FUNC_ARGS pScreenInfo + +#define XF86_SCRN_ARG(x) (x) + +#define SCREEN_ARG(x) (x) +#endif + +#endif diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/Makefile.am xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/Makefile.am --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/Makefile.am 2012-05-04 22:21:14.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/Makefile.am 2012-06-06 14:16:11.000000000 +0000 @@ -107,4 +107,5 @@ mach64_common.h \ mach64_dri.h \ mach64_sarea.h \ - atipcirename.h + atipcirename.h \ + compat-api.h diff -Nru xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/Makefile.in xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/Makefile.in --- xserver-xorg-video-mach64-6.9.1+git20120504.84468ba2/src/Makefile.in 2012-05-04 22:21:29.000000000 +0000 +++ xserver-xorg-video-mach64-6.9.1+git20120606.68572c1e/src/Makefile.in 2012-06-06 14:16:20.000000000 +0000 @@ -377,7 +377,8 @@ mach64_common.h \ mach64_dri.h \ mach64_sarea.h \ - atipcirename.h + atipcirename.h \ + compat-api.h all: all-am