diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-08-26 20:21:57 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-08-26 20:21:57 +0000 |
| commit | 0926cf79c030f29dce32a9dc944734960ec93d19 (patch) | |
| tree | bdff646e817ff371642ff0b99f3e6e927c68ee52 /exa | |
| parent | 5ffff7cb868a768307ff6faf164210020e6b94a2 (diff) | |
Add diagnostic messages for exaDriverInit failure cases.
Diffstat (limited to 'exa')
| -rw-r--r-- | exa/exa.c | 16 | ||||
| -rw-r--r-- | exa/exa_accel.c | 16 | ||||
| -rw-r--r-- | exa/exa_migration.c | 16 |
3 files changed, 39 insertions, 9 deletions
@@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); - if (!pExaScr) + if (!pExaScr) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate screen private\n"); return FALSE; + } pExaScr->info = pScreenInfo; @@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, - sizeof (ExaPixmapPrivRec))) + sizeof (ExaPixmapPrivRec))) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate pixmap private\n"); return FALSE; + } pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pScreen->CreatePixmap = exaCreatePixmap; @@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen, } else { + xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n"); if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) return FALSE; } @@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen, DBG_PIXMAP(("============== %ld < %ld\n", 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; + } pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 7937f3856..9c608d6ab 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); - if (!pExaScr) + if (!pExaScr) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate screen private\n"); return FALSE; + } pExaScr->info = pScreenInfo; @@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, - sizeof (ExaPixmapPrivRec))) + sizeof (ExaPixmapPrivRec))) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate pixmap private\n"); return FALSE; + } pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pScreen->CreatePixmap = exaCreatePixmap; @@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen, } else { + xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n"); if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) return FALSE; } @@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen, DBG_PIXMAP(("============== %ld < %ld\n", 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; + } pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 7937f3856..9c608d6ab 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -1208,8 +1208,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr = xcalloc (sizeof (ExaScreenPrivRec), 1); - if (!pExaScr) + if (!pExaScr) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate screen private\n"); return FALSE; + } pExaScr->info = pScreenInfo; @@ -1255,8 +1258,11 @@ exaDriverInit (ScreenPtr pScreen, pExaScr->info->card.offScreenBase < pExaScr->info->card.memorySize) { if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, - sizeof (ExaPixmapPrivRec))) + sizeof (ExaPixmapPrivRec))) { + xf86DrvMsg(pScreen->myNum, X_WARNING, + "EXA: Failed to allocate pixmap private\n"); return FALSE; + } pExaScr->SavedCreatePixmap = pScreen->CreatePixmap; pScreen->CreatePixmap = exaCreatePixmap; @@ -1265,6 +1271,7 @@ exaDriverInit (ScreenPtr pScreen, } else { + xf86DrvMsg(pScreen->myNum, X_INFO, "EXA: No offscreen pixmaps\n"); if (!AllocatePixmapPrivate(pScreen, exaPixmapPrivateIndex, 0)) return FALSE; } @@ -1272,8 +1279,11 @@ exaDriverInit (ScreenPtr pScreen, DBG_PIXMAP(("============== %ld < %ld\n", 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; + } pExaScr->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; pScrn->EnableDisableFBAccess = exaEnableDisableFBAccess; |