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

Commit 78a121d8 authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs
Browse files

drm/nouveau/core: use vzalloc for allocating ramht 



Most calls to nvkm_ramht_new use 0x8000 as the size. This results in a
fairly sizeable chunk of memory to be allocated, which may not be
available with kzalloc. Since this is done fairly rarely (once per
channel), use vzalloc instead.

Signed-off-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2bf1833e

drivers/gpu/drm/nouveau/nvkm/core/ramht.c

+3 −3
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ nvkm_ramht_del(struct nvkm_ramht **pramht) 
	struct nvkm_ramht *ramht = *pramht;

	if (ramht) {

		nvkm_gpuobj_del(&ramht->gpuobj);

		kfree(*pramht);

		vfree(*pramht);

		*pramht = NULL;

	}

}
@@ -143,8 +143,8 @@ nvkm_ramht_new(struct nvkm_device *device, u32 size, u32 align, 
	struct nvkm_ramht *ramht;

	int ret, i;



	if (!(ramht = *pramht = kzalloc(sizeof(*ramht) + (size >> 3) *

					sizeof(*ramht->data), GFP_KERNEL)))

	if (!(ramht = *pramht = vzalloc(sizeof(*ramht) +

					(size >> 3) * sizeof(*ramht->data))))

		return -ENOMEM;



	ramht->device = device;