drm/i915: Rename fence.lru_list to link

Our current practice is to only name the actual list (here
dev_priv->fence_list) using "list", and elements upon that list are
referred to as "link". Further, the lru nature is of the list and not of
the node and including in the name does not disambiguate the link from
anything else.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20160818161718.27187-20-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b3623945b5557a23609806d17c1cc0b4a7220488..67ece6db60d981f97835ace8077c44eceeb286d4 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -461,7 +461,7 @@ struct intel_overlay_error_state;
 #define I915_MAX_NUM_FENCE_BITS 6
 
 struct drm_i915_fence_reg {
-       struct list_head lru_list;
+       struct list_head link;
        struct drm_i915_gem_object *obj;
        int pin_count;
 };

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1f6312ca646c3aa73eedcf03d5448a45fea942f0..dd68f0c15801c62e930ad74e242eb4d1cb76775d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -4553,7 +4553,7 @@ i915_gem_load_init(struct drm_device *dev)
        for (i = 0; i < I915_NUM_ENGINES; i++)
                init_engine_lists(&dev_priv->engine[i]);
        for (i = 0; i < I915_MAX_NUM_FENCES; i++)
-               INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list);
+               INIT_LIST_HEAD(&dev_priv->fence_regs[i].link);
        INIT_DELAYED_WORK(&dev_priv->gt.retire_work,
                          i915_gem_retire_work_handler);
        INIT_DELAYED_WORK(&dev_priv->gt.idle_work,

diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 28888d6089141bca487de26c8f12313ed9cb7deb..58cebafa83486fb29ebd67b706845390c4f9b72c 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -1310,7 +1310,7 @@ void i915_vma_move_to_active(struct i915_vma *vma,
                if (flags & __EXEC_OBJECT_HAS_FENCE) {
                        struct drm_i915_private *dev_priv = req->i915;
 
-                       list_move_tail(&dev_priv->fence_regs[obj->fence_reg].lru_list,
+                       list_move_tail(&dev_priv->fence_regs[obj->fence_reg].link,
                                       &dev_priv->mm.fence_list);
                }
        }

diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
index e15365be404566e70c254dd69d89968fc9f7b0b3..1b32351aee42ae75122b581a58053b4519c8aee8 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_fence.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -245,11 +245,11 @@ static void i915_gem_object_update_fence(struct drm_i915_gem_object *obj,
        if (enable) {
                obj->fence_reg = reg;
                fence->obj = obj;
-               list_move_tail(&fence->lru_list, &dev_priv->mm.fence_list);
+               list_move_tail(&fence->link, &dev_priv->mm.fence_list);
        } else {
                obj->fence_reg = I915_FENCE_REG_NONE;
                fence->obj = NULL;
-               list_del_init(&fence->lru_list);
+               list_del_init(&fence->link);
        }
        obj->fence_dirty = false;
 }
@@ -331,7 +331,7 @@ i915_find_fence_reg(struct drm_device *dev)
                goto deadlock;
 
        /* None available, try to steal one or wait for a user to finish */
-       list_for_each_entry(reg, &dev_priv->mm.fence_list, lru_list) {
+       list_for_each_entry(reg, &dev_priv->mm.fence_list, link) {
                if (reg->pin_count)
                        continue;
 
@@ -386,8 +386,7 @@ i915_gem_object_get_fence(struct drm_i915_gem_object *obj)
        if (obj->fence_reg != I915_FENCE_REG_NONE) {
                reg = &dev_priv->fence_regs[obj->fence_reg];
                if (!obj->fence_dirty) {
-                       list_move_tail(&reg->lru_list,
-                                      &dev_priv->mm.fence_list);
+                       list_move_tail(&reg->link, &dev_priv->mm.fence_list);
                        return 0;
                }
        } else if (enable) {