---

yaml --- r: 318585 b: refs/heads/master c: 3af7b85 h: refs/heads/master i: 318583: 2a0f04b v: v3
git-mirror · Jun 14, 2012 · c2fc4db · c2fc4db
1 parent 4b7d37b
commit c2fc4db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e055684168af48ac7deb27d7267046a0fb9ef80e
+refs/heads/master: 3af7b8572f5e375421ba6128585972d4a42a0762
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_context.c b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
@@ -358,6 +358,9 @@ static int do_switch(struct drm_i915_gem_object *from_obj,
 	if (ret)
 		return ret;
 
+	if (!to->obj->has_global_gtt_mapping)
+		i915_gem_gtt_bind_object(to->obj, to->obj->cache_level);
+
 	if (!to->is_initialized || is_default_context(to))
 		hw_flags |= MI_RESTORE_INHIBIT;
 	else if (WARN_ON_ONCE(from_obj == to->obj)) /* not yet expected */