drm/i915: Rename ring->virtual_start as ring->vaddr

Just a different colour to better match virtual addresses elsewhere.

s/ring->virtual_start/ring->vaddr/

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469005202-9659-9-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1469017917-15134-8-git-send-email-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 093bfe13196c5aae4665a9bbadc21b100e0e2863..7104dc1463eb3a43125a593ab7042e69919d2650 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2899,7 +2899,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
         */
        head = I915_READ_HEAD(engine) & HEAD_ADDR;
        backwards = (INTEL_GEN(dev_priv) >= 8) ? 5 : 4;
-       vaddr = (void __iomem *)engine->buffer->virtual_start;
+       vaddr = (void __iomem *)engine->buffer->vaddr;
 
        for (i = backwards; i; --i) {
                /*

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index afed24abb596c959b7e4e762e676d8daacc7756a..b9638e19d3048ad940df3f3024f3c57e582a4f1c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1972,14 +1972,14 @@ static int init_phys_status_page(struct intel_engine_cs *engine)
 
 void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
 {
-       GEM_BUG_ON(ringbuf->vma == NULL);
-       GEM_BUG_ON(ringbuf->virtual_start == NULL);
+       GEM_BUG_ON(!ringbuf->vma);
+       GEM_BUG_ON(!ringbuf->vaddr);
 
        if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen)
                i915_gem_object_unpin_map(ringbuf->obj);
        else
                i915_vma_unpin_iomap(ringbuf->vma);
-       ringbuf->virtual_start = NULL;
+       ringbuf->vaddr = NULL;
 
        i915_gem_object_ggtt_unpin(ringbuf->obj);
        ringbuf->vma = NULL;
@@ -2029,7 +2029,7 @@ int intel_pin_and_map_ringbuffer_obj(struct drm_i915_private *dev_priv,
                }
        }
 
-       ringbuf->virtual_start = addr;
+       ringbuf->vaddr = addr;
        ringbuf->vma = i915_gem_obj_to_ggtt(obj);
        return 0;
 
@@ -2391,8 +2391,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
                GEM_BUG_ON(ringbuf->tail + remain_actual > ringbuf->size);
 
                /* Fill the tail with MI_NOOP */
-               memset(ringbuf->virtual_start + ringbuf->tail,
-                      0, remain_actual);
+               memset(ringbuf->vaddr + ringbuf->tail, 0, remain_actual);
                ringbuf->tail = 0;
                ringbuf->space -= remain_actual;
        }

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index d1b2d9bd89eb65390997fb6812a29a41634734b7..05bab8bda63d97f242b312ac72fde64374b8ed99 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -84,7 +84,7 @@ struct intel_ring_hangcheck {
 
 struct intel_ringbuffer {
        struct drm_i915_gem_object *obj;
-       void *virtual_start;
+       void *vaddr;
        struct i915_vma *vma;
 
        struct intel_engine_cs *engine;
@@ -457,7 +457,7 @@ int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);
 static inline void __intel_ringbuffer_emit(struct intel_ringbuffer *rb,
                                           u32 data)
 {
-       *(uint32_t *)(rb->virtual_start + rb->tail) = data;
+       *(uint32_t *)(rb->vaddr + rb->tail) = data;
        rb->tail += 4;
 }