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

Commit f2a85e19 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm,i915: Introduce drm_malloc_gfp() 



I have instances where I want to use drm_malloc_ab() but with a custom
gfp mask. And with those, where I want a temporary allocation, I want to
try a high-order kmalloc() before using a vmalloc().

So refactor my usage into drm_malloc_gfp().

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: dri-devel@lists.freedesktop.org
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarDave Airlie <airlied@redhat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460113874-17366-6-git-send-email-chris@chris-wilson.co.uk
parent eae2c43b

drivers/gpu/drm/i915/i915_gem.c

+1 −3
Original line number Diff line number Diff line
@@ -2423,9 +2423,7 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj) 
		int n;



		n = obj->base.size >> PAGE_SHIFT;

		pages = kmalloc(n*sizeof(*pages), GFP_TEMPORARY | __GFP_NOWARN);

		if (pages == NULL)

			pages = drm_malloc_ab(n, sizeof(*pages));

		pages = drm_malloc_gfp(n, sizeof(*pages), GFP_TEMPORARY);

		if (pages != NULL) {

			n = 0;

			for_each_sg_page(obj->pages->sgl, &sg_iter,

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −5
Original line number Diff line number Diff line
@@ -1783,11 +1783,9 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	exec2_list = kmalloc(sizeof(*exec2_list)*args->buffer_count,

			     GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);

	if (exec2_list == NULL)

		exec2_list = drm_malloc_ab(sizeof(*exec2_list),

					   args->buffer_count);

	exec2_list = drm_malloc_gfp(args->buffer_count,

				    sizeof(*exec2_list),

				    GFP_TEMPORARY);

	if (exec2_list == NULL) {

		DRM_DEBUG("Failed to allocate exec list for %d buffers\n",

			  args->buffer_count);

drivers/gpu/drm/i915/i915_gem_gtt.c

+3 −2
Original line number Diff line number Diff line
@@ -3401,8 +3401,9 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, 
	int ret = -ENOMEM;



	/* Allocate a temporary list of source pages for random access. */

	page_addr_list = drm_malloc_ab(obj->base.size / PAGE_SIZE,

				       sizeof(dma_addr_t));

	page_addr_list = drm_malloc_gfp(obj->base.size / PAGE_SIZE,

					sizeof(dma_addr_t),

					GFP_TEMPORARY);

	if (!page_addr_list)

		return ERR_PTR(ret);

drivers/gpu/drm/i915/i915_gem_userptr.c

+5 −11
Original line number Diff line number Diff line
@@ -494,10 +494,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) 
	ret = -ENOMEM;

	pinned = 0;



	pvec = kmalloc(npages*sizeof(struct page *),

		       GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);

	if (pvec == NULL)

		pvec = drm_malloc_ab(npages, sizeof(struct page *));

	pvec = drm_malloc_gfp(npages, sizeof(struct page *), GFP_TEMPORARY);

	if (pvec != NULL) {

		struct mm_struct *mm = obj->userptr.mm->mm;
@@ -634,15 +631,12 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) 
	pvec = NULL;

	pinned = 0;

	if (obj->userptr.mm->mm == current->mm) {

		pvec = kmalloc(num_pages*sizeof(struct page *),

			       GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY);

		if (pvec == NULL) {

			pvec = drm_malloc_ab(num_pages, sizeof(struct page *));

		pvec = drm_malloc_gfp(num_pages, sizeof(struct page *),

				      GFP_TEMPORARY);

		if (pvec == NULL) {

			__i915_gem_userptr_set_active(obj, false);

			return -ENOMEM;

		}

		}



		pinned = __get_user_pages_fast(obj->userptr.ptr, num_pages,

					       !obj->userptr.read_only, pvec);

include/drm/drm_mem_util.h

+19 −0
Original line number Diff line number Diff line
@@ -54,6 +54,25 @@ static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size) 
			 GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL);

}



static __inline__ void *drm_malloc_gfp(size_t nmemb, size_t size, gfp_t gfp)

{

	if (size != 0 && nmemb > SIZE_MAX / size)

		return NULL;



	if (size * nmemb <= PAGE_SIZE)

		return kmalloc(nmemb * size, gfp);



	if (gfp & __GFP_RECLAIMABLE) {

		void *ptr = kmalloc(nmemb * size,

				    gfp | __GFP_NOWARN | __GFP_NORETRY);

		if (ptr)

			return ptr;

	}



	return __vmalloc(size * nmemb,

			 gfp | __GFP_HIGHMEM, PAGE_KERNEL);

}



static __inline void drm_free_large(void *ptr)

{

	kvfree(ptr);