openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Chris Wilson 2016-07-20 13:31:56 +01:00
parent 406ea8d22f
commit f2f0ed718b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_irq.c
View File

@ -2899,7 +2899,7 @@ semaphore_waits_for(struct intel_engine_cs *engine, u32 *seqno)
*/ */
head = I915_READ_HEAD(engine) & HEAD_ADDR; head = I915_READ_HEAD(engine) & HEAD_ADDR;
backwards = (INTEL_GEN(dev_priv) >= 8) ? 5 : 4; 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) { for (i = backwards; i; --i) {
/* /*

11
drivers/gpu/drm/i915/intel_ringbuffer.c
View File

@ -1972,14 +1972,14 @@ static int init_phys_status_page(struct intel_engine_cs *engine)
void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf) void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
{ {
GEM_BUG_ON(ringbuf->vma == NULL); GEM_BUG_ON(!ringbuf->vma);
GEM_BUG_ON(ringbuf->virtual_start == NULL); GEM_BUG_ON(!ringbuf->vaddr);
if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen) if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen)
i915_gem_object_unpin_map(ringbuf->obj); i915_gem_object_unpin_map(ringbuf->obj);
else else
i915_vma_unpin_iomap(ringbuf->vma); i915_vma_unpin_iomap(ringbuf->vma);
ringbuf->virtual_start = NULL; ringbuf->vaddr = NULL;
i915_gem_object_ggtt_unpin(ringbuf->obj); i915_gem_object_ggtt_unpin(ringbuf->obj);
ringbuf->vma = NULL; 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); ringbuf->vma = i915_gem_obj_to_ggtt(obj);
return 0; 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); GEM_BUG_ON(ringbuf->tail + remain_actual > ringbuf->size);
/* Fill the tail with MI_NOOP */ /* Fill the tail with MI_NOOP */
memset(ringbuf->virtual_start + ringbuf->tail, memset(ringbuf->vaddr + ringbuf->tail, 0, remain_actual);
0, remain_actual);
ringbuf->tail = 0; ringbuf->tail = 0;
ringbuf->space -= remain_actual; ringbuf->space -= remain_actual;
} }

4
drivers/gpu/drm/i915/intel_ringbuffer.h
View File

@ -84,7 +84,7 @@ struct intel_ring_hangcheck {
struct intel_ringbuffer { struct intel_ringbuffer {
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
void *virtual_start; void *vaddr;
struct i915_vma *vma; struct i915_vma *vma;
struct intel_engine_cs *engine; 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, static inline void __intel_ringbuffer_emit(struct intel_ringbuffer *rb,
u32 data) u32 data)
{ {
*(uint32_t *)(rb->virtual_start + rb->tail) = data; *(uint32_t *)(rb->vaddr + rb->tail) = data;
rb->tail += 4; rb->tail += 4;
} }