summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorTvrtko Ursulin2015-03-17 16:36:51 +0100
committerDaniel Vetter2015-03-20 11:48:12 +0100
commit6fafab76d5189312bf45e71254b5aba5faf7a31b (patch)
tree0f4eb0f8fa0002e5dc4273609d0457a35b59b6d4 /drivers/gpu/drm/i915
parentdrm/i915: memory leak in __i915_gem_vma_create() (diff)
downloadkernel-qcow2-linux-6fafab76d5189312bf45e71254b5aba5faf7a31b.tar.gz
kernel-qcow2-linux-6fafab76d5189312bf45e71254b5aba5faf7a31b.tar.xz
kernel-qcow2-linux-6fafab76d5189312bf45e71254b5aba5faf7a31b.zip
drm/i915: Turn on PIN_GLOBAL in i915_gem_object_ggtt_pin
This makes the interface consistent to old i915_gem_obj_ggtt_pin. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cc8672a16da4..979dc42b72f0 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4292,7 +4292,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
return -EINVAL;
return i915_gem_object_do_pin(obj, i915_obj_to_ggtt(obj), view,
- alignment, flags);
+ alignment, flags | PIN_GLOBAL);
}
void