From 09191034477d7219b7806f72d868c45cff716610 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 30 Nov 2019 12:05:03 +0000
Subject: drm/i915/gt: Push the flush_pd before the set-context
Git-commit: f997056d5b17c6b0bdc250d509f384fbd7f8d33a
Patch-mainline: v5.6-rc1
References: jsc#SLE-12680, jsc#SLE-12880, jsc#SLE-12882, jsc#SLE-12883, jsc#SLE-13496, jsc#SLE-15322
Move our "wait for the PD load to complete" paranoia before the
MI_SET_CONTEXT just in case the context restore tries to access local
addresses.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191130120503.1609483-1-chris@chris-wilson.co.uk
Signed-off-by: Patrik Jakobsson <pjakobsson@suse.de>
---
drivers/gpu/drm/i915/gt/intel_ring_submission.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 44a85aecf5fc..6df5c809fbc9 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1604,12 +1604,10 @@ static int switch_context(struct i915_request *rq)
flags |= MI_RESTORE_INHIBIT;
ret = mi_set_context(rq, flags);
+
+ ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
if (ret)
return ret;
- }
-
- if (vm) {
- struct intel_engine_cs *engine = rq->engine;
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
if (ret)
@@ -1636,6 +1634,17 @@ static int switch_context(struct i915_request *rq)
return ret;
}
+ if (ce->state) {
+ GEM_BUG_ON(rq->engine->id != RCS0);
+
+ if (!rq->engine->default_state)
+ hw_flags = MI_RESTORE_INHIBIT;
+
+ ret = mi_set_context(rq, hw_flags);
+ if (ret)
+ return ret;
+ }
+
ret = remap_l3(rq);
if (ret)
return ret;
--
2.28.0