diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-14 00:08:32 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-14 17:36:17 +0200 |
| commit | 3af7b8572f5e375421ba6128585972d4a42a0762 (patch) | |
| tree | a3707c5ff6ec3fcd568adc79c8edd91f3c7faae7 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | drm/i915: context switch implementation (diff) | |
| download | linux-dev-3af7b8572f5e375421ba6128585972d4a42a0762.tar.xz linux-dev-3af7b8572f5e375421ba6128585972d4a42a0762.zip | |
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, 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 */ |