Skip to content

Commit

Permalink
drm/i915: ensure context objects are bound to the global gtt
Browse files Browse the repository at this point in the history
This way round we don't introduce and ugly layering violations and use
the interface as I planned to use it.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Jun 14, 2012
1 parent e055684 commit 3af7b85
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/i915_gem_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 3af7b85

Please sign in to comment.