UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915/gt: Push the flush_pd before the set-context 

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
This commit is contained in:
Chris Wilson 2019-11-30 12:05:03 +00:00
parent 3cd6e8860e
commit f997056d5b
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/i915/gt/intel_ring_submission.c
View File

@ -1591,24 +1591,11 @@ static int switch_context(struct i915_request *rq)
GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
if (vm) {
struct intel_engine_cs *engine = rq->engine;
ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
if (ret)
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;
}
if (vm) {
struct intel_engine_cs *engine = rq->engine;
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
if (ret)
@ -1635,6 +1622,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;