Commit 2098105e authored by Michal Hocko's avatar Michal Hocko Committed by Daniel Vetter
Browse files

drm: drop drm_[cm]alloc* helpers 



Now that drm_[cm]alloc* helpers are simple one line wrappers around
kvmalloc_array and drm_free_large is just kvfree alias we can drop
them and replace by their native forms.

This shouldn't introduce any functional change.

Changes since v1
- fix typo in drivers/gpu//drm/etnaviv/etnaviv_gem.c - noticed by 0day
  build robot

Suggested-by: default avatarDaniel Vetter <daniel@ffwll.ch>
Signed-off-by: Michal Hocko <mhocko@suse.com>drm: drop drm_[cm]alloc* helpers
[danvet: Fixup vgem which grew another user very recently.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517122312.GK18247@dhcp22.suse.cz
parent c4f51dc8

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c

+8 −8
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
	int r;

	unsigned long total_size = 0;



	array = drm_malloc_ab(num_entries, sizeof(struct amdgpu_bo_list_entry));

	array = kvmalloc_array(num_entries, sizeof(struct amdgpu_bo_list_entry), GFP_KERNEL);

	if (!array)

		return -ENOMEM;

	memset(array, 0, num_entries * sizeof(struct amdgpu_bo_list_entry));
@@ -148,7 +148,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
	for (i = 0; i < list->num_entries; ++i)

		amdgpu_bo_unref(&list->array[i].robj);



	drm_free_large(list->array);

	kvfree(list->array);



	list->gds_obj = gds_obj;

	list->gws_obj = gws_obj;
@@ -163,7 +163,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, 
error_free:

	while (i--)

		amdgpu_bo_unref(&array[i].robj);

	drm_free_large(array);

	kvfree(array);

	return r;

}
@@ -224,7 +224,7 @@ void amdgpu_bo_list_free(struct amdgpu_bo_list *list) 
		amdgpu_bo_unref(&list->array[i].robj);



	mutex_destroy(&list->lock);

	drm_free_large(list->array);

	kvfree(list->array);

	kfree(list);

}
@@ -244,8 +244,8 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data, 


	int r;



	info = drm_malloc_ab(args->in.bo_number,

			     sizeof(struct drm_amdgpu_bo_list_entry));

	info = kvmalloc_array(args->in.bo_number,

			     sizeof(struct drm_amdgpu_bo_list_entry), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -311,11 +311,11 @@ int amdgpu_bo_list_ioctl(struct drm_device *dev, void *data, 


	memset(args, 0, sizeof(*args));

	args->out.list_handle = handle;

	drm_free_large(info);

	kvfree(info);



	return 0;



error_free:

	drm_free_large(info);

	kvfree(info);

	return r;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+10 −9
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ int amdgpu_cs_parser_init(struct amdgpu_cs_parser *p, void *data) 
		size = p->chunks[i].length_dw;

		cdata = (void __user *)(uintptr_t)user_chunk.chunk_data;



		p->chunks[i].kdata = drm_malloc_ab(size, sizeof(uint32_t));

		p->chunks[i].kdata = kvmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);

		if (p->chunks[i].kdata == NULL) {

			ret = -ENOMEM;

			i--;
@@ -247,7 +247,7 @@ free_all_kdata: 
	i = p->nchunks - 1;

free_partial_kdata:

	for (; i >= 0; i--)

		drm_free_large(p->chunks[i].kdata);

		kvfree(p->chunks[i].kdata);

	kfree(p->chunks);

	p->chunks = NULL;

	p->nchunks = 0;
@@ -505,7 +505,7 @@ static int amdgpu_cs_list_validate(struct amdgpu_cs_parser *p, 
			return r;



		if (binding_userptr) {

			drm_free_large(lobj->user_pages);

			kvfree(lobj->user_pages);

			lobj->user_pages = NULL;

		}

	}
@@ -571,7 +571,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
				release_pages(e->user_pages,

					      e->robj->tbo.ttm->num_pages,

					      false);

				drm_free_large(e->user_pages);

				kvfree(e->user_pages);

				e->user_pages = NULL;

			}
@@ -601,8 +601,9 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		list_for_each_entry(e, &need_pages, tv.head) {

			struct ttm_tt *ttm = e->robj->tbo.ttm;



			e->user_pages = drm_calloc_large(ttm->num_pages,

							 sizeof(struct page*));

			e->user_pages = kvmalloc_array(ttm->num_pages,

							 sizeof(struct page*),

							 GFP_KERNEL | __GFP_ZERO);

			if (!e->user_pages) {

				r = -ENOMEM;

				DRM_ERROR("calloc failure in %s\n", __func__);
@@ -612,7 +613,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
			r = amdgpu_ttm_tt_get_user_pages(ttm, e->user_pages);

			if (r) {

				DRM_ERROR("amdgpu_ttm_tt_get_user_pages failed.\n");

				drm_free_large(e->user_pages);

				kvfree(e->user_pages);

				e->user_pages = NULL;

				goto error_free_pages;

			}
@@ -708,7 +709,7 @@ error_free_pages: 
			release_pages(e->user_pages,

				      e->robj->tbo.ttm->num_pages,

				      false);

			drm_free_large(e->user_pages);

			kvfree(e->user_pages);

		}

	}
@@ -761,7 +762,7 @@ static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bo 
		amdgpu_bo_list_put(parser->bo_list);



	for (i = 0; i < parser->nchunks; i++)

		drm_free_large(parser->chunks[i].kdata);

		kvfree(parser->chunks[i].kdata);

	kfree(parser->chunks);

	if (parser->job)

		amdgpu_job_free(parser->job);

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+4 −3
Original line number Diff line number Diff line
@@ -279,8 +279,9 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev, 
	if (!parent->entries) {

		unsigned num_entries = amdgpu_vm_num_entries(adev, level);



		parent->entries = drm_calloc_large(num_entries,

						   sizeof(struct amdgpu_vm_pt));

		parent->entries = kvmalloc_array(num_entries,

						   sizeof(struct amdgpu_vm_pt),

						   GFP_KERNEL | __GFP_ZERO);

		if (!parent->entries)

			return -ENOMEM;

		memset(parent->entries, 0 , sizeof(struct amdgpu_vm_pt));
@@ -2198,7 +2199,7 @@ static void amdgpu_vm_free_levels(struct amdgpu_vm_pt *level) 
		for (i = 0; i <= level->last_entry_used; i++)

			amdgpu_vm_free_levels(&level->entries[i]);



	drm_free_large(level->entries);

	kvfree(level->entries);

}



/**

drivers/gpu/drm/drm_gem.c

+3 −3
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ struct page **drm_gem_get_pages(struct drm_gem_object *obj) 


	npages = obj->size >> PAGE_SHIFT;



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

	pages = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);

	if (pages == NULL)

		return ERR_PTR(-ENOMEM);
@@ -546,7 +546,7 @@ fail: 
	while (i--)

		put_page(pages[i]);



	drm_free_large(pages);

	kvfree(pages);

	return ERR_CAST(p);

}

EXPORT_SYMBOL(drm_gem_get_pages);
@@ -582,7 +582,7 @@ void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages, 
		put_page(pages[i]);

	}



	drm_free_large(pages);

	kvfree(pages);

}

EXPORT_SYMBOL(drm_gem_put_pages);

drivers/gpu/drm/etnaviv/etnaviv_gem.c

+6 −6
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages( 
	uintptr_t ptr;

	unsigned int flags = 0;



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

	pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);

	if (!pvec)

		return ERR_PTR(-ENOMEM);
@@ -772,7 +772,7 @@ static struct page **etnaviv_gem_userptr_do_get_pages( 


	if (ret < 0) {

		release_pages(pvec, pinned, 0);

		drm_free_large(pvec);

		kvfree(pvec);

		return ERR_PTR(ret);

	}
@@ -823,7 +823,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) 
	mm = get_task_mm(etnaviv_obj->userptr.task);

	pinned = 0;

	if (mm == current->mm) {

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

		pvec = kvmalloc_array(npages, sizeof(struct page *), GFP_KERNEL);

		if (!pvec) {

			mmput(mm);

			return -ENOMEM;
@@ -832,7 +832,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) 
		pinned = __get_user_pages_fast(etnaviv_obj->userptr.ptr, npages,

					       !etnaviv_obj->userptr.ro, pvec);

		if (pinned < 0) {

			drm_free_large(pvec);

			kvfree(pvec);

			mmput(mm);

			return pinned;

		}
@@ -845,7 +845,7 @@ static int etnaviv_gem_userptr_get_pages(struct etnaviv_gem_object *etnaviv_obj) 
	}



	release_pages(pvec, pinned, 0);

	drm_free_large(pvec);

	kvfree(pvec);



	work = kmalloc(sizeof(*work), GFP_KERNEL);

	if (!work) {
@@ -879,7 +879,7 @@ static void etnaviv_gem_userptr_release(struct etnaviv_gem_object *etnaviv_obj) 
		int npages = etnaviv_obj->base.size >> PAGE_SHIFT;



		release_pages(etnaviv_obj->pages, npages, 0);

		drm_free_large(etnaviv_obj->pages);

		kvfree(etnaviv_obj->pages);

	}

	put_task_struct(etnaviv_obj->userptr.task);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE