[PATCH 10/37] drm/i915/gem: Rename the list of relocations to reloc_list

Chris Wilson chris at chris-wilson.co.uk
Tue Aug 4 19:14:32 UTC 2020


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 at 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 79e96bb2ccab..b856b048756c 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -244,7 +244,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
@@ -566,7 +566,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
@@ -921,7 +921,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++) {
@@ -1581,7 +1581,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;
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list