summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_userptr.c
diff options
context:
space:
mode:
authorMatthew Auld2017-10-09 13:00:24 +0200
committerChris Wilson2017-10-09 18:07:29 +0200
commit84e8978e62fea661787a216e7fe9abac8f1e056e (patch)
tree4f62a5dc8622833977cd8079c9faf41b9f0179ab /drivers/gpu/drm/i915/i915_gem_userptr.c
parentdrm/i915: Early rejection of mappable GGTT pin attempts for large bo (diff)
downloadkernel-qcow2-linux-84e8978e62fea661787a216e7fe9abac8f1e056e.tar.gz
kernel-qcow2-linux-84e8978e62fea661787a216e7fe9abac8f1e056e.tar.xz
kernel-qcow2-linux-84e8978e62fea661787a216e7fe9abac8f1e056e.zip
drm/i915: s/sg_mask/sg_page_sizes/
It's a little unclear what the sg_mask actually is, so prefer the more meaningful name of sg_page_sizes. Suggested-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Link: https://patchwork.freedesktop.org/patch/msgid/20171009110024.29114-1-matthew.auld@intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_userptr.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_userptr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c
index 41e16e19c3f3..c36a84b070b6 100644
--- a/drivers/gpu/drm/i915/i915_gem_userptr.c
+++ b/drivers/gpu/drm/i915/i915_gem_userptr.c
@@ -405,7 +405,7 @@ __i915_gem_userptr_alloc_pages(struct drm_i915_gem_object *obj,
{
unsigned int max_segment = i915_sg_segment_size();
struct sg_table *st;
- unsigned int sg_mask;
+ unsigned int sg_page_sizes;
int ret;
st = kmalloc(sizeof(*st), GFP_KERNEL);
@@ -435,9 +435,9 @@ alloc_table:
return ERR_PTR(ret);
}
- sg_mask = i915_sg_page_sizes(st->sgl);
+ sg_page_sizes = i915_sg_page_sizes(st->sgl);
- __i915_gem_object_set_pages(obj, st, sg_mask);
+ __i915_gem_object_set_pages(obj, st, sg_page_sizes);
return st;
}