diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-10-13 21:26:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-10-16 20:44:19 +0100 |
| commit | bd3d2252f94da51dda96a6e2ad6fdef5f2959811 (patch) | |
| tree | 9ec4d85231b23efa6caed4267a4c5addfdf13c9b /drivers/gpu/drm/i915/i915_gem_userptr.c | |
| parent | drm/i915: Refactor testing obj->mm.pages (diff) | |
| download | linux-dev-bd3d2252f94da51dda96a6e2ad6fdef5f2959811.tar.xz linux-dev-bd3d2252f94da51dda96a6e2ad6fdef5f2959811.zip | |
drm/i915: Rename obj->pin_display to obj->pin_global
In the next patch, we want to extend use of the global pin counter for
semi-permanent pinning of context/ring objects. Given that we plan to
extend the usage to encompass a disparate set of objects, we want a name
that reflects both and should entail less confusion.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171013202621.7276-2-chris@chris-wilson.co.uk
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_userptr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 9afeb68e2d44..cdc9be799eee 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -83,10 +83,10 @@ static void cancel_userptr(struct work_struct *work) if (i915_gem_object_unbind(obj) == 0) __i915_gem_object_put_pages(obj, I915_MM_NORMAL); WARN_ONCE(i915_gem_object_has_pages(obj), - "Failed to release pages: bind_count=%d, pages_pin_count=%d, pin_display=%d\n", + "Failed to release pages: bind_count=%d, pages_pin_count=%d, pin_global=%d\n", obj->bind_count, atomic_read(&obj->mm.pages_pin_count), - obj->pin_display); + obj->pin_global); mutex_unlock(&obj->base.dev->struct_mutex); |