diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:44:00 +0000 |
| commit | e9a123f08880882a519b6eba8305d62ac375ca10 (patch) | |
| tree | d4feaa851ea9a74f6f7a61eacd1c0df6db43127d /src/mga_dri.c | |
| parent | 1ca2311bee53e99b49a860862e4010e58c918585 (diff) | |
Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
with the following notes:
- Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
insecurity.
- VIA driver converted to new drmContext and drmHandle names.
- Radeon driver merge conflicted in many places, and MergedFB at least
could probably use some checking at this point.
Diffstat (limited to 'src/mga_dri.c')
| -rw-r--r-- | src/mga_dri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mga_dri.c b/src/mga_dri.c index e429027..a943b6b 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.29 2003/07/09 01:45:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_dri.c,v 1.31tsi Exp $ */ /* * Copyright 2000 VA Linux Systems Inc., Fremont, California. @@ -673,7 +673,7 @@ static Bool MGADRIAgpInit(ScreenPtr pScreen) return FALSE; } xf86DrvMsg( pScreen->myNum, X_INFO, - "[agp] %d kB allocated with handle 0x%08x\n", + "[agp] %d kB allocated with handle 0x%08lx\n", pMGADRIServer->agp.size/1024, pMGADRIServer->agp.handle ); if ( drmAgpBind( pMga->drmFD, pMGADRIServer->agp.handle, 0 ) < 0 ) { @@ -1083,8 +1083,8 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) xf86DrvMsg( pScrn->scrnIndex, X_INFO, "[drm] Sarea %d+%d: %d\n", - sizeof(XF86DRISAREARec), sizeof(MGASAREAPrivRec), - sizeof(XF86DRISAREARec) + sizeof(MGASAREAPrivRec) ); + (int)sizeof(XF86DRISAREARec), (int)sizeof(MGASAREAPrivRec), + (int)sizeof(XF86DRISAREARec) + (int)sizeof(MGASAREAPrivRec) ); pDRIInfo->SAREASize = SAREA_MAX; |