From 240ff63455f381c729afeb5e370f606dd4f7ccd0 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 16 Nov 2006 15:00:03 -0800
Subject: [PATCH] Fix DRM type names.

This code used the old style names (e.g., drmHandle).  This patches
the code to use the new style names (e.g., drm_handle_t).
---
 src/xgi_dri.c | 14 +++++++-------
 src/xgi_dri.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/xgi_dri.c b/src/xgi_dri.c
index 2793995..09bacc6 100644
--- a/src/xgi_dri.c
+++ b/src/xgi_dri.c
@@ -53,9 +53,9 @@ static char XGIClientDriverName[] = "xgi";
 
 static Bool XGIInitVisualConfigs(ScreenPtr pScreen);
 static Bool XGICreateContext(ScreenPtr pScreen, VisualPtr visual,
-			      drmContext hwContext, void *pVisualConfigPriv,
+			      drm_context_t hwContext, void *pVisualConfigPriv,
 			      DRIContextType contextStore);
-static void XGIDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+static void XGIDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
 			       DRIContextType contextStore);
 static void XGIDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
 			       DRIContextType readContextType,
@@ -297,7 +297,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
 
   pXGIDRI->regs.size = XGIIOMAPSIZE;
   pXGIDRI->regs.map = 0;
-  if (drmAddMap(pXGI->drmSubFD, (drmHandle)pXGI->IOAddress,
+  if (drmAddMap(pXGI->drmSubFD, (drm_handle_t)pXGI->IOAddress,
 		pXGIDRI->regs.size, DRM_REGISTERS, 0,
 		&pXGIDRI->regs.handle)<0)
   {
@@ -368,7 +368,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
     /* by mem-map pXGIDRI->agp.handle             */
     /**********************************************/
     pXGIDRI->agp.size = pXGI->agpSize;
-    if (drmAddMap(pXGI->drmSubFD, (drmHandle)0,
+    if (drmAddMap(pXGI->drmSubFD, (drm_handle_t)0,
                  pXGIDRI->agp.size, DRM_AGP, 0,
                  &pXGIDRI->agp.handle) < 0) {
       xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -469,14 +469,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
  */
 static Bool
 XGICreateContext(ScreenPtr pScreen, VisualPtr visual,
-		  drmContext hwContext, void *pVisualConfigPriv,
+		  drm_context_t hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
   return TRUE;
 }
 
 static void
-XGIDestroyContext(ScreenPtr pScreen, drmContext hwContext,
+XGIDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
 		   DRIContextType contextStore)
 {
 }
@@ -643,4 +643,4 @@ ULONG CheckAGPSlot(ScreenPtr pScreen, ULONG uNextLink)
 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[%s] This Card Type is PCIExpress\n", __FUNCTION__);    	
 	
 	return uType;	
-}
\ No newline at end of file
+}
diff --git a/src/xgi_dri.h b/src/xgi_dri.h
index 3cbd970..f5f3d24 100644
--- a/src/xgi_dri.h
+++ b/src/xgi_dri.h
@@ -34,7 +34,7 @@ typedef struct {
 #define XGI_DEPTH 2
 
 typedef struct {
-  drmHandle handle;
+  drm_handle_t handle;
   drmSize size;
   drmAddress map;
 } xgiRegion, *xgiRegionPtr;