diff options
| author | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-07-11 14:37:37 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <thomas@tungstengraphics.com> | 2006-07-11 14:37:37 +0000 |
| commit | 126673d62afad6da84e833daa644a352d88a5e37 (patch) | |
| tree | 360d6186280ab586fe748bb9bccc7db298117841 /shared-core | |
| parent | a392349691ec2aa3f83d8a9fc4a485e4dbef4bbe (diff) | |
Keep hashed user tokens, with the following changes:
32-bit physical device addresses are mapped directly to user-tokens. No
duplicate maps are allowed, and the addresses are assumed to be outside
of the range 0x10000000 through 0x30000000. The user-token is identical
to the 32-bit physical start-address of the map.
64-bit physical device addressed are mapped to user-tokens in the range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
Other map types, like upcoming TTM maps are mapped to user-tokens in the
range
0x10000000 to 0x30000000 with page-size increments. The user_token should
not be interpreted as an address.
This keeps compatibility with buggy drivers, while still implementing a
hashed map lookup. The SiS and via device driver major bumps are
reverted.
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/sis_drv.h | 8 | ||||
| -rw-r--r-- | shared-core/via_drm.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/shared-core/sis_drv.h b/shared-core/sis_drv.h index a06a96af..b739a483 100644 --- a/shared-core/sis_drv.h +++ b/shared-core/sis_drv.h @@ -34,10 +34,10 @@ #define DRIVER_AUTHOR "SIS, Tungsten Graphics" #define DRIVER_NAME "sis" #define DRIVER_DESC "SIS 300/630/540" -#define DRIVER_DATE "20060704" -#define DRIVER_MAJOR 2 -#define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 0 +#define DRIVER_DATE "20060619" +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 2 +#define DRIVER_PATCHLEVEL 1 enum sis_family { SIS_OTHER = 0, diff --git a/shared-core/via_drm.h b/shared-core/via_drm.h index 96082f22..049c63e1 100644 --- a/shared-core/via_drm.h +++ b/shared-core/via_drm.h @@ -44,9 +44,9 @@ #define VIA_DRM_DRIVER_DATE "20060616" -#define VIA_DRM_DRIVER_MAJOR 3 -#define VIA_DRM_DRIVER_MINOR 0 -#define VIA_DRM_DRIVER_PATCHLEVEL 0 +#define VIA_DRM_DRIVER_MAJOR 2 +#define VIA_DRM_DRIVER_MINOR 10 +#define VIA_DRM_DRIVER_PATCHLEVEL 2 #define VIA_DRM_DRIVER_VERSION (((VIA_DRM_DRIVER_MAJOR) << 16) | (VIA_DRM_DRIVER_MINOR)) #define VIA_NR_SAREA_CLIPRECTS 8 |