[PATCH 23/49] drm/i915: s/__intel_ring_advance/intel_ringbuffer_advance_and_submit

oscar.mateo
2014-03-27T17:09:36Z

From: Oscar Mateo <oscar.mateo@intel.com>

The "__" name is too confusing, specially given the refactoring patch
that comes soon with new ringbuffer management functions.

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
---
drivers/gpu/drm/i915/i915_dma.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 10 +++++-----
drivers/gpu/drm/i915/intel_ringbuffer.c | 14 +++++++-------
drivers/gpu/drm/i915/intel_ringbuffer.h | 4 ++--
4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 76b47a6..29583da 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -56,7 +56,7 @@
intel_ring_emit(LP_RING(dev_priv), x)

#define ADVANCE_LP_RING() \
- __intel_ring_advance(LP_RING(dev_priv), NULL)
+ intel_ringbuffer_advance_and_submit(LP_RING(dev_priv), NULL)

/**
* Lock test for when it's just for synchronization of ring access.
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 462c7ae..22be556 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8637,7 +8637,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev,
intel_ring_emit(ring, 0); /* aux display base address, unused */

intel_mark_page_flip_active(intel_crtc);
- __intel_ring_advance(ring, ring->default_context);
+ intel_ringbuffer_advance_and_submit(ring, ring->default_context);
return 0;

err_unpin:
@@ -8679,7 +8679,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev,
intel_ring_emit(ring, MI_NOOP);

intel_mark_page_flip_active(intel_crtc);
- __intel_ring_advance(ring, ring->default_context);
+ intel_ringbuffer_advance_and_submit(ring, ring->default_context);
return 0;

err_unpin:
@@ -8728,7 +8728,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev,
intel_ring_emit(ring, pf | pipesrc);

intel_mark_page_flip_active(intel_crtc);
- __intel_ring_advance(ring, ring->default_context);
+ intel_ringbuffer_advance_and_submit(ring, ring->default_context);
return 0;

err_unpin:
@@ -8773,7 +8773,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
intel_ring_emit(ring, pf | pipesrc);

intel_mark_page_flip_active(intel_crtc);
- __intel_ring_advance(ring, ring->default_context);
+ intel_ringbuffer_advance_and_submit(ring, ring->default_context);
return 0;

err_unpin:
@@ -8867,7 +8867,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
intel_ring_emit(ring, (MI_NOOP));

intel_mark_page_flip_active(intel_crtc);
- __intel_ring_advance(ring, ring->default_context);
+ intel_ringbuffer_advance_and_submit(ring, ring->default_context);
return 0;

err_unpin:
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 4fbea79..ac4e618 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -43,8 +43,8 @@ static inline int ring_space(struct intel_engine *ring)
return space;
}

-void __intel_ring_advance(struct intel_engine *ring,
- struct i915_hw_context *ctx)
+void intel_ringbuffer_advance_and_submit(struct intel_engine *ring,
+ struct i915_hw_context *ctx)
{
struct drm_i915_private *dev_priv = ring->dev->dev_private;
struct intel_ringbuffer *ringbuf = __get_ringbuf(ring);
@@ -726,7 +726,7 @@ gen6_add_request(struct intel_engine *ring,
intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
intel_ring_emit(ring, ring->outstanding_lazy_seqno);
intel_ring_emit(ring, MI_USER_INTERRUPT);
- __intel_ring_advance(ring, ctx);
+ intel_ringbuffer_advance_and_submit(ring, ctx);

return 0;
}
@@ -745,7 +745,7 @@ gen8_add_request(struct intel_engine *ring,
intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
intel_ring_emit(ring, ring->outstanding_lazy_seqno);
intel_ring_emit(ring, MI_USER_INTERRUPT);
- __intel_ring_advance(ring, ctx);
+ intel_ringbuffer_advance_and_submit(ring, ctx);

return 0;
}
@@ -859,7 +859,7 @@ pc_render_add_request(struct intel_engine *ring,
intel_ring_emit(ring, ring->scratch.gtt_offset | PIPE_CONTROL_GLOBAL_GTT);
intel_ring_emit(ring, ring->outstanding_lazy_seqno);
intel_ring_emit(ring, 0);
- __intel_ring_advance(ring, ctx);
+ intel_ringbuffer_advance_and_submit(ring, ctx);

return 0;
}
@@ -1093,7 +1093,7 @@ i9xx_add_request(struct intel_engine *ring,
intel_ring_emit(ring, I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
intel_ring_emit(ring, ring->outstanding_lazy_seqno);
intel_ring_emit(ring, MI_USER_INTERRUPT);
- __intel_ring_advance(ring, ctx);
+ intel_ringbuffer_advance_and_submit(ring, ctx);

return 0;
}
@@ -1621,7 +1621,7 @@ static int ring_wait_for_space(struct intel_engine *ring,
return ret;

/* force the tail write in case we have been skipping them */
- __intel_ring_advance(ring, ctx);
+ intel_ringbuffer_advance_and_submit(ring, ctx);

trace_i915_ring_wait_begin(ring);
/* With GEM the hangcheck timer should kick us out of the loop,
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 95e29e0..cd6c52a 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -302,8 +302,8 @@ static inline void intel_ring_advance(struct intel_engine *ring)

ringbuf->tail &= ringbuf->size - 1;
}
-void __intel_ring_advance(struct intel_engine *ring,
- struct i915_hw_context *ctx);
+void intel_ringbuffer_advance_and_submit(struct intel_engine *ring,
+ struct i915_hw_context *ctx);

int __must_check intel_ring_idle(struct intel_engine *ring);
void intel_ring_init_seqno(struct intel_engine *ring, u32 seqno);
--
1.9.0