From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Date: Tue, 17 Mar 2015 15:36:51 +0000 (+0000)
Subject: drm/i915: Turn on PIN_GLOBAL in i915_gem_object_ggtt_pin
X-Git-Tag: v4.1-rc1~69^2~20^2~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fafab76d5189312bf45e71254b5aba5faf7a31b;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index cc8672a16da46..979dc42b72f04 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