diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-10-02 13:49:43 +0200 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-10-02 13:49:43 +0200 |
commit | d85b99435f0ea7a17b3b7be31b53c00632c07177 (patch) | |
tree | e0c3418b1ccaba4766dbb26ab5b61bfcf8596536 /linux-core/drm_ttm.c | |
parent | 418b81c65c55601d4e414b351db5b8d76db8a109 (diff) |
Allow for 44 bit user-tokens (or drm_file offsets)
Diffstat (limited to 'linux-core/drm_ttm.c')
-rw-r--r-- | linux-core/drm_ttm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index 6790c886..5fbe283e 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -903,13 +903,13 @@ int drm_ttm_object_create(drm_device_t * dev, unsigned long size, if (drm_ht_just_insert_please(&dev->map_hash, &list->hash, (unsigned long)map->handle, - 32 - PAGE_SHIFT - 3, PAGE_SHIFT, - DRM_MAP_HASH_OFFSET)) { + 32 - PAGE_SHIFT - 3, 0, + DRM_MAP_HASH_OFFSET >> PAGE_SHIFT)) { drm_ttm_object_remove(dev, object); return -ENOMEM; } - list->user_token = list->hash.key; + list->user_token = list->hash.key << PAGE_SHIFT; atomic_set(&object->usage, 1); *ttm_object = object; |