summaryrefslogtreecommitdiff
path: root/linux-core/drm_sman.c
diff options
context:
space:
mode:
authorThomas Hellstrom <thomas@tungstengraphics.com>2006-07-11 14:37:37 +0000
committerThomas Hellstrom <thomas@tungstengraphics.com>2006-07-11 14:37:37 +0000
commit126673d62afad6da84e833daa644a352d88a5e37 (patch)
tree360d6186280ab586fe748bb9bccc7db298117841 /linux-core/drm_sman.c
parenta392349691ec2aa3f83d8a9fc4a485e4dbef4bbe (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 'linux-core/drm_sman.c')
-rw-r--r--linux-core/drm_sman.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_sman.c b/linux-core/drm_sman.c
index a03c9f55..d894e82c 100644
--- a/linux-core/drm_sman.c
+++ b/linux-core/drm_sman.c
@@ -223,7 +223,7 @@ drm_memblock_item_t *drm_sman_alloc(drm_sman_t * sman, unsigned int manager,
if (drm_ht_just_insert_please
(&sman->user_hash_tab, &memblock->user_hash,
- (unsigned long)memblock, 32))
+ (unsigned long)memblock, 32, 0, 0))
goto out1;
owner_item = drm_sman_get_owner_item(sman, owner);