Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd839d00 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: port over use_vmalloc code from git hashtab 



Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 11d9c2fd

drivers/char/drm/drm_hashtab.c

+14 −2
Original line number Diff line number Diff line
@@ -43,7 +43,15 @@ int drm_ht_create(drm_open_hash_t *ht, unsigned int order) 
	ht->size = 1 << order;

	ht->order = order;

	ht->fill = 0;

	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) {

		DRM_ERROR("Out of memory for hash table\n");

		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)

{

	if (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;

	}

}

drivers/char/drm/drm_hashtab.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ typedef struct drm_open_hash{ 
	unsigned int order;

	unsigned int fill;

	struct hlist_head *table;

	int use_vmalloc;

} drm_open_hash_t;