Commit d6341100 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Turn vm off then on again for gen7 mm switch

"Have you tried switching it off and on again?"

Set the size of the mm to 0 to disable all PD cachelines, before
enabling the whole mm again. Let's see if that tricks the TLB into
reloading.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Acked-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191208143648.2986669-1-chris@chris-wilson.co.uk
parent ca5930b1
...@@ -1365,7 +1365,9 @@ static const struct intel_context_ops ring_context_ops = { ...@@ -1365,7 +1365,9 @@ static const struct intel_context_ops ring_context_ops = {
.destroy = ring_context_destroy, .destroy = ring_context_destroy,
}; };
static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt) static int load_pd_dir(struct i915_request *rq,
const struct i915_ppgtt *ppgtt,
u32 valid)
{ {
const struct intel_engine_cs * const engine = rq->engine; const struct intel_engine_cs * const engine = rq->engine;
u32 *cs; u32 *cs;
...@@ -1376,7 +1378,7 @@ static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt) ...@@ -1376,7 +1378,7 @@ static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt)
*cs++ = MI_LOAD_REGISTER_IMM(1); *cs++ = MI_LOAD_REGISTER_IMM(1);
*cs++ = i915_mmio_reg_offset(RING_PP_DIR_DCLV(engine->mmio_base)); *cs++ = i915_mmio_reg_offset(RING_PP_DIR_DCLV(engine->mmio_base));
*cs++ = PP_DIR_DCLV_2G; *cs++ = valid;
*cs++ = MI_STORE_REGISTER_MEM | MI_SRM_LRM_GLOBAL_GTT; *cs++ = MI_STORE_REGISTER_MEM | MI_SRM_LRM_GLOBAL_GTT;
*cs++ = i915_mmio_reg_offset(RING_PP_DIR_DCLV(engine->mmio_base)); *cs++ = i915_mmio_reg_offset(RING_PP_DIR_DCLV(engine->mmio_base));
...@@ -1395,7 +1397,7 @@ static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt) ...@@ -1395,7 +1397,7 @@ static int load_pd_dir(struct i915_request *rq, const struct i915_ppgtt *ppgtt)
intel_ring_advance(rq, cs); intel_ring_advance(rq, cs);
return 0; return rq->engine->emit_flush(rq, EMIT_FLUSH);
} }
static int flush_tlb(struct i915_request *rq) static int flush_tlb(struct i915_request *rq)
...@@ -1599,8 +1601,6 @@ static int switch_context(struct i915_request *rq) ...@@ -1599,8 +1601,6 @@ static int switch_context(struct i915_request *rq)
GEM_BUG_ON(HAS_EXECLISTS(rq->i915)); GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
if (vm) { if (vm) {
int loops = 4; /* 2 for Haswell? 4 for Baytrail! */
/* /*
* Not only do we need a full barrier (post-sync write) after * Not only do we need a full barrier (post-sync write) after
* invalidating the TLBs, but we need to wait a little bit * invalidating the TLBs, but we need to wait a little bit
...@@ -1617,17 +1617,15 @@ static int switch_context(struct i915_request *rq) ...@@ -1617,17 +1617,15 @@ static int switch_context(struct i915_request *rq)
if (ret) if (ret)
return ret; return ret;
do { ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm), 0);
ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
if (ret) if (ret)
return ret; return ret;
} while (--loops);
ret = flush_tlb(rq); ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm), PP_DIR_DCLV_2G);
if (ret) if (ret)
return ret; return ret;
ret = rq->engine->emit_flush(rq, EMIT_FLUSH); ret = flush_tlb(rq);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment