diff options
Diffstat (limited to 'src/mesa/drivers/dri/radeon/server')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/server/radeon.h | 14 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/server/radeon_dri.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/server/radeon_dri.h | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/radeon/server/radeon.h b/src/mesa/drivers/dri/radeon/server/radeon.h index 7ef9c453ce..45dc77fb9c 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon.h +++ b/src/mesa/drivers/dri/radeon/server/radeon.h @@ -36,7 +36,7 @@ #ifndef _RADEON_H_ #define _RADEON_H_ -#include "xf86drm.h" /* drmHandle, etc */ +#include "xf86drm.h" /* drm_handle_t, etc */ #define PCI_CHIP_R200_BB 0x4242 #define PCI_CHIP_RV250_Id 0x4964 @@ -107,14 +107,14 @@ typedef struct { drmSize registerSize; /**< \brief MMIO register map size */ - drmHandle registerHandle; /**< \brief MMIO register map handle */ + drm_handle_t registerHandle; /**< \brief MMIO register map handle */ /** * \name AGP */ /*@{*/ drmSize gartSize; /**< \brief AGP map size */ - drmHandle gartMemHandle; /**< \brief AGP map handle */ + drm_handle_t gartMemHandle; /**< \brief AGP map handle */ unsigned long gartOffset; /**< \brief AGP offset */ int gartMode; /**< \brief AGP mode */ int gartFastWrite; @@ -125,12 +125,12 @@ typedef struct { */ /*@{*/ unsigned long ringStart; /**< \brief Offset into AGP space */ - drmHandle ringHandle; /**< \brief Handle from drmAddMap() */ + drm_handle_t ringHandle; /**< \brief Handle from drmAddMap() */ drmSize ringMapSize; /**< \brief Size of map */ int ringSize; /**< \brief Size of ring (in MB) */ unsigned long ringReadOffset; /**< \brief Read offset into AGP space */ - drmHandle ringReadPtrHandle;/**< \brief Handle from drmAddMap() */ + drm_handle_t ringReadPtrHandle;/**< \brief Handle from drmAddMap() */ drmSize ringReadMapSize; /**< \brief Size of map */ /*@}*/ @@ -139,7 +139,7 @@ typedef struct { */ /*@{*/ unsigned long bufStart; /**< \brief Offset into AGP space */ - drmHandle bufHandle; /**< \brief Handle from drmAddMap() */ + drm_handle_t bufHandle; /**< \brief Handle from drmAddMap() */ drmSize bufMapSize; /**< \brief Size of map */ int bufSize; /**< \brief Size of buffers (in MB) */ int bufNumBufs; /**< \brief Number of buffers */ @@ -150,7 +150,7 @@ typedef struct { */ /*@{*/ unsigned long gartTexStart; /**< \brief Offset into AGP space */ - drmHandle gartTexHandle; /**< \brief Handle from drmAddMap() */ + drm_handle_t gartTexHandle; /**< \brief Handle from drmAddMap() */ drmSize gartTexMapSize; /**< \brief Size of map */ int gartTexSize; /**< \brief Size of AGP tex space (in MB) */ int log2GARTTexGran; diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.c b/src/mesa/drivers/dri/radeon/server/radeon_dri.c index 3365c0a219..6521ea8124 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.c +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.c @@ -810,7 +810,7 @@ static int RADEONScreenInit( DRIDriverContext *ctx, RADEONInfoPtr info ) /* Need to AddMap the framebuffer and mmio regions here: */ if (drmAddMap( ctx->drmFD, - (drmHandle)ctx->FBStart, + (drm_handle_t)ctx->FBStart, ctx->FBSize, DRM_FRAME_BUFFER, #ifndef _EMBEDDED diff --git a/src/mesa/drivers/dri/radeon/server/radeon_dri.h b/src/mesa/drivers/dri/radeon/server/radeon_dri.h index 59905227e1..ecd5323339 100644 --- a/src/mesa/drivers/dri/radeon/server/radeon_dri.h +++ b/src/mesa/drivers/dri/radeon/server/radeon_dri.h @@ -88,7 +88,7 @@ typedef struct { * \name MMIO register data */ /*@{*/ - drmHandle registerHandle; /**< \brief MMIO register map size */ + drm_handle_t registerHandle; /**< \brief MMIO register map size */ drmSize registerSize; /**< \brief MMIO register map handle */ /*@}*/ @@ -96,7 +96,7 @@ typedef struct { * \name CP in-memory status information */ /*@{*/ - drmHandle statusHandle; /**< \brief status map handle */ + drm_handle_t statusHandle; /**< \brief status map handle */ drmSize statusSize; /**< \brief status map size */ /*@}*/ @@ -104,7 +104,7 @@ typedef struct { * \name CP AGP Texture data */ /*@{*/ - drmHandle gartTexHandle; /**< \brief AGP texture area map handle */ + drm_handle_t gartTexHandle; /**< \brief AGP texture area map handle */ drmSize gartTexMapSize; /**< \brief AGP texture area map size */ int log2GARTTexGran; /**< \brief AGP texture granularity in log base 2 */ int gartTexOffset; /**< \brief AGP texture area offset in AGP space */ |