diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-12-19 14:45:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-12-19 14:45:11 +1000 |
| commit | 78fb6c77f88d2ce5d2e1ec925958b97c51955ec6 (patch) | |
| tree | 6274899f56dc49238f4f58cf5aab0606e2e7a84a /src/radeon_display.c | |
| parent | f5e8c185001e62e744310667c2d1bd3fe6542a62 (diff) | |
| parent | ce4fa1cedec0cf56b9979dfaa12a8d3a7c643df4 (diff) | |
Merge branch 'master' into atombios-supportatombios-support
Conflicts:
src/radeon_display.c
Diffstat (limited to 'src/radeon_display.c')
| -rw-r--r-- | src/radeon_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 1cd8b05..2043f24 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -743,7 +743,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg->grph_buffer_cntl, - INREG(RADEON_GRPH_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH_BUFFER_CNTL)); if (mode2) { stop_req = mode2->HDisplay * pixel_bytes2 / 16; @@ -793,7 +793,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH2_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg->grph2_buffer_cntl, - INREG(RADEON_GRPH2_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH2_BUFFER_CNTL)); } } |