Module Name: xsrc
Committed By: joerg
Date: Sat Aug 27 16:35:48 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c
Log Message:
Since CARD32 and uint32_t don't necessarily use the same underlaying
type, e.g. on i386, add an explicit cast as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.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-openchrome/dist/src/via_display.c
diff -u xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.5 xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.6
--- xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c:1.5 Sun Aug 21 18:18:57 2016
+++ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c Sat Aug 27 16:35:48 2016
@@ -815,11 +815,11 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr
Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Base Address: 0x%"PRIx32"x\n",
- Base));
+ (uint32_t)Base));
Base = (Base + drmmode->front_bo->offset) >> 1;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"DRI Base Address: 0x%"PRIx32"\n",
- Base);
+ (uint32_t)Base);
hwp->writeCrtc(hwp, 0x0D, Base & 0xFF);
hwp->writeCrtc(hwp, 0x0C, (Base & 0xFF00) >> 8);
@@ -2046,11 +2046,11 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr
Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Base Address: 0x%"PRIx32"\n",
- Base));
+ (uint32_t)Base));
Base = (Base + drmmode->front_bo->offset) >> 3;
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"DRI Base Address: 0x%"PRIx32"\n",
- Base);
+ (uint32_t)Base);
tmp = hwp->readCrtc(hwp, 0x62) & 0x01;
tmp |= (Base & 0x7F) << 1;
