Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

43 files changed, 92 insertions, 92 deletions

diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 4dbd57ae86c..6b251c1cd6b 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -62,7 +62,7 @@ static const int empty_attribute_list[1] = { None };
 static PFNGLXWINDOWEXISTSPROC window_exists;
 
 typedef Bool (*PFNGLXCREATECONTEXTWITHCONFIGPROC)( __DRInativeDisplay*, int, int, void *,
-    drmContextPtr );
+    drm_context_t * );
 
 static PFNGLXCREATECONTEXTWITHCONFIGPROC create_context_with_config;
 
@@ -167,7 +167,7 @@ findConfigMode(__DRInativeDisplay *dpy, int scrn, VisualID vid,
  */
 static Bool
 fake_XF86DRICreateContextWithConfig( __DRInativeDisplay* dpy, int screen, int configID,
-				     XID* context, drmContextPtr hHWContext )
+				     XID* context, drm_context_t * hHWContext )
 {
     Visual  vis;
     
@@ -1329,7 +1329,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 {
     int directCapable;
     __DRIscreenPrivate *psp = NULL;
-    drmHandle hSAREA;
+    drm_handle_t hSAREA;
     drmAddress pSAREA;
     char *BusID;
     __GLcontextModes *modes;
@@ -1380,7 +1380,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 	err_extra = strerror( -fd );
 
 	if (fd >= 0) {
-	    drmMagic magic;
+	    drm_magic_t magic;
 
 	    err_msg = "drmGetMagic";
 	    err_extra = NULL;
@@ -1426,7 +1426,7 @@ __driUtilCreateScreen(Display *dpy, int scrn, __DRIscreen *psc,
 						&dri_version.major,
 						&dri_version.minor,
 						&dri_version.patch)) {
-			    drmHandle  hFB;
+			    drm_handle_t  hFB;
 			    int        junk;
 
 			    /*
diff --git a/src/mesa/drivers/dri/common/dri_util.h b/src/mesa/drivers/dri/common/dri_util.h
index 1cc5f7cc546..a36e94be835 100644
--- a/src/mesa/drivers/dri/common/dri_util.h
+++ b/src/mesa/drivers/dri/common/dri_util.h
@@ -261,7 +261,7 @@ struct __DRIdrawablePrivateRec {
     /**
      * Kernel drawable handle
      */
-    drmDrawable hHWDrawable;
+    drm_drawable_t hHWDrawable;
 
     /**
      * Driver's private drawable information.  
@@ -377,7 +377,7 @@ struct __DRIcontextPrivateRec {
     /**
      * Kernel context handle used to access the device lock.
      */
-    drmContext hHWContext;
+    drm_context_t hHWContext;
 
     /**
      * Device driver's private context data.  This structure is opaque.
diff --git a/src/mesa/drivers/dri/ffb/ffb_context.h b/src/mesa/drivers/dri/ffb/ffb_context.h
index f59f4acdaad..80fb221e3e3 100644
--- a/src/mesa/drivers/dri/ffb/ffb_context.h
+++ b/src/mesa/drivers/dri/ffb/ffb_context.h
@@ -262,7 +262,7 @@ do {	if ((STATE_MASK) & ~((FMESA)->state_dirty)) {	\
 	/* Fog state. */
 	float			Znear, Zfar;
 
-	drmContext		hHWContext;
+	drm_context_t		hHWContext;
 	drmLock			*driHwLock;
 	int			driFd;
 
diff --git a/src/mesa/drivers/dri/ffb/server/ffb_drishare.h b/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
index 01d884ab31d..f023920a1fc 100644
--- a/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
+++ b/src/mesa/drivers/dri/ffb/server/ffb_drishare.h
@@ -19,23 +19,23 @@ typedef struct ffb_dri_state {
 	((ffb_dri_state_t *) (((char *)(SAREA)) + sizeof(drm_sarea_t)))
 
 typedef struct {
-	drmHandle	hFbcRegs;
+	drm_handle_t	hFbcRegs;
 	drmSize		sFbcRegs;
 	drmAddress	mFbcRegs;
 
-	drmHandle	hDacRegs;
+	drm_handle_t	hDacRegs;
 	drmSize		sDacRegs;
 	drmAddress	mDacRegs;
 
-	drmHandle	hSfb8r;
+	drm_handle_t	hSfb8r;
 	drmSize		sSfb8r;
 	drmAddress	mSfb8r;
 
-	drmHandle	hSfb32;
+	drm_handle_t	hSfb32;
 	drmSize		sSfb32;
 	drmAddress	mSfb32;
 
-	drmHandle	hSfb64;
+	drm_handle_t	hSfb64;
 	drmSize		sSfb64;
 	drmAddress	mSfb64;
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_context.h b/src/mesa/drivers/dri/gamma/gamma_context.h
index 0289fbe05da..4572a0224d2 100644
--- a/src/mesa/drivers/dri/gamma/gamma_context.h
+++ b/src/mesa/drivers/dri/gamma/gamma_context.h
@@ -243,7 +243,7 @@ struct gamma_context {
 
    	/* Mirrors of some DRI state
     	 */
-   	drmContext hHWContext;
+   	drm_context_t hHWContext;
    	drm_hw_lock_t *driHwLock;
    	int driFd;
 
diff --git a/src/mesa/drivers/dri/gamma/gamma_screen.h b/src/mesa/drivers/dri/gamma/gamma_screen.h
index 6f3cf1e5b18..7f0ed6f80eb 100644
--- a/src/mesa/drivers/dri/gamma/gamma_screen.h
+++ b/src/mesa/drivers/dri/gamma/gamma_screen.h
@@ -1,5 +1,5 @@
 typedef struct _gammaRegion {
-    drmHandle  handle;
+    drm_handle_t  handle;
     drmSize    size;
     drmAddress map;
 } gammaRegion, *gammaRegionPtr;
diff --git a/src/mesa/drivers/dri/i810/i810context.h b/src/mesa/drivers/dri/i810/i810context.h
index d3dd1a16c90..a2202e148f9 100644
--- a/src/mesa/drivers/dri/i810/i810context.h
+++ b/src/mesa/drivers/dri/i810/i810context.h
@@ -169,7 +169,7 @@ struct i810_context_t {
    drm_clip_rect_t draw_rect;
    drm_clip_rect_t scissor_rect;
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/i810/i810screen.h b/src/mesa/drivers/dri/i810/i810screen.h
index 4625bc5e9f6..b29937665af 100644
--- a/src/mesa/drivers/dri/i810/i810screen.h
+++ b/src/mesa/drivers/dri/i810/i810screen.h
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri_util.h"
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    char *map;
 } i810Region, *i810RegionPtr;
diff --git a/src/mesa/drivers/dri/i810/server/i810_dri.c b/src/mesa/drivers/dri/i810/server/i810_dri.c
index e9c4b78e3ab..d1bd4b6a89c 100644
--- a/src/mesa/drivers/dri/i810/server/i810_dri.c
+++ b/src/mesa/drivers/dri/i810/server/i810_dri.c
@@ -505,14 +505,14 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
    int        depthSize   = (((ctx->shared.virtualHeight+15) & ~15) * width_bytes);
    int        l;
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->BackBuffer.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->BackBuffer.Start,
 		 info->BackBuffer.Size, DRM_AGP, 0,
 		 &info->backbuffer) < 0) {
      fprintf(stderr, "[drm] drmAddMap(backbuffer) failed.  Disabling DRI\n");
      return 0;
    }
    
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->DepthBuffer.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->DepthBuffer.Start,
 		 info->DepthBuffer.Size, DRM_AGP, 0,
 		 &info->depthbuffer) < 0) {
      fprintf(stderr, "[drm] drmAddMap(depthbuffer) failed.  Disabling DRI.\n");
@@ -561,13 +561,13 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
      return 0;
    }
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->BufferMem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->BufferMem.Start,
 		 info->BufferMem.Size, DRM_AGP, 0, &info->buffer_map) < 0) {
      fprintf(stderr, "[drm] drmAddMap(buffer_map) failed.  Disabling DRI.\n");
      return 0;
    }
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->LpRing.mem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->LpRing.mem.Start,
 		 info->LpRing.mem.Size, DRM_AGP, 0, &info->ring_map) < 0) {
      fprintf(stderr, "[drm] drmAddMap(ring_map) failed.  Disabling DRI. \n");
      return 0;
@@ -601,7 +601,7 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
 
    I810AllocLow(&(info->TexMem), &(info->SysMem), info->textureSize);
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->TexMem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->TexMem.Start,
 		 info->TexMem.Size, DRM_AGP, 0, &info->textures) < 0) {
      fprintf(stderr,
 		 "[drm] drmAddMap(textures) failed.  Disabling DRI.\n");
@@ -726,7 +726,7 @@ static int I810ScreenInit( DRIDriverContext *ctx, I810Ptr 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/i810/server/i810_dri.h b/src/mesa/drivers/dri/i810/server/i810_dri.h
index 2931988c879..2e710a414ac 100644
--- a/src/mesa/drivers/dri/i810/server/i810_dri.h
+++ b/src/mesa/drivers/dri/i810/server/i810_dri.h
@@ -9,20 +9,20 @@
 #define I810_MAX_DRAWABLES 256
 
 typedef struct {
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
    drmAddress regsMap;
 
    drmSize backbufferSize;
-   drmHandle backbuffer;
+   drm_handle_t backbuffer;
 
    drmSize depthbufferSize;
-   drmHandle depthbuffer;
+   drm_handle_t depthbuffer;
 
-   drmHandle textures;
+   drm_handle_t textures;
    int textureSize;
 
-   drmHandle agp_buffers;
+   drm_handle_t agp_buffers;
    drmSize agp_buf_size;
 
    int deviceID;
diff --git a/src/mesa/drivers/dri/i830/i830_context.h b/src/mesa/drivers/dri/i830/i830_context.h
index bb88c97de35..de141bd4a18 100644
--- a/src/mesa/drivers/dri/i830/i830_context.h
+++ b/src/mesa/drivers/dri/i830/i830_context.h
@@ -209,7 +209,7 @@ struct i830_context_t
    drm_clip_rect_t draw_rect;
    drm_clip_rect_t scissor_rect;
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drmLock *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/i830/i830_screen.h b/src/mesa/drivers/dri/i830/i830_screen.h
index eabb6084ad4..edbe719e05e 100644
--- a/src/mesa/drivers/dri/i830/i830_screen.h
+++ b/src/mesa/drivers/dri/i830/i830_screen.h
@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    char *map;
 } i830Region, *i830RegionPtr;
diff --git a/src/mesa/drivers/dri/i830/server/i830_dri.h b/src/mesa/drivers/dri/i830/server/i830_dri.h
index bc123302956..6477f4e79ff 100644
--- a/src/mesa/drivers/dri/i830/server/i830_dri.h
+++ b/src/mesa/drivers/dri/i830/server/i830_dri.h
@@ -16,20 +16,20 @@
 #define I830_REG_SIZE 0x80000
 
 typedef struct _I830DRIRec {
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
    drmAddress regsMap;
 
    drmSize backbufferSize;
-   drmHandle backbuffer;
+   drm_handle_t backbuffer;
 
    drmSize depthbufferSize;
-   drmHandle depthbuffer;
+   drm_handle_t depthbuffer;
 
-   drmHandle textures;
+   drm_handle_t textures;
    int textureSize;
 
-   drmHandle agp_buffers;
+   drm_handle_t agp_buffers;
    drmSize agp_buf_size;
 
    int deviceID;
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.h b/src/mesa/drivers/dri/mach64/mach64_context.h
index 3b22eef7de5..a4a48b8fb38 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.h
+++ b/src/mesa/drivers/dri/mach64/mach64_context.h
@@ -303,7 +303,7 @@ struct mach64_context {
 
    unsigned int lastStamp;		/* mirror driDrawable->lastStamp */
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/mach64/mach64_screen.h b/src/mesa/drivers/dri/mach64/mach64_screen.h
index c78053f03af..298c0e6c833 100644
--- a/src/mesa/drivers/dri/mach64/mach64_screen.h
+++ b/src/mesa/drivers/dri/mach64/mach64_screen.h
@@ -37,7 +37,7 @@
 #include "xmlconfig.h"
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    drmAddress *map;			/* Mapping of the DRM region */
 } mach64RegionRec, *mach64RegionPtr;
diff --git a/src/mesa/drivers/dri/mach64/server/mach64_dri.h b/src/mesa/drivers/dri/mach64/server/mach64_dri.h
index 01c4dcf2028..139668e3f3e 100644
--- a/src/mesa/drivers/dri/mach64/server/mach64_dri.h
+++ b/src/mesa/drivers/dri/mach64/server/mach64_dri.h
@@ -34,28 +34,28 @@
 #include "xf86drm.h"
 
 typedef struct {
-   drmHandle fbHandle;
+   drm_handle_t fbHandle;
 
-   drmHandle regsHandle;
+   drm_handle_t regsHandle;
    drmSize regsSize;
 
    int IsPCI;
 
-   drmHandle agpHandle;            /* Handle from drmAgpAlloc */
+   drm_handle_t agpHandle;            /* Handle from drmAgpAlloc */
    unsigned long agpOffset;
    drmSize agpSize;
    int agpMode;
 
    /* DMA descriptor ring */
    unsigned long     ringStart;        /* Offset into AGP space */
-   drmHandle         ringHandle;       /* Handle from drmAddMap */
+   drm_handle_t         ringHandle;       /* Handle from drmAddMap */
    drmSize           ringMapSize;      /* Size of map */
    int               ringSize;         /* Size of ring (in kB) */
    drmAddress        ringMap;          /* Map */
 
    /* vertex buffer data */
    unsigned long     bufferStart;      /* Offset into AGP space */
-   drmHandle         bufferHandle;     /* Handle from drmAddMap */
+   drm_handle_t         bufferHandle;     /* Handle from drmAddMap */
    drmSize           bufferMapSize;    /* Size of map */
    int               bufferSize;       /* Size of buffers (in MB) */
    drmAddress        bufferMap;        /* Map */
@@ -65,7 +65,7 @@ typedef struct {
 
    /* AGP Texture data */
    unsigned long     agpTexStart;      /* Offset into AGP space */
-   drmHandle         agpTexHandle;     /* Handle from drmAddMap */
+   drm_handle_t         agpTexHandle;     /* Handle from drmAddMap */
    drmSize           agpTexMapSize;    /* Size of map */
    int               agpTexSize;       /* Size of AGP tex space (in MB) */
    drmAddress        agpTexMap;        /* Map */
@@ -113,10 +113,10 @@ typedef struct {
    unsigned int textureSize;
    int logTextureGranularity;
 
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
 
-   drmHandle agp;
+   drm_handle_t agp;
    drmSize agpSize;
    unsigned int agpTextureOffset;
    unsigned int agpTextureSize;
diff --git a/src/mesa/drivers/dri/mga/mgacontext.h b/src/mesa/drivers/dri/mga/mgacontext.h
index 2009634b13c..602f8aca9d4 100644
--- a/src/mesa/drivers/dri/mga/mgacontext.h
+++ b/src/mesa/drivers/dri/mga/mgacontext.h
@@ -295,7 +295,7 @@ struct mga_context_t {
 
    /* Mirrors of some DRI state.
     */
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
    __DRIdrawablePrivate *driDrawable;
diff --git a/src/mesa/drivers/dri/mga/server/mga_dri.c b/src/mesa/drivers/dri/mga/server/mga_dri.c
index 0a193b258ac..896bb56ccec 100644
--- a/src/mesa/drivers/dri/mga/server/mga_dri.c
+++ b/src/mesa/drivers/dri/mga/server/mga_dri.c
@@ -315,7 +315,7 @@ static int MGADRIMapInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
    pMga->registers.size = MGAIOMAPSIZE;
 
    if ( drmAddMap( ctx->drmFD,
-		   (drmHandle)pMga->IOAddress,
+		   (drm_handle_t)pMga->IOAddress,
 		   pMga->registers.size,
 		   DRM_REGISTERS, DRM_READ_ONLY,
 		   &pMga->registers.handle ) < 0 ) {
@@ -718,7 +718,7 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga )
    /* 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,
 		  0,
diff --git a/src/mesa/drivers/dri/r128/r128_context.h b/src/mesa/drivers/dri/r128/r128_context.h
index 4712f0be2ed..3e4ac2bf329 100644
--- a/src/mesa/drivers/dri/r128/r128_context.h
+++ b/src/mesa/drivers/dri/r128/r128_context.h
@@ -193,7 +193,7 @@ struct r128_context {
 
    unsigned int lastStamp;	        /* mirror driDrawable->lastStamp */
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/r128/r128_screen.h b/src/mesa/drivers/dri/r128/r128_screen.h
index 1fac0a7f495..45e5114e8c8 100644
--- a/src/mesa/drivers/dri/r128/r128_screen.h
+++ b/src/mesa/drivers/dri/r128/r128_screen.h
@@ -41,7 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xmlconfig.h"
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    unsigned char *map;			/* Mapping of the DRM region */
 } r128RegionRec, *r128RegionPtr;
diff --git a/src/mesa/drivers/dri/r128/server/r128.h b/src/mesa/drivers/dri/r128/server/r128.h
index 0078aab73a4..6420c32c037 100644
--- a/src/mesa/drivers/dri/r128/server/r128.h
+++ b/src/mesa/drivers/dri/r128/server/r128.h
@@ -308,7 +308,7 @@ typedef struct {
     R128FBLayout      CurrentLayout;
 #endif    
 #ifdef XF86DRI
-    drmContext        drmCtx;
+    drm_context_t        drmCtx;
 #ifndef _SOLO    
     DRIInfoPtr        pDRIInfo;
     int               numVisualConfigs;
@@ -317,11 +317,11 @@ typedef struct {
 #endif    
 
     drmSize           registerSize;
-    drmHandle         registerHandle;
+    drm_handle_t         registerHandle;
 
     GLboolean         IsPCI;            /* Current card is a PCI card */
     drmSize           pciSize;
-    drmHandle         pciMemHandle;
+    drm_handle_t         pciMemHandle;
     unsigned char     *PCI;             /* Map */
 
     GLboolean         allowPageFlip;    /* Enable 3d page flipping */
@@ -329,7 +329,7 @@ typedef struct {
     int               drmMinor;
 
     drmSize           agpSize;
-    drmHandle         agpMemHandle;     /* Handle from drmAgpAlloc */
+    drm_handle_t         agpMemHandle;     /* Handle from drmAgpAlloc */
     unsigned long     agpOffset;
     unsigned char     *AGP;             /* Map */
     int               agpMode;
@@ -342,20 +342,20 @@ typedef struct {
 
 				/* CCE ring buffer data */
     unsigned long     ringStart;        /* Offset into AGP space */
-    drmHandle         ringHandle;       /* Handle from drmAddMap */
+    drm_handle_t         ringHandle;       /* Handle from drmAddMap */
     drmSize           ringMapSize;      /* Size of map */
     int               ringSize;         /* Size of ring (in MB) */
     unsigned char     *ring;            /* Map */
     int               ringSizeLog2QW;
 
     unsigned long     ringReadOffset;   /* Offset into AGP space */
-    drmHandle         ringReadPtrHandle; /* Handle from drmAddMap */
+    drm_handle_t         ringReadPtrHandle; /* Handle from drmAddMap */
     drmSize           ringReadMapSize;  /* Size of map */
     unsigned char     *ringReadPtr;     /* Map */
 
 				/* CCE vertex/indirect buffer data */
     unsigned long     bufStart;        /* Offset into AGP space */
-    drmHandle         bufHandle;       /* Handle from drmAddMap */
+    drm_handle_t         bufHandle;       /* Handle from drmAddMap */
     drmSize           bufMapSize;      /* Size of map */
     int               bufSize;         /* Size of buffers (in MB) */
     unsigned char     *buf;            /* Map */
@@ -364,7 +364,7 @@ typedef struct {
 
 				/* CCE AGP Texture data */
     unsigned long     agpTexStart;      /* Offset into AGP space */
-    drmHandle         agpTexHandle;     /* Handle from drmAddMap */
+    drm_handle_t         agpTexHandle;     /* Handle from drmAddMap */
     drmSize           agpTexMapSize;    /* Size of map */
     int               agpTexSize;       /* Size of AGP tex space (in MB) */
     unsigned char     *agpTex;          /* Map */
diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.c b/src/mesa/drivers/dri/r128/server/r128_dri.c
index 9a2505da8db..6d577483cc0 100644
--- a/src/mesa/drivers/dri/r128/server/r128_dri.c
+++ b/src/mesa/drivers/dri/r128/server/r128_dri.c
@@ -810,7 +810,7 @@ static GLboolean R128DRIScreenInit(DRIDriverContext *ctx)
    /* 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,
 		  0,
diff --git a/src/mesa/drivers/dri/r128/server/r128_dri.h b/src/mesa/drivers/dri/r128/server/r128_dri.h
index 45a27736058..4b6e77ecb86 100644
--- a/src/mesa/drivers/dri/r128/server/r128_dri.h
+++ b/src/mesa/drivers/dri/r128/server/r128_dri.h
@@ -88,11 +88,11 @@ typedef struct {
     int           log2TexGran;
 
     /* MMIO register data */
-    drmHandle     registerHandle;
+    drm_handle_t     registerHandle;
     drmSize       registerSize;
 
     /* CCE AGP Texture data */
-    drmHandle     agpTexHandle;
+    drm_handle_t     agpTexHandle;
     drmSize       agpTexMapSize;
     int           log2AGPTexGran;
     int           agpTexOffset;
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index 78631c722ad..1ed1dfb9220 100644
--- a/src/mesa/drivers/dri/r200/r200_context.h
+++ b/src/mesa/drivers/dri/r200/r200_context.h
@@ -579,7 +579,7 @@ struct r200_dri_mirror {
    __DRIscreenPrivate	*screen;	/* DRI screen */
    __DRIdrawablePrivate	*drawable;	/* DRI drawable bound to this ctx */
 
-   drmContext hwContext;
+   drm_context_t hwContext;
    drm_hw_lock_t *hwLock;
    int fd;
    int drmMinor;
diff --git a/src/mesa/drivers/dri/r200/r200_screen.h b/src/mesa/drivers/dri/r200/r200_screen.h
index 35b3cb18904..845570daf45 100644
--- a/src/mesa/drivers/dri/r200/r200_screen.h
+++ b/src/mesa/drivers/dri/r200/r200_screen.h
@@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xmlconfig.h"
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    drmAddress map;			/* Mapping of the DRM region */
 } r200RegionRec, *r200RegionPtr;
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index 30346150dbf..c8f74272ae0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -482,7 +482,7 @@ struct radeon_dri_mirror {
    __DRIscreenPrivate	*screen;	/* DRI screen */
    __DRIdrawablePrivate	*drawable;	/* DRI drawable bound to this ctx */
 
-   drmContext hwContext;
+   drm_context_t hwContext;
    drm_hw_lock_t *hwLock;
    int fd;
    int drmMinor;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index d501fa1f238..1351bb29799 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -51,7 +51,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    drmAddress map;			/* Mapping of the DRM region */
 } radeonRegionRec, *radeonRegionPtr;
diff --git a/src/mesa/drivers/dri/radeon/server/radeon.h b/src/mesa/drivers/dri/radeon/server/radeon.h
index 7ef9c453cec..45dc77fb9c5 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 3365c0a2198..6521ea81248 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 59905227e10..ecd53233394 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 */
diff --git a/src/mesa/drivers/dri/savage/savage_init.h b/src/mesa/drivers/dri/savage/savage_init.h
index c55c62df9ce..f632c91f073 100644
--- a/src/mesa/drivers/dri/savage/savage_init.h
+++ b/src/mesa/drivers/dri/savage/savage_init.h
@@ -33,7 +33,7 @@
 #include "mtypes.h"
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    char *map;
 } savageRegion, *savageRegionPtr;
diff --git a/src/mesa/drivers/dri/savage/savagecontext.h b/src/mesa/drivers/dri/savage/savagecontext.h
index d081c1ce338..34056604c3b 100644
--- a/src/mesa/drivers/dri/savage/savagecontext.h
+++ b/src/mesa/drivers/dri/savage/savagecontext.h
@@ -236,7 +236,7 @@ struct savage_context_t {
     /*Texture aging and DMA based aging*/
     unsigned int texAge[SAVAGE_NR_TEX_HEAPS]; 
 
-    drmContext hHWContext;
+    drm_context_t hHWContext;
     drmLock *driHwLock;
     GLuint driFd;
 
diff --git a/src/mesa/drivers/dri/sis/server/sis_dri.h b/src/mesa/drivers/dri/sis/server/sis_dri.h
index d38e39a0539..ce7c9a3114c 100644
--- a/src/mesa/drivers/dri/sis/server/sis_dri.h
+++ b/src/mesa/drivers/dri/sis/server/sis_dri.h
@@ -35,7 +35,7 @@ typedef struct {
 #define SIS_DEPTH 2
 
 typedef struct {
-  drmHandle handle;
+  drm_handle_t handle;
   drmSize size;
   drmAddress map;
 } sisRegion, *sisRegionPtr;
diff --git a/src/mesa/drivers/dri/sis/sis_context.h b/src/mesa/drivers/dri/sis/sis_context.h
index 395a7a3e6d6..19e7afee7fc 100644
--- a/src/mesa/drivers/dri/sis/sis_context.h
+++ b/src/mesa/drivers/dri/sis/sis_context.h
@@ -355,7 +355,7 @@ struct sis_context
 
   unsigned int lastStamp;	        /* mirror driDrawable->lastStamp */
 
-  drmContext hHWContext;
+  drm_context_t hHWContext;
   drm_hw_lock_t *driHwLock;
 
   sisScreenPtr sisScreen;		/* Screen private DRI data */
diff --git a/src/mesa/drivers/dri/sis/sis_screen.h b/src/mesa/drivers/dri/sis/sis_screen.h
index 452278264f1..068c0410da4 100644
--- a/src/mesa/drivers/dri/sis/sis_screen.h
+++ b/src/mesa/drivers/dri/sis/sis_screen.h
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define __SIS_SCREEN_H
 
 typedef struct {
-   drmHandle handle;			/* Handle to the DRM region */
+   drm_handle_t handle;			/* Handle to the DRM region */
    drmSize size;			/* Size of the DRM region */
    drmAddress map;			/* Mapping of the DRM region */
 } sisRegionRec2, *sisRegionPtr2;
diff --git a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
index e0f7609be76..8184f60361f 100644
--- a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
+++ b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.c
@@ -259,7 +259,7 @@ static int createScreen (DRIDriverContext *ctx, TDFXDRIPtr pTDFX)
    /* 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/tdfx/server/tdfx_dri.h b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
index 956b7e7034c..e7ad87d1b1b 100644
--- a/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
+++ b/src/mesa/drivers/dri/tdfx/server/tdfx_dri.h
@@ -6,7 +6,7 @@
 #include "xf86drm.h"
 
 typedef struct {
-  drmHandle regs;
+  drm_handle_t regs;
   drmSize regsSize;
   drmAddress regsMap;
   int deviceID;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.h b/src/mesa/drivers/dri/tdfx/tdfx_context.h
index 61eab8f2f8d..201fce1a012 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.h
@@ -914,7 +914,7 @@ struct tdfx_context {
    __DRIscreenPrivate *driScreen;
    __DRIcontextPrivate *driContext;
    __DRIdrawablePrivate *driDrawable;
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
    tdfxScreenPrivate *fxScreen;
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_screen.h b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
index 2a79c88b0f6..3faeb84e752 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_screen.h
+++ b/src/mesa/drivers/dri/tdfx/tdfx_screen.h
@@ -40,7 +40,7 @@
 #ifdef GLX_DIRECT_RENDERING
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    drmAddress map;
 } tdfxRegion, *tdfxRegionPtr;
diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c
index 0a6c8c04cab..381f493b7ae 100644
--- a/src/mesa/drivers/dri/unichrome/server/via_dri.c
+++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c
@@ -131,7 +131,7 @@ static int VIADRIAgpInit(const DRIDriverContext *ctx, VIAPtr pVia)
                  "[drm] agpAddr = 0x%08lx\n",pVia->agpAddr);
 		 
     pVIADRI->agp.size = pVia->agpSize;
-    if (drmAddMap(pVia->drmFD, (drmHandle)0,
+    if (drmAddMap(pVia->drmFD, (drm_handle_t)0,
                  pVIADRI->agp.size, DRM_AGP, 0, 
                  &pVIADRI->agp.handle) < 0) {
 	xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -237,7 +237,7 @@ static int VIADRIScreenInit(DRIDriverContext * ctx)
     /* 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/unichrome/via_context.h b/src/mesa/drivers/dri/unichrome/via_context.h
index 25d9325288f..fe26ff80d3a 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.h
+++ b/src/mesa/drivers/dri/unichrome/via_context.h
@@ -97,7 +97,7 @@ typedef void (*via_line_func)(viaContextPtr, viaVertex *, viaVertex *);
 typedef void (*via_point_func)(viaContextPtr, viaVertex *);
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     GLuint offset;
     GLuint index;
@@ -107,7 +107,7 @@ typedef struct {
 } viaBuffer, *viaBufferPtr;
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     GLuint offset;
     GLuint index;
@@ -288,7 +288,7 @@ struct via_context_t {
     drm_clip_rect_t drawRect;
     drm_clip_rect_t scissorRect;
 
-    drmContext hHWContext;
+    drm_context_t hHWContext;
     drm_hw_lock_t *driHwLock;
     int driFd;
 #ifndef _SOLO
diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h
index 9c17cf6b1d8..6a0331424d1 100644
--- a/src/mesa/drivers/dri/unichrome/via_dri.h
+++ b/src/mesa/drivers/dri/unichrome/via_dri.h
@@ -13,7 +13,7 @@ typedef struct {
 } VIASAREAPriv;
 
 typedef struct {
-    drmHandle handle;
+    drm_handle_t handle;
     drmSize size;
     drmAddress map;
 } viaRegion, *viaRegionPtr;
diff --git a/src/mesa/drivers/dri/unichrome/xf86drmVIA.c b/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
index e39bdf745f1..8954d8e208c 100644
--- a/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
+++ b/src/mesa/drivers/dri/unichrome/xf86drmVIA.c
@@ -121,7 +121,7 @@ int drmVIAAllocateDMA(int fd, drmVIADMABuf *buf)
 		return -errno;
     }
     
-    if (drmMap(fd,(drmHandle)buf->index,
+    if (drmMap(fd,(drm_handle_t)buf->index,
 		buf->size,(drmAddressPtr)(&buf->address)) < 0) {
 	return -errno;
     }