From 126673d62afad6da84e833daa644a352d88a5e37 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Tue, 11 Jul 2006 14:37:37 +0000 Subject: 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. --- linux-core/drm_hashtab.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux-core/drm_hashtab.h') diff --git a/linux-core/drm_hashtab.h b/linux-core/drm_hashtab.h index d792499e..157353db 100644 --- a/linux-core/drm_hashtab.h +++ b/linux-core/drm_hashtab.h @@ -53,7 +53,8 @@ typedef struct drm_open_hash{ extern int drm_ht_create(drm_open_hash_t *ht, unsigned int order); extern int drm_ht_insert_item(drm_open_hash_t *ht, drm_hash_item_t *item); extern int drm_ht_just_insert_please(drm_open_hash_t *ht, drm_hash_item_t *item, - unsigned long seed, int bits); + unsigned long seed, int bits, int shift, + unsigned long add); extern int drm_ht_find_item(drm_open_hash_t *ht, unsigned long key, drm_hash_item_t **item); extern void drm_ht_verbose_list(drm_open_hash_t *ht, unsigned long key); -- cgit v1.2.3