diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-13 18:08:32 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-14 11:36:17 -0400 |
commit | 3af7b8572f5e375421ba6128585972d4a42a0762 (patch) | |
tree | a3707c5ff6ec3fcd568adc79c8edd91f3c7faae7 /drivers/gpu/drm/i915/i915_gem_context.c | |
parent | e055684168af48ac7deb27d7267046a0fb9ef80e (diff) |
drm/i915: ensure context objects are bound to the global gtt
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>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_context.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 5248c00707f6..fb6aa5e10991 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c | |||
@@ -358,6 +358,9 @@ static int do_switch(struct drm_i915_gem_object *from_obj, | |||
358 | if (ret) | 358 | if (ret) |
359 | return ret; | 359 | return ret; |
360 | 360 | ||
361 | if (!to->obj->has_global_gtt_mapping) | ||
362 | i915_gem_gtt_bind_object(to->obj, to->obj->cache_level); | ||
363 | |||
361 | if (!to->is_initialized || is_default_context(to)) | 364 | if (!to->is_initialized || is_default_context(to)) |
362 | hw_flags |= MI_RESTORE_INHIBIT; | 365 | hw_flags |= MI_RESTORE_INHIBIT; |
363 | else if (WARN_ON_ONCE(from_obj == to->obj)) /* not yet expected */ | 366 | else if (WARN_ON_ONCE(from_obj == to->obj)) /* not yet expected */ |