Commit fb8621d3 authored by Chris Wilson's avatar Chris Wilson

drm/i915: Avoid allocating a vmap arena for a single page

If we want a contiguous mapping of a single page sized object, we can
forgo using vmap() and just use a regular kmap(). Note that this is only
suitable if the desired pgprot_t is compatible.

v2: Use is_vmalloc_addr()
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1460113874-17366-7-git-send-email-chris@chris-wilson.co.ukReviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
parent f2a85e19
...@@ -2233,7 +2233,10 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj) ...@@ -2233,7 +2233,10 @@ i915_gem_object_put_pages(struct drm_i915_gem_object *obj)
list_del(&obj->global_list); list_del(&obj->global_list);
if (obj->mapping) { if (obj->mapping) {
if (is_vmalloc_addr(obj->mapping))
vunmap(obj->mapping); vunmap(obj->mapping);
else
kunmap(kmap_to_page(obj->mapping));
obj->mapping = NULL; obj->mapping = NULL;
} }
...@@ -2418,13 +2421,19 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj) ...@@ -2418,13 +2421,19 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj)
i915_gem_object_pin_pages(obj); i915_gem_object_pin_pages(obj);
if (obj->mapping == NULL) { if (obj->mapping == NULL) {
struct sg_page_iter sg_iter;
struct page **pages; struct page **pages;
int n;
n = obj->base.size >> PAGE_SHIFT; pages = NULL;
pages = drm_malloc_gfp(n, sizeof(*pages), GFP_TEMPORARY); if (obj->base.size == PAGE_SIZE)
obj->mapping = kmap(sg_page(obj->pages->sgl));
else
pages = drm_malloc_gfp(obj->base.size >> PAGE_SHIFT,
sizeof(*pages),
GFP_TEMPORARY);
if (pages != NULL) { if (pages != NULL) {
struct sg_page_iter sg_iter;
int n;
n = 0; n = 0;
for_each_sg_page(obj->pages->sgl, &sg_iter, for_each_sg_page(obj->pages->sgl, &sg_iter,
obj->pages->nents, 0) obj->pages->nents, 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment