Module Name: xsrc
Committed By: mrg
Date: Mon Jun 3 10:02:22 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-tdfx/dist/src: tdfx_dri.c tdfx_driver.c
tdfx_priv.c
xsrc/external/mit/xf86-video-tga/dist/src: tga_line.c
Removed Files:
xsrc/external/mit/xf86-video-tga/dist: README.sgml
Log Message:
merge xf86-video-tdfx 1.4.5 and xf86-video-tga 1.2.2
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c \
xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-tga/dist/README.sgml
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.3
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c:1.2 Thu Aug 27 04:21:06 2009
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_dri.c Mon Jun 3 10:02:22 2013
@@ -5,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Priv.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "fb.h"
@@ -40,7 +39,7 @@ static void TDFXDRITransitionTo3d(Screen
static Bool
TDFXInitVisualConfigs(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
int numConfigs = 0;
__GLXvisualConfig *pConfigs = 0;
@@ -53,19 +52,19 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
case 16:
numConfigs = 16;
- if (!(pConfigs = (__GLXvisualConfig*)xcalloc(sizeof(__GLXvisualConfig),
+ if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
numConfigs))) {
return FALSE;
}
- if (!(pTDFXConfigs = (TDFXConfigPrivPtr)xcalloc(sizeof(TDFXConfigPrivRec),
+ if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
numConfigs))) {
- xfree(pConfigs);
+ free(pConfigs);
return FALSE;
}
- if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)xcalloc(sizeof(TDFXConfigPrivPtr),
+ if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
numConfigs))) {
- xfree(pConfigs);
- xfree(pTDFXConfigs);
+ free(pConfigs);
+ free(pTDFXConfigs);
return FALSE;
}
for (i=0; i<numConfigs; i++)
@@ -144,20 +143,20 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
case 32:
numConfigs = 8;
- pConfigs = (__GLXvisualConfig*) xcalloc(sizeof(__GLXvisualConfig), numConfigs);
+ pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig), numConfigs);
if (!pConfigs)
return FALSE;
- pTDFXConfigs = (TDFXConfigPrivPtr) xcalloc(sizeof(TDFXConfigPrivRec), numConfigs);
+ pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec), numConfigs);
if (!pTDFXConfigs) {
- xfree(pConfigs);
+ free(pConfigs);
return FALSE;
}
- pTDFXConfigPtrs = (TDFXConfigPrivPtr *) xcalloc(sizeof(TDFXConfigPrivPtr), numConfigs);
+ pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr), numConfigs);
if (!pTDFXConfigPtrs) {
- xfree(pConfigs);
- xfree(pTDFXConfigs);
+ free(pConfigs);
+ free(pTDFXConfigs);
return FALSE;
}
@@ -243,15 +242,14 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
}
static void
-TDFXDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result,
- pointer pReadmask)
+TDFXDoWakeupHandler(WAKEUPHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[screenNum];
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
pTDFX->pDRIInfo->wrap.WakeupHandler = pTDFX->coreWakeupHandler;
- (*pTDFX->pDRIInfo->wrap.WakeupHandler) (screenNum, wakeupData, result, pReadmask);
+ (*pTDFX->pDRIInfo->wrap.WakeupHandler) (WAKEUPHANDLER_ARGS);
pTDFX->pDRIInfo->wrap.WakeupHandler = TDFXDoWakeupHandler;
@@ -259,24 +257,23 @@ TDFXDoWakeupHandler(int screenNum, point
}
static void
-TDFXDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
- pointer pReadmask)
+TDFXDoBlockHandler(BLOCKHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[screenNum];
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
TDFXCheckSync(pScrn);
pTDFX->pDRIInfo->wrap.BlockHandler = pTDFX->coreBlockHandler;
- (*pTDFX->pDRIInfo->wrap.BlockHandler) (screenNum, blockData, pTimeout, pReadmask);
+ (*pTDFX->pDRIInfo->wrap.BlockHandler) (BLOCKHANDLER_ARGS);
pTDFX->pDRIInfo->wrap.BlockHandler = TDFXDoBlockHandler;
}
Bool TDFXDRIScreenInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
DRIInfoPtr pDRIInfo;
TDFXDRIPtr pTDFXDRI;
@@ -350,7 +347,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo);
} else {
- pDRIInfo->busIdString = xalloc(64);
+ pDRIInfo->busIdString = malloc(64);
sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
@@ -395,7 +392,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen
pDRIInfo->SAREASize = SAREA_MAX;
#endif
- if (!(pTDFXDRI = (TDFXDRIPtr)xcalloc(sizeof(TDFXDRIRec),1))) {
+ if (!(pTDFXDRI = (TDFXDRIPtr)calloc(sizeof(TDFXDRIRec),1))) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[dri] DRI memory allocation failed, disabling DRI.\n");
DRIDestroyInfoRec(pTDFX->pDRIInfo);
@@ -421,7 +418,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen
pDRIInfo->createDummyCtxPriv = FALSE;
if (!DRIScreenInit(pScreen, pDRIInfo, &pTDFX->drmSubFD)) {
- xfree(pDRIInfo->devPrivate);
+ free(pDRIInfo->devPrivate);
pDRIInfo->devPrivate=0;
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
@@ -476,21 +473,21 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen
void
TDFXDRICloseScreen(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
DRICloseScreen(pScreen);
if (pTDFX->pDRIInfo) {
if (pTDFX->pDRIInfo->devPrivate) {
- xfree(pTDFX->pDRIInfo->devPrivate);
+ free(pTDFX->pDRIInfo->devPrivate);
pTDFX->pDRIInfo->devPrivate=0;
}
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
}
- if (pTDFX->pVisualConfigs) xfree(pTDFX->pVisualConfigs);
- if (pTDFX->pVisualConfigsPriv) xfree(pTDFX->pVisualConfigsPriv);
+ if (pTDFX->pVisualConfigs) free(pTDFX->pVisualConfigs);
+ if (pTDFX->pVisualConfigsPriv) free(pTDFX->pVisualConfigsPriv);
}
static Bool
@@ -510,7 +507,7 @@ TDFXDestroyContext(ScreenPtr pScreen, dr
Bool
TDFXDRIFinishScreenInit(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
TDFXDRIPtr pTDFXDRI;
@@ -548,8 +545,9 @@ TDFXDRISwapContext(ScreenPtr pScreen, DR
static void
TDFXDRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index)
{
+#ifdef HAVE_XAA_H
ScreenPtr pScreen = pWin->drawable.pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
BoxPtr pbox;
int nbox;
@@ -570,15 +568,18 @@ TDFXDRIInitBuffers(WindowPtr pWin, Regio
}
TDFXSelectBuffer(pTDFX, TDFX_FRONT);
+
pTDFX->AccelInfoRec->NeedToSync = TRUE;
+#endif
}
static void
TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
RegionPtr prgnSrc, CARD32 index)
{
+#ifdef HAVE_XAA_H
ScreenPtr pScreen = pParent->drawable.pScreen;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
int dx, dy, xdir, ydir, i, x, y, nbox;
BoxPtr pbox;
@@ -612,6 +613,8 @@ TDFXDRIMoveBuffers(WindowPtr pParent, DD
TDFXSelectBuffer(pTDFX, TDFX_FRONT);
pTDFX->AccelInfoRec->NeedToSync = TRUE;
+#endif
+
}
/*
@@ -626,7 +629,7 @@ TDFXDRIOpenFullScreen(ScreenPtr pScreen)
TDFXPtr pTDFX;
xf86DrvMsg(pScreen->myNum, X_INFO, "OpenFullScreen\n");
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pTDFX=TDFXPTR(pScrn);
if (pTDFX->numChips>1) {
TDFXSetupSLI(pScrn);
@@ -642,7 +645,7 @@ TDFXDRICloseFullScreen(ScreenPtr pScreen
ScrnInfoPtr pScrn;
xf86DrvMsg(pScreen->myNum, X_INFO, "CloseFullScreen\n");
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
TDFXDisableSLI(pScrn);
#endif
return TRUE;
@@ -651,7 +654,7 @@ TDFXDRICloseFullScreen(ScreenPtr pScreen
static void
TDFXDRITransitionTo2d(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
xf86FreeOffscreenArea(pTDFX->reservedArea);
@@ -660,7 +663,7 @@ TDFXDRITransitionTo2d(ScreenPtr pScreen)
static void
TDFXDRITransitionTo3d(ScreenPtr pScreen)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
FBAreaPtr pArea;
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.3
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c:1.2 Sun Jan 22 18:26:42 2012
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_driver.c Mon Jun 3 10:02:22 2013
@@ -99,10 +99,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
-#ifdef XF86DRI
+#ifdef TDFXDRI
#include "dri.h"
#endif
+#define USE_INT10 1
+#define USE_PCIVGAIO (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12)
+
/* Required Functions: */
static const OptionInfoRec * TDFXAvailableOptions(int chipid, int busid);
@@ -121,28 +124,28 @@ static Bool TDFXProbe(DriverPtr drv, int
static Bool TDFXPreInit(ScrnInfoPtr pScrn, int flags);
/* Initialize a screen */
-static Bool TDFXScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv);
+static Bool TDFXScreenInit(SCREEN_INIT_ARGS_DECL);
/* Enter from a virtual terminal */
-static Bool TDFXEnterVT(int scrnIndex, int flags);
+static Bool TDFXEnterVT(VT_FUNC_ARGS_DECL);
/* Leave to a virtual terminal */
-static void TDFXLeaveVT(int scrnIndex, int flags);
+static void TDFXLeaveVT(VT_FUNC_ARGS_DECL);
/* Close down each screen we initialized */
-static Bool TDFXCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool TDFXCloseScreen(CLOSE_SCREEN_ARGS_DECL);
/* Change screensaver state */
static Bool TDFXSaveScreen(ScreenPtr pScreen, int mode);
/* Cleanup server private data */
-static void TDFXFreeScreen(int scrnIndex, int flags);
+static void TDFXFreeScreen(FREE_SCREEN_ARGS_DECL);
/* Check if a mode is valid on the hardware */
-static ModeStatus TDFXValidMode(int scrnIndex, DisplayModePtr mode,
+static ModeStatus TDFXValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode,
Bool verbose, int flags);
-static void TDFXBlockHandler(int, pointer, pointer, pointer);
+static void TDFXBlockHandler(BLOCKHANDLER_ARGS_DECL);
/* Switch to various Display Power Management System levels */
static void TDFXDisplayPowerManagementSet(ScrnInfoPtr pScrn,
@@ -303,7 +306,7 @@ static void
TDFXFreeRec(ScrnInfoPtr pScrn) {
if (!pScrn) return;
if (!pScrn->driverPrivate) return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate=0;
}
@@ -426,7 +429,7 @@ TDFXProbe(DriverPtr drv, int flags)
devSections, numDevSections,
drv, &usedChips);
- xfree(devSections);
+ free(devSections);
if (numUsed<=0) return FALSE;
if (flags & PROBE_DETECT)
@@ -454,7 +457,7 @@ TDFXProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
return foundScreen;
}
@@ -763,7 +766,7 @@ static xf86MonPtr doTDFXDDC(ScrnInfoPtr
reg = pTDFX->readLong(pTDFX, VIDSERIALPARALLELPORT);
pTDFX->writeLong(pTDFX, VIDSERIALPARALLELPORT, reg | VSP_ENABLE_IIC0);
- pMon = xf86DoEDID_DDC2(pScrn->scrnIndex, pTDFX->pI2CBus);
+ pMon = xf86DoEDID_DDC2(XF86_SCRN_ARG(pScrn), pTDFX->pI2CBus);
if (pMon == NULL)
xf86Msg(X_WARNING, "No DDC2 capable monitor found\n");
@@ -830,6 +833,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags
/* Allocate a vgaHWRec */
if (!vgaHWGetHWRec(pScrn)) return FALSE;
+ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
#if USE_INT10
#if !defined(__powerpc__)
@@ -933,7 +937,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags
/* Process the options */
xf86CollectOptions(pScrn, NULL);
- if (!(pTDFX->Options = xalloc(sizeof(TDFXOptions))))
+ if (!(pTDFX->Options = malloc(sizeof(TDFXOptions))))
return FALSE;
memcpy(pTDFX->Options, TDFXOptions, sizeof(TDFXOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTDFX->Options);
@@ -1109,10 +1113,11 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags
return FALSE;
}
- if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE)) {
+ pTDFX->NoAccel = xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE);
+ if (!pTDFX->NoAccel) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- TDFXFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "No acceleration available\n");
+ pTDFX->NoAccel = TRUE;
}
}
@@ -1234,7 +1239,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags
pTDFX->writeLong(pTDFX, MISCINIT0, pTDFX->ModeReg.miscinit0);
#endif
-#ifdef XF86DRI
+#ifdef TDFXDRI
/* Load the dri module if requested. */
if (xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, FALSE)) {
xf86LoadSubModule(pScrn, "dri");
@@ -1688,7 +1693,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
}
#define T_B_SIZE (64 * 1024)
- bios = xcalloc(T_B_SIZE, 1);
+ bios = calloc(T_B_SIZE, 1);
if (!bios)
return FALSE;
@@ -1698,7 +1703,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
if (!xf86ReadPciBIOS(0, pTDFX->PciTag[0], 1, bios, T_B_SIZE)) {
#if 0
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Bad BIOS read.\n");
- xfree(bios);
+ free(bios);
return FALSE;
#endif
}
@@ -1706,7 +1711,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
if (bios[0] != 0x55 || bios[1] != 0xAA) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Bad BIOS signature.\n");
- xfree(bios);
+ free(bios);
return FALSE;
}
@@ -1750,7 +1755,7 @@ TDFXInitWithBIOSData(ScrnInfoPtr pScrn)
pTDFX->writeLong(pTDFX, MISCINIT0, 0xF3);
pTDFX->writeLong(pTDFX, MISCINIT0, uint[1]);
- xfree(bios);
+ free(bios);
return TRUE;
}
#endif
@@ -1912,16 +1917,16 @@ TDFXModeInit(ScrnInfoPtr pScrn, DisplayM
mode->CrtcHSkew=hskew;
}
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
- DRILock(screenInfo.screens[pScrn->scrnIndex], 0);
- TDFXSwapContextFifo(screenInfo.screens[pScrn->scrnIndex]);
+ DRILock(xf86ScrnToScreen(pScrn), 0);
+ TDFXSwapContextFifo(xf86ScrnToScreen(pScrn));
}
#endif
DoRestore(pScrn, &hwp->ModeReg, &pTDFX->ModeReg, FALSE);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
- DRIUnlock(screenInfo.screens[pScrn->scrnIndex]);
+ DRIUnlock(xf86ScrnToScreen(pScrn));
}
#endif
@@ -2199,19 +2204,19 @@ static void allocateMemory(ScrnInfoPtr p
}
static Bool
-TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) {
+TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
ScrnInfoPtr pScrn;
vgaHWPtr hwp;
TDFXPtr pTDFX;
VisualPtr visual;
BoxRec MemBox;
-#ifdef XF86DRI
+#ifdef TDFXDRI
MessageType driFrom = X_DEFAULT;
#endif
int scanlines;
TDFXTRACE("TDFXScreenInit start\n");
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pTDFX = TDFXPTR(pScrn);
hwp = VGAHWPTR(pScrn);
@@ -2313,8 +2318,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
miSetPixmapDepths ();
- pTDFX->NoAccel=xf86ReturnOptValBool(pTDFX->Options, OPTION_NOACCEL, FALSE);
-#ifdef XF86DRI
+#ifdef TDFXDRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
* is called. fbScreenInit will eventually call into the drivers
@@ -2343,7 +2347,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
return FALSE;
break;
default:
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Internal error: invalid bpp (%d) in TDFXScrnInit\n",
pScrn->bitsPerPixel);
return FALSE;
@@ -2404,7 +2408,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
return FALSE;
}
- TDFXAdjustFrame(scrnIndex, 0, 0, 0);
+ TDFXAdjustFrame(ADJUST_FRAME_ARGS(pScrn, 0, 0));
xf86DPMSInit(pScreen, TDFXDisplayPowerManagementSet, 0);
@@ -2423,7 +2427,7 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
* in of TDFXCloseScreen() before the rest is unwrapped
*/
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
/* Now that mi, fb, drm and others have done their thing,
* complete the DRI setup.
@@ -2444,22 +2448,20 @@ TDFXScreenInit(int scrnIndex, ScreenPtr
}
Bool
-TDFXSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) {
- ScrnInfoPtr pScrn;
+TDFXSwitchMode(SWITCH_MODE_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
TDFXTRACE("TDFXSwitchMode start\n");
- pScrn=xf86Screens[scrnIndex];
return TDFXModeInit(pScrn, mode);
}
void
-TDFXAdjustFrame(int scrnIndex, int x, int y, int flags) {
- ScrnInfoPtr pScrn;
+TDFXAdjustFrame(ADJUST_FRAME_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
TDFXPtr pTDFX;
TDFXRegPtr tdfxReg;
TDFXTRACE("TDFXAdjustFrame start\n");
- pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
if (pTDFX->ShowCache && y && pScrn->vtSema)
@@ -2474,45 +2476,43 @@ TDFXAdjustFrame(int scrnIndex, int x, in
}
static Bool
-TDFXEnterVT(int scrnIndex, int flags) {
- ScrnInfoPtr pScrn;
+TDFXEnterVT(VT_FUNC_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
ScreenPtr pScreen;
-#ifdef XF86DRI
+#ifdef TDFXDRI
TDFXPtr pTDFX;
#endif
TDFXTRACE("TDFXEnterVT start\n");
- pScrn = xf86Screens[scrnIndex];
- pScreen = screenInfo.screens[scrnIndex];
+ pScreen = xf86ScrnToScreen(pScrn);
TDFXInitFifo(pScreen);
-#ifdef XF86DRI
+#ifdef TDFXDRI
pTDFX = TDFXPTR(pScrn);
if (pTDFX->directRenderingEnabled) {
DRIUnlock(pScreen);
}
#endif
if (!TDFXModeInit(pScrn, pScrn->currentMode)) return FALSE;
- TDFXAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+ TDFXAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
return TRUE;
}
static void
-TDFXLeaveVT(int scrnIndex, int flags) {
- ScrnInfoPtr pScrn;
+TDFXLeaveVT(VT_FUNC_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
vgaHWPtr hwp;
ScreenPtr pScreen;
TDFXPtr pTDFX;
TDFXTRACE("TDFXLeaveVT start\n");
- pScrn = xf86Screens[scrnIndex];
hwp=VGAHWPTR(pScrn);
TDFXRestore(pScrn);
vgaHWLock(hwp);
- pScreen = screenInfo.screens[scrnIndex];
+ pScreen = xf86ScrnToScreen(pScrn);
pTDFX = TDFXPTR(pScrn);
pTDFX->sync(pScrn);
TDFXShutdownFifo(pScreen);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
DRILock(pScreen, 0);
}
@@ -2520,18 +2520,18 @@ TDFXLeaveVT(int scrnIndex, int flags) {
}
static Bool
-TDFXCloseScreen(int scrnIndex, ScreenPtr pScreen)
+TDFXCloseScreen(CLOSE_SCREEN_ARGS_DECL)
{
ScrnInfoPtr pScrn;
vgaHWPtr hwp;
TDFXPtr pTDFX;
TDFXTRACE("TDFXCloseScreen start\n");
- pScrn = xf86Screens[scrnIndex];
+ pScrn = xf86ScreenToScrn(pScreen);
hwp = VGAHWPTR(pScrn);
pTDFX = TDFXPTR(pScrn);
-#ifdef XF86DRI
+#ifdef TDFXDRI
if (pTDFX->directRenderingEnabled) {
TDFXDRICloseScreen(pScreen);
pTDFX->directRenderingEnabled=FALSE;
@@ -2547,48 +2547,50 @@ TDFXCloseScreen(int scrnIndex, ScreenPtr
vgaHWUnmapMem(pScrn);
}
+#ifdef HAVE_XAA_H
if (pTDFX->AccelInfoRec) XAADestroyInfoRec(pTDFX->AccelInfoRec);
pTDFX->AccelInfoRec=0;
- if (pTDFX->DGAModes) xfree(pTDFX->DGAModes);
+#endif
+ if (pTDFX->DGAModes) free(pTDFX->DGAModes);
pTDFX->DGAModes=0;
if (pTDFX->scanlineColorExpandBuffers[0])
- xfree(pTDFX->scanlineColorExpandBuffers[0]);
+ free(pTDFX->scanlineColorExpandBuffers[0]);
pTDFX->scanlineColorExpandBuffers[0]=0;
if (pTDFX->scanlineColorExpandBuffers[1])
- xfree(pTDFX->scanlineColorExpandBuffers[1]);
+ free(pTDFX->scanlineColorExpandBuffers[1]);
pTDFX->scanlineColorExpandBuffers[1]=0;
if (pTDFX->overlayAdaptor)
- xfree(pTDFX->overlayAdaptor);
+ free(pTDFX->overlayAdaptor);
pTDFX->overlayAdaptor=0;
if (pTDFX->textureAdaptor)
- xfree(pTDFX->textureAdaptor);
+ free(pTDFX->textureAdaptor);
pTDFX->textureAdaptor=0;
pScrn->vtSema=FALSE;
pScreen->BlockHandler = pTDFX->BlockHandler;
pScreen->CloseScreen = pTDFX->CloseScreen;
- return (*pScreen->CloseScreen)(scrnIndex, pScreen);
+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
}
static void
-TDFXFreeScreen(int scrnIndex, int flags) {
+TDFXFreeScreen(FREE_SCREEN_ARGS_DECL) {
+ SCRN_INFO_PTR(arg);
TDFXTRACE("TDFXFreeScreen start\n");
- TDFXFreeRec(xf86Screens[scrnIndex]);
+ TDFXFreeRec(pScrn);
if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
- vgaHWFreeHWRec(xf86Screens[scrnIndex]);
+ vgaHWFreeHWRec(pScrn);
}
static ModeStatus
-TDFXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) {
- ScrnInfoPtr pScrn;
+TDFXValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags) {
+ SCRN_INFO_PTR(arg);
TDFXPtr pTDFX;
TDFXTRACE("TDFXValidMode start\n");
if ((mode->HDisplay>2048) || (mode->VDisplay>1536))
return MODE_BAD;
/* Banshee doesn't support interlace, but Voodoo 3 and higher do. */
- pScrn = xf86Screens[scrnIndex];
pTDFX = TDFXPTR(pScrn);
if (mode->Flags&V_INTERLACE) {
switch (pTDFX->ChipType) {
@@ -2637,7 +2639,7 @@ TDFXBlankScreen(ScrnInfoPtr pScrn, Bool
static Bool
TDFXSaveScreen(ScreenPtr pScreen, int mode)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
Bool unblank;
TDFXTRACE("TDFXSaveScreen start\n");
@@ -2654,14 +2656,14 @@ TDFXSaveScreen(ScreenPtr pScreen, int mo
}
static void
-TDFXBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
+TDFXBlockHandler(BLOCKHANDLER_ARGS_DECL)
{
- ScreenPtr pScreen = screenInfo.screens[i];
- ScrnInfoPtr pScrn = xf86Screens[i];
+ SCREEN_PTR(arg);
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
TDFXPtr pTDFX = TDFXPTR(pScrn);
pScreen->BlockHandler = pTDFX->BlockHandler;
- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+ (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
pScreen->BlockHandler = TDFXBlockHandler;
if(pTDFX->VideoTimerCallback) {
Index: xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c
diff -u xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c:1.2 xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c:1.3
--- xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c:1.2 Wed Jun 10 01:55:06 2009
+++ xsrc/external/mit/xf86-video-tdfx/dist/src/tdfx_priv.c Mon Jun 3 10:02:22 2013
@@ -192,14 +192,14 @@ Bool TDFXInitFifo(ScreenPtr pScreen)
ScrnInfoPtr pScrn;
TDFXPtr pTDFX;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pTDFX=TDFXPTR(pScrn);
#ifdef DEBUG_FIFO
pTDFX->fifoMirrorBase=0;
#endif
pTDFX->fifoBase = (uint32*)(pTDFX->FbBase+pTDFX->fifoOffset);
#ifdef DEBUG_FIFO
- pTDFX->fifoMirrorBase = xalloc(pTDFX->fifoSize);
+ pTDFX->fifoMirrorBase = malloc(pTDFX->fifoSize);
pTDFX->fifoMirrorPtr = pTDFX->fifoMirrorBase;
#endif
pTDFX->sync=TDFXSyncFifo;
@@ -212,12 +212,12 @@ void TDFXShutdownFifo(ScreenPtr pScreen)
ScrnInfoPtr pScrn;
TDFXPtr pTDFX;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pTDFX=TDFXPTR(pScrn);
TDFXWriteLongMMIO(pTDFX, SST_FIFO_BASESIZE0, 0);
pTDFX->sync=TDFXSync;
#ifdef DEBUG_FIFO
- if (pTDFX->fifoMirrorBase) xfree(pTDFX->fifoMirrorBase);
+ if (pTDFX->fifoMirrorBase) free(pTDFX->fifoMirrorBase);
pTDFX->fifoMirrorBase=0;
#endif
}
@@ -234,7 +234,7 @@ GetReadPtr(TDFXPtr pTDFX)
return read_ptr;
}
-#ifdef XF86DRI
+#ifdef TDFXDRI
void TDFXSwapContextFifo(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn;
@@ -242,7 +242,7 @@ void TDFXSwapContextFifo(ScreenPtr pScre
int dummy, readPos;
TDFXSAREAPriv *sPriv;
- pScrn = xf86Screens[pScreen->myNum];
+ pScrn = xf86ScreenToScrn(pScreen);
pTDFX=TDFXPTR(pScrn);
sPriv=(TDFXSAREAPriv*)DRIGetSAREAPrivate(pScreen);
/* if (sPriv)
Index: xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c
diff -u xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c:1.3 xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c:1.4
--- xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c:1.3 Fri Jun 12 01:50:43 2009
+++ xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c Mon Jun 3 10:02:22 2013
@@ -1,5 +1,3 @@
-/* $XFree86: $ */
-
/*
* Copyright 1999 by Matthew Grossman, Seattle, USA.
*
@@ -44,12 +42,13 @@
#include "pixmapstr.h"
#include "miline.h"
#include "xf86str.h"
-#include "xaa.h"
-#include "xaalocal.h"
/* #include "tga.h" */
#include "tga_regs.h"
+#ifdef HAVE_XAA_H
+#include "xaa.h"
+#include "xaalocal.h"
/* line functions */
extern void
TGASetupForSolidLine(ScrnInfoPtr pScrn, int color, int rop,
@@ -634,3 +633,4 @@ TGAPolySegment(
}
+#endif
