a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm: port over use_vmalloc code from git hashtab

Browse Source 
Signed-off-by: Dave Airlie <airlied@linux.ie>
This commit is contained in:
Dave Airlie 2007-02-18 17:14:09 +11:00
parent 11d9c2fd0a
commit cd839d0048
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/char/drm/drm_hashtab.c
View File

@ -43,7 +43,15 @@ int drm_ht_create(drm_open_hash_t *ht, unsigned int order)
ht->size = 1 << order; ht->size = 1 << order;
ht->order = order; ht->order = order;
ht->fill = 0; ht->fill = 0;
ht->table = vmalloc(ht->size*sizeof(*ht->table)); ht->use_vmalloc = ((ht->size * sizeof(*ht->table)) > PAGE_SIZE);
if (!ht->use_vmalloc) {
ht->table = drm_calloc(ht->size, sizeof(*ht->table),
DRM_MEM_HASHTAB);
}
if (!ht->table) {
ht->use_vmalloc = 1;
ht->table = vmalloc(ht->size*sizeof(*ht->table));
}
if (!ht->table) { if (!ht->table) {
DRM_ERROR("Out of memory for hash table\n"); DRM_ERROR("Out of memory for hash table\n");
return -ENOMEM; return -ENOMEM;
@ -183,7 +191,11 @@ int drm_ht_remove_item(drm_open_hash_t *ht, drm_hash_item_t *item)
void drm_ht_remove(drm_open_hash_t *ht) void drm_ht_remove(drm_open_hash_t *ht)
{ {
if (ht->table) { if (ht->table) {
vfree(ht->table); if (ht->use_vmalloc)
vfree(ht->table);
else
drm_free(ht->table, ht->size * sizeof(*ht->table),
DRM_MEM_HASHTAB);
ht->table = NULL; ht->table = NULL;
} }
} }

1
drivers/char/drm/drm_hashtab.h
View File

@ -47,6 +47,7 @@ typedef struct drm_open_hash{
unsigned int order; unsigned int order;
unsigned int fill; unsigned int fill;
struct hlist_head *table; struct hlist_head *table;
int use_vmalloc;
} drm_open_hash_t; } drm_open_hash_t;