diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-23 11:31:10 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2006-08-23 11:31:10 +0200 |
| commit | 459b234d79daaa8a003da9ea48775a5587d5ba2a (patch) | |
| tree | 74138b86ed061bd561fb07c492bd7e6698e5573d /linux-core | |
| parent | 8dfe917cb26bbeddda0e1b52060d8dce188468f3 (diff) | |
Allow multiple addMaps with the same 32-bit map offset.
(Reported by Dave Airlie)
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_bufs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index 2eeb401d..13b0b174 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -78,14 +78,16 @@ int drm_map_handle(drm_device_t *dev, drm_hash_item_t *hash, #error Unsupported long size. Neither 64 nor 32 bits. #endif - if (use_hashed_handle) { - return drm_ht_just_insert_please(&dev->map_hash, hash, - user_token, 32 - PAGE_SHIFT - 3, - PAGE_SHIFT, DRM_MAP_HASH_OFFSET); - } else { + if (!use_hashed_handle) { + int ret; hash->key = user_token; - return drm_ht_insert_item(&dev->map_hash, hash); + ret = drm_ht_insert_item(&dev->map_hash, hash); + if (!ret) + return 0; } + return drm_ht_just_insert_please(&dev->map_hash, hash, + user_token, 32 - PAGE_SHIFT - 3, + PAGE_SHIFT, DRM_MAP_HASH_OFFSET); } /** |