redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/i915/execlists: Always clear ring_pause if we do not submit 

In the unlikely case (thank you CI!), we may find ourselves wanting to
issue a preemption but having no runnable requests left. In this case,
we set the semaphore before computing the preemption and so must unset
it before forgetting (or else we leave the machine busywaiting until the
next request comes along and so likely hang).

v2: Replace readback with only a wmb after asserting the semaphore

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190624092009.30189-1-chris@chris-wilson.co.uk
alistair/sunxi64-5.4-dsi
Chris Wilson 2019-06-24 10:20:09 +01:00
parent b2dbf8d982
commit 8db7933ee3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/gt/intel_lrc.c
View File

@ -240,7 +240,8 @@ ring_set_paused(const struct intel_engine_cs *engine, int state)
* until the dword is false.
*/
engine->status_page.addr[I915_GEM_HWS_PREEMPT] = state;
wmb();
if (state)
wmb();
}
static inline struct i915_priolist *to_priolist(struct rb_node *rb)
@ -1243,6 +1244,8 @@ done:
*port = execlists_schedule_in(last, port - execlists->pending);
memset(port + 1, 0, (last_port - port) * sizeof(*port));
execlists_submit_ports(engine);
} else {
ring_set_paused(engine, 0);
}
}