frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add diagnostic messages for exaDriverInit failure cases.

This commit is contained in:
Adam Jackson 2005-08-26 20:21:57 +00:00
parent 5ffff7cb86
commit 0926cf79c0
6 changed files with 78 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
exa/exa.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;

16
exa/exa_accel.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;

16
exa/exa_migration.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;

16
hw/xfree86/exa/exa.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;

16
hw/xfree86/exa/exa_accel.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;

16
hw/xfree86/exa/exa_migration.c
View File

@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1);
if (!pExaScr) if (!pExaScr) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate screen private\n");
return FALSE; return FALSE;
}
pExaScr->info = pScreenInfo; pExaScr->info = pScreenInfo;
@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen,
pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize)
{ {
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex,
sizeof (ExaPixmapPrivRec))) sizeof (ExaPixmapPrivRec))) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Failed to allocate pixmap private\n");
return FALSE; return FALSE;
}
pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pExaScr->SavedCreatePixmap = pScreen->CreatePixmap;
pScreen->CreatePixmap = exaCreatePixmap; pScreen->CreatePixmap = exaCreatePixmap;
@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen,
} }
else else
{ {
xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n");
if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0))
return FALSE; return FALSE;
} }
@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen,
DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase, DBG_PIXMAP(("============== %ld < %ld\n", pExaScr->info->card.offScreenBase,
pExaScr->info->card.memorySize)); pExaScr->info->card.memorySize));
if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) {
if (!exaOffscreenInit (pScreen)) if (!exaOffscreenInit (pScreen)) {
xf86DrvMsg(pScreen->myNum, X_WARNING,
"EXA: Offscreen pixmap setup failed\n");
return FALSE; return FALSE;
}
pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess;
pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess;