Fix matching type of debug output.

Change-Id: I5568ab39a740eac5aee627f89496e53567de3b52

diff --git a/src/accel/sec_dri2.c b/src/accel/sec_dri2.c
index 5af5421..d40b57f 100644 (file)
--- a/src/accel/sec_dri2.c
+++ b/src/accel/sec_dri2.c
@@ -667,7 +667,7 @@ _resetBufPixmap (DrawablePtr pDraw, DRI2BufferPtr pBuf)
         pNewPix = _reuseBackBufPixmap(pBuf, pDraw, canFlip, &reuse);
         if (pNewPix == NULL)
         {
-            XDBG_WARNING (MDRI2, "Error pixmap is null\n", pipe);
+            XDBG_WARNING (MDRI2, "Error pixmap is null\n");
             return FALSE;
         }
 
@@ -683,7 +683,7 @@ _resetBufPixmap (DrawablePtr pDraw, DRI2BufferPtr pBuf)
     pBuf->name = _getName (pNewPix);
     pBuf->flags = _getBufferFlag(pDraw, canFlip);
 
-    XDBG_TRACE (MDRI2,"id:0x%x(%d) can_flip:%d attach:%d, name:%d, flags:0x%x geo(%dx%d+%d+%d)\n",
+    XDBG_TRACE (MDRI2,"id:0x%lx(%d) can_flip:%d attach:%d, name:%d, flags:0x%x geo(%dx%d+%d+%d)\n",
                 pDraw->id, pDraw->type,
                 pBufPriv->canFlip,
                 pBuf->attachment, pBuf->name, pBuf->flags,
@@ -1136,7 +1136,7 @@ _SendSyncDrawDoneMessage(ScreenPtr screen, ClientPtr client, DrawablePtr pDraw)
     event.u.clientMessage.u.l.longs2 = pDraw->width; // window's width
     event.u.clientMessage.u.l.longs3 = pDraw->height; // window's height
 
-    XDBG_DEBUG(MDRI2, "client=%d pDraw->id=%x width=%d height=%d\n", client->index, pDraw->id, pDraw->width, pDraw->height);
+    XDBG_DEBUG(MDRI2, "client=%d pDraw->id=%lx width=%d height=%d\n", client->index, pDraw->id, pDraw->width, pDraw->height);
 
     DeliverEventsToWindow(dev, screen->root, &event, 1, SubstructureRedirectMask | SubstructureNotifyMask, NullGrab);
 }
@@ -1214,14 +1214,14 @@ SECDri2CreateBuffer (DrawablePtr pDraw, unsigned int attachment, unsigned int fo
     pBufPriv->pPixmap = pPix;
     pBufPriv->pScreen = pScreen;
 
-    XDBG_DEBUG(MDRI2, "id:0x%x(%d) attach:%d, name:%d, flags:0x%x, flip:%d geo(%dx%d+%d+%d)\n",
+    XDBG_DEBUG(MDRI2, "id:0x%lx(%d) attach:%d, name:%d, flags:0x%x, flip:%d geo(%dx%d+%d+%d)\n",
                pDraw->id, pDraw->type,
                pBuf->attachment, pBuf->name, pBuf->flags, pBufPriv->canFlip,
                pDraw->width, pDraw->height, pDraw->x, pDraw->y);
 
     return pBuf;
 fail:
-    XDBG_WARNING(MDRI2, "Failed: id:0x%x(%d) attach:%d,geo(%dx%d+%d+%d)\n",
+    XDBG_WARNING(MDRI2, "Failed: id:0x%lx(%d) attach:%d,geo(%dx%d+%d+%d)\n",
                  pDraw->id, pDraw->type, attachment, pDraw->width, pDraw->height, pDraw->x, pDraw->y);
     if (pPix)
     {
@@ -1387,7 +1387,7 @@ SECDri2ScheduleSwapWithRegion (ClientPtr pClient, DrawablePtr pDraw,
 
     swap_type = pFrameEvent->type;
 
-    XDBG_DEBUG (MSEC, "dump_mode(%x) dump_xid(0x%x:0x%x) swap_type(%d)\n",
+    XDBG_DEBUG (MSEC, "dump_mode(%x) dump_xid(0x%lx:0x%lx) swap_type(%d)\n",
                 pSec->dump_mode, pSec->dump_xid, pDraw->id, swap_type);
 
     if ((pSec->dump_mode & XBERC_DUMP_MODE_DRAWABLE) &&
@@ -1771,7 +1771,7 @@ SECDri2ReuseBufferNotify (DrawablePtr pDraw, DRI2BufferPtr pBuf)
         }
     }
 
-    XDBG_DEBUG(MDRI2, "id:0x%x(%d) attach:%d, name:%d, flags:0x%x, flip:%d, geo(%dx%d+%d+%d)\n",
+    XDBG_DEBUG(MDRI2, "id:0x%lx(%d) attach:%d, name:%d, flags:0x%x, flip:%d, geo(%dx%d+%d+%d)\n",
                pDraw->id, pDraw->type,
                pBuf->attachment, pBuf->name, pBuf->flags, pBufPriv->canFlip,
                pDraw->width, pDraw->height, pDraw->x, pDraw->y);

diff --git a/src/accel/sec_exa.c b/src/accel/sec_exa.c
index cb3b020..a32bfd0 100644 (file)
--- a/src/accel/sec_exa.c
+++ b/src/accel/sec_exa.c
@@ -390,7 +390,7 @@ SECExaModifyPixmapHeader (PixmapPtr pPixmap, int width, int height,
         privPixmap->bo = tbm_bo_alloc (pSec->tbm_bufmgr, lSizeInBytes, TBM_BO_DEFAULT);
         if (privPixmap->bo == NULL)
         {
-            XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%d\n",lSizeInBytes);
+            XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%ld\n",lSizeInBytes);
             return FALSE;
         }
         pSec->pix_dri2_back = pSec->pix_dri2_back + lSizeInBytes;
@@ -411,7 +411,7 @@ SECExaModifyPixmapHeader (PixmapPtr pPixmap, int width, int height,
         privPixmap->bo = tbm_bo_alloc (pSec->tbm_bufmgr, lSizeInBytes, TBM_BO_DEFAULT);
         if (privPixmap->bo == NULL)
         {
-            XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%d\n",lSizeInBytes);
+            XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%ld\n",lSizeInBytes);
             return FALSE;
         }
         pSec->pix_backing_pixmap = pSec->pix_backing_pixmap + lSizeInBytes;
@@ -453,7 +453,7 @@ SECExaModifyPixmapHeader (PixmapPtr pPixmap, int width, int height,
             privPixmap->bo = tbm_bo_alloc (pSec->tbm_bufmgr, lSizeInBytes, TBM_BO_DEFAULT);
             if (privPixmap->bo == NULL)
             {
-                XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%d\n",lSizeInBytes);
+                XDBG_ERROR(MEXA, "Error on allocating BufferObject. size:%ld\n",lSizeInBytes);
                 return FALSE;
             }
         }

diff --git a/src/accel/sec_exa_g2d.c b/src/accel/sec_exa_g2d.c
index 4957796..0c1f790 100644 (file)
--- a/src/accel/sec_exa_g2d.c
+++ b/src/accel/sec_exa_g2d.c
@@ -706,7 +706,9 @@ _g2dDoCopy (ExaBox* box, void* data)
                 box->box.x2,
                 box->box.y2,
                 gOpCopy.srcX,
-                gOpCopy.srcY);
+                gOpCopy.srcY,
+                gOpCopy.dstX,
+                gOpCopy.dstY);
 
     srcX = gOpCopy.srcX + box->box.x1 - box->pSrc->pos.x1;
     srcY = gOpCopy.srcY + box->box.y1 - box->pSrc->pos.y1;
@@ -1003,7 +1005,7 @@ SECExaG2dPrepareSolid (PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
 
 bail:
     XDBG_TRACE (MEXAH, "FAIL: pix:%p hint:%d, num_pix:%d\n",
-                pPixmap, index, pPixmap->usage_hint, gOpSolid.pOpDst->num);
+                pPixmap, pPixmap->usage_hint, gOpSolid.pOpDst->num);
     gOpSolid.bDo = DO_DRAW_NONE;
     gOpSolid.pGC = NULL;
 
@@ -1128,10 +1130,10 @@ SECExaG2dPrepareCopy (PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap,
 
 bail:
     XDBG_TRACE (MEXAH, "FAIL\n");
-    XDBG_TRACE (MEXAH, "   SRC pix:%p, index:%d, hint:%d, num_pix:%d\n",
-                pSrcPixmap, index, pSrcPixmap->usage_hint, num_src_pix);
-    XDBG_TRACE (MEXAH, "   DST pix:%p, index:%d, hint:%d, num_pix:%d\n",
-                pDstPixmap, index, pDstPixmap->usage_hint, num_dst_pix);
+    XDBG_TRACE (MEXAH, "   SRC pix:%p, hint:%d, num_pix:%d\n",
+                pSrcPixmap, pSrcPixmap->usage_hint, num_src_pix);
+    XDBG_TRACE (MEXAH, "   DST pix:%p, hint:%d, num_pix:%d\n",
+                pDstPixmap, pDstPixmap->usage_hint, num_dst_pix);
     gOpCopy.bDo = DO_DRAW_NONE;
 
     return TRUE;

diff --git a/src/accel/sec_exa_sw.c b/src/accel/sec_exa_sw.c
index feb1d9a..59d0a87 100644 (file)
--- a/src/accel/sec_exa_sw.c
+++ b/src/accel/sec_exa_sw.c
@@ -486,7 +486,9 @@ _swDoCopy (ExaBox* box, void* data)
                 box->box.x2,
                 box->box.y2,
                 gOpCopy.srcX,
-                gOpCopy.srcY);
+                gOpCopy.srcY,
+                gOpCopy.dstX,
+                gOpCopy.dstY);
 
     srcX = gOpCopy.srcX + box->box.x1 - box->pSrc->pos.x1;
     srcY = gOpCopy.srcY + box->box.y1 - box->pSrc->pos.y1;
@@ -725,7 +727,7 @@ SECExaSwPrepareSolid (PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
 
 bail:
     XDBG_TRACE (MEXAS, "FAIL: pix:%p hint:%d, num_pix:%d\n",
-                pPixmap, index, pPixmap->usage_hint, gOpSolid.pOpDst->num);
+                pPixmap, pPixmap->usage_hint, gOpSolid.pOpDst->num);
     gOpSolid.bDo = FALSE;
     gOpSolid.pGC = NULL;
 
@@ -833,10 +835,10 @@ SECExaSwPrepareCopy (PixmapPtr pSrcPixmap, PixmapPtr pDstPixmap,
 
 bail:
     XDBG_TRACE (MEXAS, "FAIL\n");
-    XDBG_TRACE (MEXAS, "   SRC pix:%p, index:%d, hint:%d, num_pix:%d\n",
-                pSrcPixmap, index, pSrcPixmap->usage_hint, num_src_pix);
-    XDBG_TRACE (MEXAS, "   DST pix:%p, index:%d, hint:%d, num_pix:%d\n",
-                pDstPixmap, index, pDstPixmap->usage_hint, num_dst_pix);
+    XDBG_TRACE (MEXAS, "   SRC pix:%p, hint:%d, num_pix:%d\n",
+                pSrcPixmap, pSrcPixmap->usage_hint, num_src_pix);
+    XDBG_TRACE (MEXAS, "   DST pix:%p, hint:%d, num_pix:%d\n",
+                pDstPixmap, pDstPixmap->usage_hint, num_dst_pix);
     gOpCopy.bDo = FALSE;
 
     return TRUE;

diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index 93eb933..8f6b5e8 100644 (file)
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -1744,7 +1744,7 @@ secCrtcInit (ScrnInfoPtr pScrn, SECModePtr pSecMode, int num)
 
     pCrtcPriv->pCrtc = pCrtc;
 
-#if 1
+#ifdef USE_XDBG
     pCrtcPriv->pFpsDebug = xDbgLogFpsDebugCreate ();
     if (pCrtcPriv->pFpsDebug == NULL)
     {

diff --git a/src/crtcconfig/sec_display.c b/src/crtcconfig/sec_display.c
index 55dc018..a516e50 100644 (file)
--- a/src/crtcconfig/sec_display.c
+++ b/src/crtcconfig/sec_display.c
@@ -555,11 +555,11 @@ secModePreInit (ScrnInfoPtr pScrn, int drm_fd)
     /* virtaul x and virtual y of the screen is ones from main lcd mode */
     pScrn->virtualX = pSecMode->main_lcd_mode.hdisplay;
     pScrn->virtualY = pSecMode->main_lcd_mode.vdisplay;
-
+#ifdef USE_XDBG
 #if DBG_DRM_EVENT
     xDbgLogDrmEventInit();
 #endif
-
+#endif
     return TRUE;
 }
 
@@ -1800,7 +1800,8 @@ secDisplayChangeMode (ScrnInfoPtr pScrn)
                              pOutput->mm_width, pOutput->mm_height))
         {
             XDBG_ERROR(MDISP,
-                       "Can't setup screen size H:%d V:%d for output: %s\n", mode->HDisplay, mode->VDisplay);
+                       "Can't setup screen size H:%d V:%d for output: %s\n",
+                       mode->HDisplay, mode->VDisplay, pOutput->name);
             if (max_mode)
                 free(max_mode);
             return FALSE;
@@ -1808,7 +1809,7 @@ secDisplayChangeMode (ScrnInfoPtr pScrn)
         if (!xf86CrtcSetModeTransform(pCrtc, mode, RR_Rotate_0, NULL, 0, 0))
         {
             XDBG_ERROR(MDISP,
-                       "Can't transform Crtc to mode: %s\n", pCrtc, mode->name);
+                       "Can't transform Crtc to mode: %s\n", mode->name);
             if (max_mode)
                 free(max_mode);
             RRScreenSizeSet(pScrn->pScreen, 640, 480, 0, 0);

diff --git a/src/crtcconfig/sec_dummy.c b/src/crtcconfig/sec_dummy.c
index 51ff491..ab5c9d7 100644 (file)
--- a/src/crtcconfig/sec_dummy.c
+++ b/src/crtcconfig/sec_dummy.c
@@ -748,7 +748,7 @@ secDummyCrtcInit (ScrnInfoPtr pScrn, SECModePtr pSecMode)
 
     pCrtcPriv->pCrtc = pCrtc;
 
-#if 0
+#ifdef USE_XDBG
     pCrtcPriv->pFpsDebug = xDbgLogFpsDebugCreate ();
     if (pCrtcPriv->pFpsDebug == NULL)
     {

diff --git a/src/crtcconfig/sec_prop.c b/src/crtcconfig/sec_prop.c
index dd53465..497299e 100644 (file)
--- a/src/crtcconfig/sec_prop.c
+++ b/src/crtcconfig/sec_prop.c
@@ -610,7 +610,7 @@ secPropSetFbVisible (xf86OutputPtr pOutput, Atom property, RRPropertyValuePtr va
     if (value->format != 8)
         return TRUE;
 
-    XDBG_TRACE (MPROP, "%s \n", value->data);
+    XDBG_TRACE (MPROP, "%s \n", (char *) value->data);
 
     secPropFbVisible (value->data, FALSE, value, pOutput->scrn);
 
@@ -636,7 +636,7 @@ secPropSetVideoOffset (xf86OutputPtr pOutput, Atom property, RRPropertyValuePtr
     if (value->format != 8)
         return TRUE;
 
-    XDBG_TRACE (MPROP, "%s \n", value->data);
+    XDBG_TRACE (MPROP, "%s \n", (char *) value->data);
 
     secPropVideoOffset (value->data, value, pOutput->scrn);
 
@@ -703,7 +703,7 @@ secPropSetScreenRotate (xf86OutputPtr pOutput, Atom property, RRPropertyValuePtr
     if (value->format != 8)
         return TRUE;
 
-    XDBG_TRACE (MPROP, "%s \n", value->data);
+    XDBG_TRACE (MPROP, "%s \n", (char *) value->data);
 
     secPropScreenRotate (value->data, value, pOutput->scrn);
 

diff --git a/src/ipp/sec_wb.c b/src/ipp/sec_wb.c
index 1e246b4..bde6a8d 100644 (file)
--- a/src/ipp/sec_wb.c
+++ b/src/ipp/sec_wb.c
@@ -482,7 +482,7 @@ secWbHandleIppEvent (int fd, unsigned int *buf_idx, void *data)
 
     if (wb->status == STATUS_STOPPED)
     {
-        XDBG_ERROR (MWB, "stopped. ignore a event.\n", data);
+        XDBG_ERROR (MWB, "stopped. ignore a event. %p\n", data);
         return;
     }
 

diff --git a/src/util/sec_util.c b/src/util/sec_util.c
index 7870a55..bb218af 100644 (file)
--- a/src/util/sec_util.c
+++ b/src/util/sec_util.c
@@ -1818,7 +1818,7 @@ _secUtilAllocSecureBuffer (ScrnInfoPtr scrn, int size, int flags)
     arg_flink.handle = arg_handle.handle;
     if (drmIoctl (pSec->drm_fd, DRM_IOCTL_GEM_FLINK, &arg_flink))
     {
-        XDBG_ERRNO (MVBUF, "failed : flink gem (%ld)\n", arg_handle.handle);
+        XDBG_ERRNO (MVBUF, "failed : flink gem (%lu)\n", (unsigned long) arg_handle.handle);
         goto done_secure_buffer;
     }
     XDBG_GOTO_IF_FAIL (arg_flink.name > 0, done_secure_buffer);
@@ -1831,7 +1831,7 @@ done_secure_buffer:
     {
         arg_close.handle = arg_handle.handle;
         if (drmIoctl (pSec->drm_fd, DRM_IOCTL_GEM_CLOSE, &arg_close))
-            XDBG_ERRNO (MVBUF, "failed : close gem (%ld)\n", arg_handle.handle);
+            XDBG_ERRNO (MVBUF, "failed : close gem (%lu)\n", (unsigned long) arg_handle.handle);
     }
 
     if (tzmem_get.fd >= 0)

diff --git a/src/xv/sec_video.c b/src/xv/sec_video.c
index d6d2137..4a62c35 100644 (file)
--- a/src/xv/sec_video.c
+++ b/src/xv/sec_video.c
@@ -1893,7 +1893,7 @@ _secVideoPutImageTvout (SECPortPrivPtr pPort, int output, SECVideoBuf *inbuf)
                         sub, inbuf->stamp,
                         inbuf->keys[0], inbuf->keys[1], inbuf->keys[2]);
         }
-        XDBG_DEBUG (MVDO, "pPort->wait_vbuf (%d) skip_frame\n", pPort->wait_vbuf);
+        XDBG_DEBUG (MVDO, "pPort->wait_vbuf (%p) skip_frame\n", pPort->wait_vbuf);
         return FALSE;
     }
     else if (pSec->pVideoPriv->video_fps)
@@ -2065,7 +2065,7 @@ _secVideoSetOutputExternalProperty (DrawablePtr pDraw, Bool video_only)
                              pWin, atom_external, XA_CARDINAL, 32,
                              PropModeReplace, 1, (unsigned int*)&video_only, TRUE);
 
-    XDBG_TRACE (MVDO, "pDraw(0x%08x) video-only(%s)\n",
+    XDBG_TRACE (MVDO, "pDraw(0x%lx) video-only(%s)\n",
                 pDraw->id, (video_only)?"ON":"OFF");
 
     return TRUE;
@@ -2423,25 +2423,25 @@ SECVideoSetPortAttribute (ScrnInfoPtr pScrn,
     if (attribute == _portAtom (PAA_ROTATION))
     {
         pPort->rotate = value;
-        XDBG_DEBUG (MVDO, "rotate(%d) \n", value);
+        XDBG_DEBUG (MVDO, "rotate(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _portAtom (PAA_HFLIP))
     {
         pPort->hflip = value;
-        XDBG_DEBUG (MVDO, "hflip(%d) \n", value);
+        XDBG_DEBUG (MVDO, "hflip(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _portAtom (PAA_VFLIP))
     {
         pPort->vflip = value;
-        XDBG_DEBUG (MVDO, "vflip(%d) \n", value);
+        XDBG_DEBUG (MVDO, "vflip(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _portAtom (PAA_PREEMPTION))
     {
         pPort->preemption = value;
-        XDBG_DEBUG (MVDO, "preemption(%d) \n", value);
+        XDBG_DEBUG (MVDO, "preemption(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _portAtom (PAA_OUTPUT))
@@ -2453,20 +2453,20 @@ SECVideoSetPortAttribute (ScrnInfoPtr pScrn,
         else
             pPort->usr_output = OUTPUT_LCD|OUTPUT_EXT;
 
-        XDBG_DEBUG (MVDO, "output (%d) \n", value);
+        XDBG_DEBUG (MVDO, "output (%d) \n", (int) value);
 
         return Success;
     }
     else if (attribute == _portAtom (PAA_SECURE))
     {
         pPort->secure = value;
-        XDBG_DEBUG (MVDO, "secure(%d) \n", value);
+        XDBG_DEBUG (MVDO, "secure(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _portAtom (PAA_CSC_RANGE))
     {
         pPort->csc_range = value;
-        XDBG_DEBUG (MVDO, "csc_range(%d) \n", value);
+        XDBG_DEBUG (MVDO, "csc_range(%d) \n",(int) value);
         return Success;
     }
 

diff --git a/src/xv/sec_video_display.c b/src/xv/sec_video_display.c
index e1f50c8..80c1591 100644 (file)
--- a/src/xv/sec_video_display.c
+++ b/src/xv/sec_video_display.c
@@ -460,7 +460,7 @@ SECDisplayVideoSetPortAttribute (ScrnInfoPtr pScrn,
     if (attribute == _portAtom (PAA_OVERLAY))
     {
         pPort->overlay = value;
-        XDBG_DEBUG (MDA, "overlay(%d) \n", value);
+        XDBG_DEBUG (MDA, "overlay(%d) \n", (int) value);
         return Success;
     }
 

diff --git a/src/xv/sec_video_fourcc.h b/src/xv/sec_video_fourcc.h
index 9d43975..c1c239a 100644 (file)
--- a/src/xv/sec_video_fourcc.h
+++ b/src/xv/sec_video_fourcc.h
@@ -34,7 +34,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <fourcc.h>
 #include <drm_fourcc.h>
 
-#define C(b,m)              (((b) >> (m)) & 0xFF)
+#define C(b,m)              (char)(((b) >> (m)) & 0xFF)
 #define B(c,s)              ((((unsigned int)(c)) & 0xff) << (s))
 #define FOURCC(a,b,c,d)     (B(d,24) | B(c,16) | B(b,8) | B(a,0))
 #define FOURCC_STR(id)      C(id,0), C(id,8), C(id,16), C(id,24)

diff --git a/src/xv/sec_video_virtual.c b/src/xv/sec_video_virtual.c
index 977de62..af74c98 100644 (file)
--- a/src/xv/sec_video_virtual.c
+++ b/src/xv/sec_video_virtual.c
@@ -1004,7 +1004,7 @@ _secVirtualVideoPreProcess (ScrnInfoPtr pScrn, SECPortPrivPtr pPort,
         RegionCopy (pPort->clipBoxes, clipBoxes);
     }
 
-    XDBG_TRACE (MVA, "pDraw(0x%x, %dx%d). \n", pDraw->id, pDraw->width, pDraw->height);
+    XDBG_TRACE (MVA, "pDraw(0x%lx, %dx%d). \n", pDraw->id, pDraw->width, pDraw->height);
 
     return Success;
 }
@@ -1037,7 +1037,7 @@ _secVirtualVideoSendPortNotify (SECPortPrivPtr pPort, SECPortAttrAtom paa, INT32
     atom = _secVideoGetPortAtom (paa);
     XDBG_RETURN_VAL_IF_FAIL (atom != None, BadValue);
 
-    XDBG_TRACE (MVA, "paa(%d), value(%d)\n", paa, value);
+    XDBG_TRACE (MVA, "paa(%d), value(%d)\n", paa, (int) value);
 
     return XvdiSendPortNotify (info->pp, atom, value);
 }
@@ -1805,14 +1805,14 @@ SECVirtualVideoSetPortAttribute (ScrnInfoPtr pScrn,
         }
 
         pPort->id = (unsigned int)value;
-        XDBG_DEBUG (MVA, "id(%d) \n", value);
+        XDBG_DEBUG (MVA, "id(%d) \n", (int) value);
         return Success;
     }
     else if (attribute == _secVideoGetPortAtom (PAA_CAPTURE))
     {
         if (value < CAPTURE_MODE_NONE || value >= CAPTURE_MODE_MAX)
         {
-            XDBG_ERROR (MVA, "capture value(%d) is out of range\n", value);
+            XDBG_ERROR (MVA, "capture value(%d) is out of range\n", (int) value);
             return BadRequest;
         }
 
@@ -1848,7 +1848,7 @@ SECVirtualVideoSetPortAttribute (ScrnInfoPtr pScrn,
         info = _secVirtualVideoFindReturnBuf (pPort, value);
         if (!info)
         {
-            XDBG_WARNING (MVA, "wrong gem name(%d) returned\n", value);
+            XDBG_WARNING (MVA, "wrong gem name(%d) returned\n", (int) value);
             return Success;
         }
 
@@ -1960,7 +1960,7 @@ SECVirtualVideoPutStill (ScrnInfoPtr pScrn,
     {
         pPort->putstill_on = TRUE;
         XDBG_SECURE (MVA, "pPort(%d) putstill on. secure(%d), capture(%d), format(%c%c%c%c)\n",
-                     pPort->index, pPort->secure, pPort->capture, FOURCC_STR (pPort->id), 60);
+                     pPort->index, pPort->secure, pPort->capture, FOURCC_STR (pPort->id));
     }
 
     pPort->need_damage = TRUE;