Message ID | 20200805122231.23313-11-chris@chris-wilson.co.uk (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Replace obj->mm.lock with reservation_ww_class | expand |
On 05/08/2020 13:22, Chris Wilson wrote: > Continuing the theme of calling the lists a foo_list, rename the relocs > list. This means that we can now use relocs for the old reloc_cache that > is not a cache anymore. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index a5b63ae17241..e7e16c62df1c 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -252,7 +252,7 @@ struct i915_execbuffer { > struct list_head unbound; > > /** list of vma that have execobj.relocation_count */ > - struct list_head relocs; > + struct list_head relocs_list; > > /** > * Track the most recently used object for relocations, as we > @@ -577,7 +577,7 @@ eb_add_vma(struct i915_execbuffer *eb, > } > > if (entry->relocation_count) > - list_add_tail(&ev->reloc_link, &eb->relocs); > + list_add_tail(&ev->reloc_link, &eb->relocs_list); > > /* > * SNA is doing fancy tricks with compressing batch buffers, which leads > @@ -932,7 +932,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) > unsigned int i; > int err = 0; > > - INIT_LIST_HEAD(&eb->relocs); > + INIT_LIST_HEAD(&eb->relocs_list); > INIT_LIST_HEAD(&eb->unbound); > > for (i = 0; i < eb->buffer_count; i++) { > @@ -1592,7 +1592,7 @@ static int eb_relocate(struct i915_execbuffer *eb) > struct eb_vma *ev; > int flush; > > - list_for_each_entry(ev, &eb->relocs, reloc_link) { > + list_for_each_entry(ev, &eb->relocs_list, reloc_link) { > err = eb_relocate_vma(eb, ev); > if (err) > break; > 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 a5b63ae17241..e7e16c62df1c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -252,7 +252,7 @@ struct i915_execbuffer { struct list_head unbound; /** list of vma that have execobj.relocation_count */ - struct list_head relocs; + struct list_head relocs_list; /** * Track the most recently used object for relocations, as we @@ -577,7 +577,7 @@ eb_add_vma(struct i915_execbuffer *eb, } if (entry->relocation_count) - list_add_tail(&ev->reloc_link, &eb->relocs); + list_add_tail(&ev->reloc_link, &eb->relocs_list); /* * SNA is doing fancy tricks with compressing batch buffers, which leads @@ -932,7 +932,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) unsigned int i; int err = 0; - INIT_LIST_HEAD(&eb->relocs); + INIT_LIST_HEAD(&eb->relocs_list); INIT_LIST_HEAD(&eb->unbound); for (i = 0; i < eb->buffer_count; i++) { @@ -1592,7 +1592,7 @@ static int eb_relocate(struct i915_execbuffer *eb) struct eb_vma *ev; int flush; - list_for_each_entry(ev, &eb->relocs, reloc_link) { + list_for_each_entry(ev, &eb->relocs_list, reloc_link) { err = eb_relocate_vma(eb, ev); if (err) break;
Continuing the theme of calling the lists a foo_list, rename the relocs list. This means that we can now use relocs for the old reloc_cache that is not a cache anymore. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)