From 35e4756645891bfc85f25f1ab60c287eba9ef749 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 5 Apr 2006 07:12:00 +0000 Subject: Fix some argument inversions in xf86DrvMsg function calls --- src/i810_hwmc.c | 10 +++++----- src/i810_memory.c | 12 ++++++------ src/i830_memory.c | 14 +++++++------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c index 36d80880..b952d8d3 100644 --- a/src/i810_hwmc.c +++ b/src/i810_hwmc.c @@ -246,14 +246,14 @@ int I810XvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext, if(!pI810->directRenderingEnabled) { - xf86DrvMsg(X_ERROR, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I810XvMCCreateContext: Cannot use XvMC without DRI!\n"); return BadAlloc; } /* Context Already in use! */ if(pI810->xvmcContext) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "I810XvMCCreateContext: 2 XvMC Contexts Attempted, not supported.\n"); return BadAlloc; } @@ -268,7 +268,7 @@ int I810XvMCCreateContext (ScrnInfoPtr pScrn, XvMCContextPtr pContext, *num_priv = sizeof(I810XvMCCreateContextRec) >> 2; if(drmCreateContext(pI810->drmSubFD, &(contextRec->drmcontext) ) < 0) { - xf86DrvMsg(X_ERROR, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I810XvMCCreateContext: Unable to create DRMContext!\n"); xfree(*priv); return BadAlloc; @@ -300,7 +300,7 @@ int I810XvMCCreateSurface (ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf, *priv = (long *)xcalloc(2,sizeof(long)); if(!*priv) { - xf86DrvMsg(X_ERROR, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I810XvMCCreateSurface: Unable to allocate memory!\n"); *num_priv = 0; return BadAlloc; @@ -346,7 +346,7 @@ int I810XvMCCreateSubpicture (ScrnInfoPtr pScrn, XvMCSubpicturePtr pSubp, *priv = (long *)xcalloc(1,sizeof(long)); if(!*priv) { - xf86DrvMsg(X_ERROR, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "I810XvMCCreateSubpicture: Unable to allocate memory!\n"); *num_priv = 0; return BadAlloc; diff --git a/src/i810_memory.c b/src/i810_memory.c index 56199ce6..82d86eb2 100644 --- a/src/i810_memory.c +++ b/src/i810_memory.c @@ -264,7 +264,7 @@ I810SetTiledMemory(ScrnInfoPtr pScrn, int nr, unsigned int start, CARD32 fence_mask = 0; if (nr < 0 || nr > 7) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, "%s - fence %d out of range\n", + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s - fence %d out of range\n", "I810SetTiledMemory", nr); return; } @@ -274,21 +274,21 @@ I810SetTiledMemory(ScrnInfoPtr pScrn, int nr, unsigned int start, fence_mask = ~FENCE_START_MASK; if (start & fence_mask) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s %d: start (%x) is not 512k aligned\n", "I810SetTiledMemory", nr, start); return; } if (start % size) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s %d: start (%x) is not size (%x) aligned\n", "I810SetTiledMemory", nr, start, size); return; } if (pitch & 127) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s %d: pitch (%x) not a multiple of 128 bytes\n", "I810SetTiledMemory", nr, pitch); return; @@ -319,7 +319,7 @@ I810SetTiledMemory(ScrnInfoPtr pScrn, int nr, unsigned int start, val |= FENCE_SIZE_32M; break; default: - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s %d: illegal size (0x%x)\n", "I810SetTiledMemory", nr, size); return; @@ -345,7 +345,7 @@ I810SetTiledMemory(ScrnInfoPtr pScrn, int nr, unsigned int start, val |= FENCE_PITCH_32; break; default: - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "%s %d: illegal size (0x%x)\n", "I810SetTiledMemory", nr, size); return; diff --git a/src/i830_memory.c b/src/i830_memory.c index 68626227..433aa47d 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1511,7 +1511,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, nr, start, pitch, size / 1024); if (nr < 0 || nr > 7) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: fence %d out of range\n",nr); return; } @@ -1524,21 +1524,21 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, fence_mask = ~I830_FENCE_START_MASK; if (start & fence_mask) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: start (0x%08x) is not %s aligned\n", nr, start, (IS_I9XX(pI830)) ? "1MB" : "512k"); return; } if (start % size) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: start (0x%08x) is not size (%dk) aligned\n", nr, start, size / 1024); return; } if (pitch & 127) { - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: pitch (%d) not a multiple of 128 bytes\n", nr, pitch); return; @@ -1570,7 +1570,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, val |= I915G_FENCE_SIZE_64M; break; default: - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: illegal size (%d kByte)\n", nr, size / 1024); return; } @@ -1601,7 +1601,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, val |= FENCE_SIZE_64M; break; default: - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: illegal size (%d kByte)\n", nr, size / 1024); return; } @@ -1635,7 +1635,7 @@ SetFence(ScrnInfoPtr pScrn, int nr, unsigned int start, unsigned int pitch, val |= FENCE_PITCH_64; break; default: - xf86DrvMsg(X_WARNING, pScrn->scrnIndex, + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "SetFence: %d: illegal pitch (%d)\n", nr, pitch); return; } -- cgit v1.2.3