diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-30 15:32:09 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-07-30 16:09:35 +0100 |
| commit | f5d974f9d2a811ef08c044b6fce95c94a6a6e19b (patch) | |
| tree | 5289e077941a50e78091917e692bfbfe15557674 /drivers/gpu/drm/i915/gt/intel_ringbuffer.c | |
| parent | c082afac86cb31e2a5843336e81a9b89e3b0d664 (diff) | |
| download | linux-stable-f5d974f9d2a811ef08c044b6fce95c94a6a6e19b.tar.gz linux-stable-f5d974f9d2a811ef08c044b6fce95c94a6a6e19b.tar.bz2 linux-stable-f5d974f9d2a811ef08c044b6fce95c94a6a6e19b.zip | |
drm/i915/gt: Provide a local intel_context.vm
Track the currently bound address space used by the HW context. Minor
conversions to use the local intel_context.vm are made, leaving behind
some more surgery required to make intel_context the primary through the
selftests.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190730143209.4549-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_ringbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 11afe64cc256..8d24a49e5139 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c @@ -1380,9 +1380,9 @@ static struct i915_address_space *vm_alias(struct intel_context *ce) { struct i915_address_space *vm; - vm = ce->gem_context->vm; - if (!vm) - vm = &ce->engine->gt->ggtt->alias->vm; + vm = ce->vm; + if (i915_is_ggtt(vm)) + vm = &i915_vm_to_ggtt(vm)->alias->vm; return vm; } |