[Intel-gfx] [PATCH 05/25] drm/i915: always bind context objects immediately

[Ben Widawsky]

Context objects must be bound into the global gtt. So we can't get all
fancy with ppgtt.

Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
---
 drivers/gpu/drm/i915/i915_gem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 2142e9c..044dc65 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2720,7 +2720,7 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_object *obj,
 		goto search_free;
 	}
 
-	if (!dev_priv->mm.aliasing_ppgtt)
+	if (!dev_priv->mm.aliasing_ppgtt || obj->context_id >= 0)
 		i915_gem_gtt_bind_object(obj, obj->cache_level);
 
 	list_add_tail(&obj->gtt_list, &dev_priv->mm.gtt_list);
-- 
1.7.10.2