mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915: Serialize insertion into the file->mm.request_list

Browse source 
Currently, we remove the from per-file request list for throttling and
retirement under a dedicated spinlock, but insertion is governed by
struct_mutex. This needs to be the same lock so that the
retirement/insertion of neighbouring requests (at the tail) doesn't
break the list.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820080907.4665-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-08-20 09:09:07 +01:00
parent 149d6deb88
commit 44c22f3f1a
2 changed files with 10 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View file

@ -2005,8 +2005,13 @@ static struct i915_vma *eb_parse(struct i915_execbuffer *eb, bool is_master)
static void static void
add_to_client(struct i915_request *rq, struct drm_file *file) add_to_client(struct i915_request *rq, struct drm_file *file)
{ {
rq->file_priv = file->driver_priv; struct drm_i915_file_private *file_priv = file->driver_priv;
list_add_tail(&rq->client_link, &rq->file_priv->mm.request_list);
rq->file_priv = file_priv;
spin_lock(&file_priv->mm.lock);
list_add_tail(&rq->client_link, &file_priv->mm.request_list);
spin_unlock(&file_priv->mm.lock);
} }
static int eb_submit(struct i915_execbuffer *eb) static int eb_submit(struct i915_execbuffer *eb)

6
drivers/gpu/drm/i915/i915_request.c
View file

@ -165,11 +165,11 @@ static void __notify_execute_cb(struct i915_request *rq)
} }
static inline void static inline void
i915_request_remove_from_client(struct i915_request *request) remove_from_client(struct i915_request *request)
{ {
struct drm_i915_file_private *file_priv; struct drm_i915_file_private *file_priv;
file_priv = request->file_priv; file_priv = READ_ONCE(request->file_priv);
if (!file_priv) if (!file_priv)
return; return;
@ -282,7 +282,7 @@ static bool i915_request_retire(struct i915_request *rq)
local_irq_enable(); local_irq_enable();
i915_request_remove_from_client(rq); remove_from_client(rq);
list_del(&rq->link); list_del(&rq->link);
intel_context_exit(rq->hw_context); intel_context_exit(rq->hw_context);