| Message ID | 20200706061926.6687-5-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/20] drm/i915: Preallocate stashes for vma page-directories | expand |
On 06/07/2020 07:19, Chris Wilson wrote: > Rename the current list of unbound objects so that we can track of all > objects that we need to bind, as well as the list of currently unbound > [unprocessed] objects. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index e4d06db3f313..bf8193d9e279 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -33,7 +33,7 @@ struct eb_vma { > > /** This vma's place in the execbuf reservation list */ > struct drm_i915_gem_exec_object2 *exec; > - struct list_head bind_link; > + struct list_head unbound_link; > struct list_head reloc_link; > > struct hlist_node node; > @@ -594,7 +594,7 @@ eb_add_vma(struct i915_execbuffer *eb, > } > } else { > eb_unreserve_vma(ev); > - list_add_tail(&ev->bind_link, &eb->unbound); > + list_add_tail(&ev->unbound_link, &eb->unbound); > } > } > > @@ -699,7 +699,7 @@ static int eb_reserve(struct i915_execbuffer *eb) > if (mutex_lock_interruptible(&eb->i915->drm.struct_mutex)) > return -EINTR; > > - list_for_each_entry(ev, &eb->unbound, bind_link) { > + list_for_each_entry(ev, &eb->unbound, unbound_link) { > err = eb_reserve_vma(eb, ev, pin_flags); > if (err) > break; > @@ -725,15 +725,15 @@ static int eb_reserve(struct i915_execbuffer *eb) > > if (flags & EXEC_OBJECT_PINNED) > /* Pinned must have their slot */ > - list_add(&ev->bind_link, &eb->unbound); > + list_add(&ev->unbound_link, &eb->unbound); > else if (flags & __EXEC_OBJECT_NEEDS_MAP) > /* Map require the lowest 256MiB (aperture) */ > - list_add_tail(&ev->bind_link, &eb->unbound); > + list_add_tail(&ev->unbound_link, &eb->unbound); > else if (!(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS)) > /* Prioritise 4GiB region for restricted bo */ > - list_add(&ev->bind_link, &last); > + list_add(&ev->unbound_link, &last); > else > - list_add_tail(&ev->bind_link, &last); > + list_add_tail(&ev->unbound_link, &last); > } > list_splice_tail(&last, &eb->unbound); > mutex_unlock(&eb->i915->drm.struct_mutex); > Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index e4d06db3f313..bf8193d9e279 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -33,7 +33,7 @@ struct eb_vma { /** This vma's place in the execbuf reservation list */ struct drm_i915_gem_exec_object2 *exec; - struct list_head bind_link; + struct list_head unbound_link; struct list_head reloc_link; struct hlist_node node; @@ -594,7 +594,7 @@ eb_add_vma(struct i915_execbuffer *eb, } } else { eb_unreserve_vma(ev); - list_add_tail(&ev->bind_link, &eb->unbound); + list_add_tail(&ev->unbound_link, &eb->unbound); } } @@ -699,7 +699,7 @@ static int eb_reserve(struct i915_execbuffer *eb) if (mutex_lock_interruptible(&eb->i915->drm.struct_mutex)) return -EINTR; - list_for_each_entry(ev, &eb->unbound, bind_link) { + list_for_each_entry(ev, &eb->unbound, unbound_link) { err = eb_reserve_vma(eb, ev, pin_flags); if (err) break; @@ -725,15 +725,15 @@ static int eb_reserve(struct i915_execbuffer *eb) if (flags & EXEC_OBJECT_PINNED) /* Pinned must have their slot */ - list_add(&ev->bind_link, &eb->unbound); + list_add(&ev->unbound_link, &eb->unbound); else if (flags & __EXEC_OBJECT_NEEDS_MAP) /* Map require the lowest 256MiB (aperture) */ - list_add_tail(&ev->bind_link, &eb->unbound); + list_add_tail(&ev->unbound_link, &eb->unbound); else if (!(flags & EXEC_OBJECT_SUPPORTS_48B_ADDRESS)) /* Prioritise 4GiB region for restricted bo */ - list_add(&ev->bind_link, &last); + list_add(&ev->unbound_link, &last); else - list_add_tail(&ev->bind_link, &last); + list_add_tail(&ev->unbound_link, &last); } list_splice_tail(&last, &eb->unbound); mutex_unlock(&eb->i915->drm.struct_mutex);
Rename the current list of unbound objects so that we can track of all objects that we need to bind, as well as the list of currently unbound [unprocessed] objects. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)