@@ -2420,7 +2420,8 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj,
{
struct scatterlist *sg = obj->pages->sgl;
struct sg_page_iter sg_iter;
- struct page **pages;
+ struct page *stack_pages[32];
+ struct page **pages = stack_pages;
unsigned long first, npages, i;
int nents;
void *addr;
@@ -2436,10 +2437,13 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj,
first = start >> PAGE_SHIFT;
npages = DIV_ROUND_UP(start + nbytes, PAGE_SIZE) - first;
- pages = drm_malloc_gfp(npages, sizeof(*pages), GFP_TEMPORARY);
- if (pages == NULL) {
- DRM_DEBUG_DRIVER("Failed to get space for pages\n");
- return NULL;
+ if (npages > ARRAY_SIZE(stack_pages)) {
+ /* Too big for stack -- allocate temporary array instead */
+ pages = drm_malloc_gfp(npages, sizeof(*pages), GFP_TEMPORARY);
+ if (pages == NULL) {
+ DRM_DEBUG_DRIVER("Failed to get space for pages\n");
+ return NULL;
+ }
}
i = 0;
@@ -2453,7 +2457,8 @@ void *i915_gem_object_vmap_range(struct drm_i915_gem_object *obj,
addr = vmap(pages, npages, 0, PAGE_KERNEL);
if (addr == NULL)
DRM_DEBUG_DRIVER("Failed to vmap pages\n");
- drm_free_large(pages);
+ if (pages != stack_pages)
+ drm_free_large(pages);
return addr;
}
We're using this function for ringbuffers and other "small" objects, so it's worth avoiding an extra malloc()/free() cycle if the page array is small enough to put on the stack. Here we've chosen an arbitrary cutoff of 32 (4k) pages, which is big enough for a ringbuffer (4 pages) or a context image (currently up to 22 pages). v5: change name of local array [Chris Wilson] Signed-off-by: Dave Gordon <david.s.gordon@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Alex Dai <yu.dai@intel.com> --- drivers/gpu/drm/i915/i915_gem.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)