diff options
| author | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-01 20:32:23 +0000 |
|---|---|---|
| committer | Felix Kuehling <fxkuehl@gmx.de> | 2005-01-01 20:32:23 +0000 |
| commit | 8fad99f52106c64bf7f5c88b2246313338286f54 (patch) | |
| tree | 3ad68ac2503f71a4a966243ee7f4e22b123fbe20 /src/savage_driver.h | |
| parent | d0e9c3ad1cb9babbe841926c9a373ebe40dfe62c (diff) | |
Updates to support the new Savage DRM driver (version 2.0.x) which was just
committed to DRM CVS. Cleaned up the interface to the DRI driver.
Bumped the Savage DDX version to 2.0.0 due to incompatible changes in
that interface.
Diffstat (limited to 'src/savage_driver.h')
| -rw-r--r-- | src/savage_driver.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/savage_driver.h b/src/savage_driver.h index 44da652..67e2de4 100644 --- a/src/savage_driver.h +++ b/src/savage_driver.h @@ -30,7 +30,6 @@ #define _XF86DRI_SERVER_ #include "savage_dripriv.h" #include "savage_dri.h" -#include "savage_drm.h" #include "dri.h" #include "GL/glxint.h" #endif @@ -85,6 +84,15 @@ typedef struct #define SAVAGE_LCD_ON 2 #define SAVAGE_TV_ON 4 +#define SAVAGE_DRIVER_NAME "savage" +#define SAVAGE_DRIVER_VERSION "2.0.0" +#define SAVAGE_VERSION_MAJOR 2 +#define SAVAGE_VERSION_MINOR 0 +#define SAVAGE_PATCHLEVEL 0 +#define SAVAGE_VERSION ((SAVAGE_VERSION_MAJOR << 24) | \ + (SAVAGE_VERSION_MINOR << 16) | \ + SAVAGE_PATCHLEVEL) + typedef struct _S3VMODEENTRY { unsigned short Width; unsigned short Height; @@ -285,6 +293,8 @@ typedef struct _Savage { unsigned long cobIndex; /* size index */ unsigned long cobSize; /* size in bytes */ unsigned long cobOffset; /* offset in frame buffer */ + unsigned long bciThresholdLo; /* low and hight thresholds for */ + unsigned long bciThresholdHi; /* shadow status update (32bit words) */ /* Support for DGA */ int numDGAModes; |