xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/radeon_accel.c     |    2 +-
 src/radeon_exa_funcs.c |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 49a0ca19ee4109cdd39a43fbf4bedf3f0557d6ec
Author: Michel Dänzer <daenzer at vmware.com>
Date:   Tue Jun 30 17:22:50 2009 +0200

    Warning fixes.

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index e51bffe..5e24683 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -436,7 +436,7 @@ static int RADEONDRMGetNumPipes(ScrnInfoPtr pScrn, int *num_pipes)
         return drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GETPARAM, &np, sizeof(np));
     } else {
         struct drm_radeon_info np2;
-        np2.value = (uint64_t)num_pipes;
+        np2.value = (unsigned long)num_pipes;
         np2.request = RADEON_INFO_NUM_GB_PIPES;
         return drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_INFO, &np2, sizeof(np2));
     }
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index c47dfb4..d130802 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -141,7 +141,6 @@ FUNC_NAME(RADEONPrepareSolid)(PixmapPtr pPix, int alu, Pixel pm, Pixel fg)
     int retry_count = 0;
     struct radeon_cs_space_check bos[1];
     int i;
-    ACCEL_PREAMBLE();
 
     TRACE;
 
@@ -245,7 +244,6 @@ FUNC_NAME(RADEONDoPrepareCopy)(ScrnInfoPtr pScrn, uint32_t src_pitch_offset,
 			       Pixel planemask)
 {
     RADEONInfoPtr info = RADEONPTR(pScrn);
-    ACCEL_PREAMBLE();
 
     /* setup 2D state */
     info->state_2d.dp_gui_master_cntl = (RADEON_GMC_DST_PITCH_OFFSET_CNTL |