diff options
| author | Luc Verhaegen <libv@skynet.be> | 2005-10-23 17:41:54 +0000 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2005-10-23 17:41:54 +0000 |
| commit | a8788c87540e114e807d18a7a86331df87886eda (patch) | |
| tree | 06ecae85bd45982c32afe5489697e2b1c41a95fc /src | |
| parent | 3f6d177546ea86395922374f6863953ef6c28331 (diff) | |
Fix fallout of https://bugs.freedesktop.org/show_bug.cgi?id=4277 related
commits to unichrome mesa and ddx. (Reported by Xavier Bachelot)
Diffstat (limited to 'src')
| -rw-r--r-- | src/via_dri.c | 6 | ||||
| -rw-r--r-- | src/via_dri.h | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/via_dri.c b/src/via_dri.c index ad76c64..12506c5 100644 --- a/src/via_dri.c +++ b/src/via_dri.c @@ -635,9 +635,9 @@ Bool VIADRIScreenInit(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; pDRIInfo->frameBufferPhysicalAddress = (pointer) pVia->FrameBufferBase; pDRIInfo->frameBufferSize = pVia->videoRambytes; diff --git a/src/via_dri.h b/src/via_dri.h index 3e4d269..e68f122 100644 --- a/src/via_dri.h +++ b/src/via_dri.h @@ -23,6 +23,7 @@ */ /* * 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_ @@ -30,8 +31,13 @@ #define VIA_MAX_DRAWABLES 256 -#define VIA_DRI_VERSION_MAJOR 4 -#define VIA_DRI_VERSION_MINOR 1 +#define VIA_DRIDDX_VERSION_MAJOR 4 +#define VIA_DRIDDX_VERSION_MINOR 2 +#define VIA_DRIDDX_VERSION_PATCH 0 + +#ifndef XFree86Server +typedef int Bool; +#endif typedef struct { drm_handle_t handle; |