diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-09 23:08:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-10 16:46:21 +0000 |
| commit | b656000782d7c8a9e623707da77f8fc2f4681741 (patch) | |
| tree | 7dcae23b40eefd3d759d106e9aafa3a833a6ee6a /drivers/gpu/drm/i915/gt/intel_lrc.c | |
| parent | drm/i915/selftests: Disable capturing forced error states (diff) | |
| download | wireguard-linux-b656000782d7c8a9e623707da77f8fc2f4681741.tar.xz wireguard-linux-b656000782d7c8a9e623707da77f8fc2f4681741.zip | |
drm/i915/selftests: Drop live_preempt_hang
live_preempt_hang's use of hang injection has been superseded by
live_preempt_reset's use of an non-preemptible spinner. The latter does
not require intrusive hacks into the code.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200209230838.361154-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_lrc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 230470c58ec9..929be03bbe7e 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -2296,19 +2296,19 @@ static void process_csb(struct intel_engine_cs *engine) if (promote) { struct i915_request * const *old = execlists->active; + GEM_BUG_ON(!assert_pending_valid(execlists, "promote")); + + ring_set_paused(engine, 0); + /* Point active to the new ELSP; prevent overwriting */ WRITE_ONCE(execlists->active, execlists->pending); - if (!inject_preempt_hang(execlists)) - ring_set_paused(engine, 0); - /* cancel old inflight, prepare for switch */ trace_ports(execlists, "preempted", old); while (*old) execlists_schedule_out(*old++); /* switch pending to inflight */ - GEM_BUG_ON(!assert_pending_valid(execlists, "promote")); WRITE_ONCE(execlists->active, memcpy(execlists->inflight, execlists->pending, |