[devel-update_via_dri_h_5_0_0] Update via_dri.h to Xorg version. This,

    sadly, requires the latest Mesa to work. And i don't see a clean way to
    work around this, or to build things conditionally.

3 files changed, 31 insertions, 34 deletions

diff --git a/src/via_dri.c b/src/via_dri.c
index ba10ba3..cfa1051 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -592,9 +592,9 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
         ((pciConfigPtr)pVia->PciInfo->thisCard)->busnum,
         ((pciConfigPtr)pVia->PciInfo->thisCard)->devnum,
         ((pciConfigPtr)pVia->PciInfo->thisCard)->funcnum);
-    pDRIInfo->ddxDriverMajorVersion = VIA_DRI_VERSION_MAJOR;
-    pDRIInfo->ddxDriverMinorVersion = VIA_DRI_VERSION_MINOR;
-    pDRIInfo->ddxDriverPatchVersion = PATCHLEVEL;
+    pDRIInfo->ddxDriverMajorVersion = VIA_DRIDDX_VERSION_MAJOR;
+    pDRIInfo->ddxDriverMinorVersion = VIA_DRIDDX_VERSION_MINOR;
+    pDRIInfo->ddxDriverPatchVersion = VIA_DRIDDX_VERSION_PATCH;
 
 #if DRIINFO_MAJOR_VERSION < 5
     pDRIInfo->frameBufferPhysicalAddress = pVia->FrameBufferBase;
@@ -624,7 +624,7 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
     /* For now the mapping works by using a fixed size defined
     * in the SAREA header
     */
-    if (sizeof(XF86DRISAREARec)+sizeof(VIASAREAPriv) > SAREA_MAX) {
+    if ((sizeof(XF86DRISAREARec) + sizeof(drm_via_sarea_t)) > SAREA_MAX) {
 	xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Data does not fit in SAREA\n");
 	DRIDestroyInfoRec(pVia->pDRIInfo);
 	pVia->pDRIInfo = NULL;
@@ -673,10 +673,9 @@ VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
 	return FALSE;
     }
     pVIADRI->regs.size = VIA_MMIO_REGSIZE;
-    pVIADRI->regs.map = 0;
     pVIADRI->regs.handle = pVia->registerHandle;
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "[drm] mmio Registers = 0x%08lx\n",
-	pVIADRI->regs.handle);
+               (unsigned long) pVIADRI->regs.handle);
     
     pVIADRI->drixinerama = pVia->drixinerama;
 
@@ -777,9 +776,9 @@ VIADRIFinishScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
 
     /* set SAREA value */
     {
-	VIASAREAPriv *saPriv;
+        drm_via_sarea_t *saPriv;
 
-	saPriv=(VIASAREAPriv*)DRIGetSAREAPrivate(pScreen);
+	saPriv = (drm_via_sarea_t *) DRIGetSAREAPrivate(pScreen);
 	assert(saPriv);
 	memset(saPriv, 0, sizeof(*saPriv));
 	saPriv->ctxOwner = -1;
@@ -867,8 +866,8 @@ static Bool VIADRIMapInit(VIAPtr pVia)
 	return FALSE;
     }
     
-    xf86DrvMsg(pVia->scrnIndex, X_INFO,
-	"[drm] register handle = 0x%08lx\n", pVia->registerHandle);
+    xf86DrvMsg(pVia->scrnIndex, X_INFO, "[drm] register handle = 0x%08lx\n",
+               (unsigned long) pVia->registerHandle);
 
     return TRUE;
 }
diff --git a/src/via_dri.h b/src/via_dri.h
index c5506c4..b47397d 100644
--- a/src/via_dri.h
+++ b/src/via_dri.h
@@ -21,25 +21,27 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-
+/*
+ * Keep this file in perfect sync between the ddx and dri drivers.
+ * At least bump the VIA_DRIDDX_VERSION defines appropriately.
+ *
+ */
 #ifndef _VIA_DRI_H_
 #define _VIA_DRI_H_ 1
 
-#include "drm.h"
-#include "xf86drm.h"
-#include "via_drm.h"
-
 #define VIA_MAX_DRAWABLES 256
 
-#define VIA_DRI_VERSION_MAJOR		4
-#define VIA_DRI_VERSION_MINOR		1
+#define VIA_DRIDDX_VERSION_MAJOR  5
+#define VIA_DRIDDX_VERSION_MINOR  0
+#define VIA_DRIDDX_VERSION_PATCH  0
 
-typedef drm_via_sarea_t VIASAREAPriv;
+#ifndef XFree86Server
+typedef int Bool;
+#endif
 
 typedef struct {
     drm_handle_t handle;
     drmSize size;
-    drmAddress map;
 } viaRegion, *viaRegionPtr;
 
 typedef struct {
@@ -73,17 +75,4 @@ typedef struct {
     int dummy;
 } VIADRIContextRec, *VIADRIContextPtr;
 
-#ifdef XFree86Server
-
-#include "screenint.h"
-
-Bool VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
-void VIADRICloseScreen(ScrnInfoPtr pScrn, ScreenPtr pScreen);
-Bool VIADRIFinishScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
-void VIADRIRingBufferCleanup(ScrnInfoPtr pScrn);
-Bool VIADRIRingBufferInit(ScrnInfoPtr pScrn);
-
-
-
-#endif /* XFree86Server */
 #endif /* _VIA_DRI_H_ */
diff --git a/src/via_driver.h b/src/via_driver.h
index eaa9d77..6cb8829 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -220,8 +220,8 @@ typedef struct _VIA {
     int 		numVisualConfigs;
     __GLXvisualConfig* 	pVisualConfigs;
     VIAConfigPrivPtr 	pVisualConfigsPriv;
-    unsigned long 	agpHandle;
-    unsigned long 	registerHandle;
+    drm_handle_t 	agpHandle;
+    drm_handle_t 	registerHandle;
     unsigned long 	agpAddr;
     drmAddress          agpMappedAddr;
     unsigned char 	*agpBase;
@@ -304,6 +304,15 @@ void ViaVideoInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
 /* via_i2c.c */
 void ViaI2CInit(ScrnInfoPtr pScrn);
 
+/* via_dri.c */
+#ifdef XF86DRI
+Bool VIADRIScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
+void VIADRICloseScreen(ScrnInfoPtr pScrn, ScreenPtr pScreen);
+Bool VIADRIFinishScreenInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
+void VIADRIRingBufferCleanup(ScrnInfoPtr pScrn);
+Bool VIADRIRingBufferInit(ScrnInfoPtr pScrn);
+#endif /* XF86DRI */
+
 /* Extra debug verbosity */
 #define LOG_DEBUG 7
 #define LOG_DEBUG_XV LOG_DEBUG + 1