On ke, 2016-07-20 at 10:00 +0100, Chris Wilson wrote:
> Just a different colour to better match virtual addresses elsewhere.
>
> Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_irq.c | 2 +-
> drivers/gpu/drm/i915/intel_ringbuffer.c | 11 +++++------
> drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++--
> 3 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
> index 38d9ae90b613..0fef5cda4aca 100644
> --- 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 afed24abb596..b9638e19d304 100644
> --- 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 d1b2d9bd89eb..05bab8bda63d 100644
> --- 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;
> }
>
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
