geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm into drm-ttm-0-2-branch

main
Thomas Hellstrom 2006-08-23 13:31:45 +02:00
parent e201511a0f 459b234d79
commit 8fa43d4b2f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linux-core/drm_bufs.c
View File

@ -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);
}
/**

6
linux-core/drm_hashtab.c
View File

@ -115,7 +115,7 @@ int drm_ht_insert_item(drm_open_hash_t *ht, drm_hash_item_t *item)
hlist_for_each(list, h_list) {
entry = hlist_entry(list, drm_hash_item_t, head);
if (entry->key == key)
return -1;
return -EINVAL;
if (entry->key > key)
break;
parent = list;
@ -163,7 +163,7 @@ int drm_ht_find_item(drm_open_hash_t *ht, unsigned long key,
list = drm_ht_find_key(ht, key);
if (!list)
return -1;
return -EINVAL;
*item = hlist_entry(list, drm_hash_item_t, head);
return 0;
@ -179,7 +179,7 @@ int drm_ht_remove_key(drm_open_hash_t *ht, unsigned long key)
ht->fill--;
return 0;
}
return -1;
return -EINVAL;
}
int drm_ht_remove_item(drm_open_hash_t *ht, drm_hash_item_t *item)