summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/radeon_accel.c2
-rw-r--r--src/radeon_exa_funcs.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index e51bffe0..5e24683d 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 c47dfb4b..d130802e 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 |