[Intel-gfx] [PATCH 063/190] drm/i915: Rename struct intel_ringbuffer to intel_ring
Tvrtko Ursulin
tvrtko.ursulin at linux.intel.com
Thu Jan 28 03:54:08 PST 2016
Oh right, I suppose patch 59 is OK then if it goes together with this one.
Regards,
Tvrtko
On 11/01/16 09:17, Chris Wilson wrote:
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 21 +++---
> drivers/gpu/drm/i915/i915_drv.h | 2 +-
> drivers/gpu/drm/i915/i915_gem.c | 43 ++++++------
> drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
> drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +-
> drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +-
> drivers/gpu/drm/i915/i915_gem_request.c | 2 +-
> drivers/gpu/drm/i915/i915_gem_request.h | 2 +-
> drivers/gpu/drm/i915/i915_gpu_error.c | 2 +-
> drivers/gpu/drm/i915/i915_guc_submission.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 10 +--
> drivers/gpu/drm/i915/intel_lrc.c | 40 ++++++------
> drivers/gpu/drm/i915/intel_mocs.c | 4 +-
> drivers/gpu/drm/i915/intel_ringbuffer.c | 101 ++++++++++++++---------------
> drivers/gpu/drm/i915/intel_ringbuffer.h | 45 ++++++-------
> 15 files changed, 138 insertions(+), 148 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index dec10784c2bc..8de944ed3369 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -1948,12 +1948,11 @@ static int i915_gem_framebuffer_info(struct seq_file *m, void *data)
> return 0;
> }
>
> -static void describe_ctx_ringbuf(struct seq_file *m,
> - struct intel_ringbuffer *ringbuf)
> +static void describe_ctx_ring(struct seq_file *m, struct intel_ring *ring)
> {
> seq_printf(m, " (ringbuffer, space: %d, head: %u, tail: %u, last head: %d)",
> - ringbuf->space, ringbuf->head, ringbuf->tail,
> - ringbuf->last_retired_head);
> + ring->space, ring->head, ring->tail,
> + ring->last_retired_head);
> }
>
> static int i915_context_status(struct seq_file *m, void *unused)
> @@ -1985,16 +1984,12 @@ static int i915_context_status(struct seq_file *m, void *unused)
> if (i915.enable_execlists) {
> seq_putc(m, '\n');
> for_each_ring(ring, dev_priv, i) {
> - struct drm_i915_gem_object *ctx_obj =
> - ctx->engine[i].state;
> - struct intel_ringbuffer *ringbuf =
> - ctx->engine[i].ring;
> -
> seq_printf(m, "%s: ", ring->name);
> - if (ctx_obj)
> - describe_obj(m, ctx_obj);
> - if (ringbuf)
> - describe_ctx_ringbuf(m, ringbuf);
> + if (ctx->engine[i].state)
> + describe_obj(m, ctx->engine[i].state);
> + if (ctx->engine[i].ring)
> + describe_ctx_ring(m,
> + ctx->engine[i].ring);
> seq_putc(m, '\n');
> }
> } else {
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 466adc6617f0..44e8738c5310 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -885,7 +885,7 @@ struct intel_context {
> /* Execlists */
> struct {
> struct drm_i915_gem_object *state;
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
> int pin_count;
> } engine[I915_NUM_RINGS];
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index a81cad666d3a..1c6beb154d07 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2193,9 +2193,9 @@ i915_gem_find_active_request(struct intel_engine_cs *ring)
> return NULL;
> }
>
> -static void i915_gem_reset_ring_status(struct drm_i915_private *dev_priv,
> - struct intel_engine_cs *ring)
> +static void i915_gem_reset_ring_status(struct intel_engine_cs *ring)
> {
> + struct drm_i915_private *dev_priv = ring->i915;
> struct drm_i915_gem_request *request;
> bool ring_hung;
>
> @@ -2212,19 +2212,18 @@ static void i915_gem_reset_ring_status(struct drm_i915_private *dev_priv,
> i915_set_reset_status(dev_priv, request->ctx, false);
> }
>
> -static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
> - struct intel_engine_cs *ring)
> +static void i915_gem_reset_ring_cleanup(struct intel_engine_cs *engine)
> {
> - struct intel_ringbuffer *buffer;
> + struct intel_ring *ring;
>
> - while (!list_empty(&ring->active_list)) {
> + while (!list_empty(&engine->active_list)) {
> struct drm_i915_gem_object *obj;
>
> - obj = list_first_entry(&ring->active_list,
> + obj = list_first_entry(&engine->active_list,
> struct drm_i915_gem_object,
> - ring_list[ring->id]);
> + ring_list[engine->id]);
>
> - i915_gem_object_retire__read(obj, ring->id);
> + i915_gem_object_retire__read(obj, engine->id);
> }
>
> /*
> @@ -2234,14 +2233,14 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
> */
>
> if (i915.enable_execlists) {
> - spin_lock_irq(&ring->execlist_lock);
> + spin_lock_irq(&engine->execlist_lock);
>
> /* list_splice_tail_init checks for empty lists */
> - list_splice_tail_init(&ring->execlist_queue,
> - &ring->execlist_retired_req_list);
> + list_splice_tail_init(&engine->execlist_queue,
> + &engine->execlist_retired_req_list);
>
> - spin_unlock_irq(&ring->execlist_lock);
> - intel_execlists_retire_requests(ring);
> + spin_unlock_irq(&engine->execlist_lock);
> + intel_execlists_retire_requests(engine);
> }
>
> /*
> @@ -2251,10 +2250,10 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
> * implicit references on things like e.g. ppgtt address spaces through
> * the request.
> */
> - if (!list_empty(&ring->request_list)) {
> + if (!list_empty(&engine->request_list)) {
> struct drm_i915_gem_request *request;
>
> - request = list_last_entry(&ring->request_list,
> + request = list_last_entry(&engine->request_list,
> struct drm_i915_gem_request,
> list);
>
> @@ -2268,12 +2267,12 @@ static void i915_gem_reset_ring_cleanup(struct drm_i915_private *dev_priv,
> * upon reset is less than when we start. Do one more pass over
> * all the ringbuffers to reset last_retired_head.
> */
> - list_for_each_entry(buffer, &ring->buffers, link) {
> - buffer->last_retired_head = buffer->tail;
> - intel_ring_update_space(buffer);
> + list_for_each_entry(ring, &engine->buffers, link) {
> + ring->last_retired_head = ring->tail;
> + intel_ring_update_space(ring);
> }
>
> - intel_engine_init_seqno(ring, ring->last_submitted_seqno);
> + intel_engine_init_seqno(engine, engine->last_submitted_seqno);
> }
>
> void i915_gem_reset(struct drm_device *dev)
> @@ -2288,10 +2287,10 @@ void i915_gem_reset(struct drm_device *dev)
> * their reference to the objects, the inspection must be done first.
> */
> for_each_ring(ring, dev_priv, i)
> - i915_gem_reset_ring_status(dev_priv, ring);
> + i915_gem_reset_ring_status(ring);
>
> for_each_ring(ring, dev_priv, i)
> - i915_gem_reset_ring_cleanup(dev_priv, ring);
> + i915_gem_reset_ring_cleanup(ring);
>
> i915_gem_context_reset(dev);
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index ac2e205fe3b4..17fe8ed991d6 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -519,7 +519,7 @@ i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)
> static inline int
> mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 flags = hw_flags | MI_MM_SPACE_GTT;
> const int num_rings =
> /* Use an extended w/a on ivb+ if signalling from other rings */
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index b7c90072f7d4..731ce13dbdbc 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1148,7 +1148,7 @@ i915_gem_execbuffer_retire_commands(struct i915_execbuffer_params *params)
> static int
> i915_reset_gen7_sol_offsets(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret, i;
>
> if (!IS_GEN7(req->i915) || req->engine->id != RCS) {
> @@ -1229,7 +1229,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
> struct drm_i915_gem_execbuffer2 *args,
> struct list_head *vmas)
> {
> - struct intel_ringbuffer *ring = params->request->ring;
> + struct intel_ring *ring = params->request->ring;
> struct drm_i915_private *dev_priv = params->request->i915;
> u64 exec_start, exec_len;
> int instp_mode;
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index 38c109cda904..9a91451d66ac 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -656,7 +656,7 @@ static int gen8_write_pdp(struct drm_i915_gem_request *req,
> unsigned entry,
> dma_addr_t addr)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> BUG_ON(entry >= 4);
> @@ -1648,7 +1648,7 @@ static uint32_t get_pd_offset(struct i915_hw_ppgtt *ppgtt)
> static int hsw_mm_switch(struct i915_hw_ppgtt *ppgtt,
> struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> /* NB: TLBs must be flushed and invalidated before a switch */
> @@ -1686,7 +1686,7 @@ static int vgpu_mm_switch(struct i915_hw_ppgtt *ppgtt,
> static int gen7_mm_switch(struct i915_hw_ppgtt *ppgtt,
> struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> /* NB: TLBs must be flushed and invalidated before a switch */
> diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c
> index 54834ad1bf5e..e1f2af046b6c 100644
> --- a/drivers/gpu/drm/i915/i915_gem_request.c
> +++ b/drivers/gpu/drm/i915/i915_gem_request.c
> @@ -401,7 +401,7 @@ void __i915_add_request(struct drm_i915_gem_request *request,
> struct drm_i915_gem_object *obj,
> bool flush_caches)
> {
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
> u32 request_start;
> int ret;
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_request.h b/drivers/gpu/drm/i915/i915_gem_request.h
> index cd4412f6e7e3..086950567db4 100644
> --- a/drivers/gpu/drm/i915/i915_gem_request.h
> +++ b/drivers/gpu/drm/i915/i915_gem_request.h
> @@ -79,7 +79,7 @@ struct drm_i915_gem_request {
> * context.
> */
> struct intel_context *ctx;
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
>
> /** Batch buffer related to this request if any (used for
> error state dump only) */
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index f27d6d1b64d6..2785f2d1f073 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -1007,7 +1007,7 @@ static void i915_gem_record_rings(struct drm_device *dev,
> request = i915_gem_find_active_request(engine);
> if (request) {
> struct i915_address_space *vm;
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
>
> vm = request->ctx && request->ctx->ppgtt ?
> &request->ctx->ppgtt->base :
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 39ccfa8934e3..5a6251926367 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -390,7 +390,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc,
>
> for (i = 0; i < I915_NUM_RINGS; i++) {
> struct guc_execlist_context *lrc = &desc.lrc[i];
> - struct intel_ringbuffer *ring = ctx->engine[i].ring;
> + struct intel_ring *ring = ctx->engine[i].ring;
> struct intel_engine_cs *engine;
> struct drm_i915_gem_object *obj;
> uint64_t ctx_desc;
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0d42356f15b4..f8717c5627dd 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11052,7 +11052,7 @@ static int intel_gen2_queue_flip(struct drm_device *dev,
> struct drm_i915_gem_request *req,
> uint32_t flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> u32 flip_mask;
> int ret;
> @@ -11087,7 +11087,7 @@ static int intel_gen3_queue_flip(struct drm_device *dev,
> struct drm_i915_gem_request *req,
> uint32_t flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> u32 flip_mask;
> int ret;
> @@ -11119,7 +11119,7 @@ static int intel_gen4_queue_flip(struct drm_device *dev,
> struct drm_i915_gem_request *req,
> uint32_t flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct drm_i915_private *dev_priv = req->i915;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> uint32_t pf, pipesrc;
> @@ -11158,7 +11158,7 @@ static int intel_gen6_queue_flip(struct drm_device *dev,
> struct drm_i915_gem_request *req,
> uint32_t flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct drm_i915_private *dev_priv = req->i915;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> uint32_t pf, pipesrc;
> @@ -11194,7 +11194,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
> struct drm_i915_gem_request *req,
> uint32_t flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> uint32_t plane_bit = 0;
> int len, ret;
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 92ae7bc532ed..fa4c0c0db994 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -449,7 +449,7 @@ static void execlists_context_unqueue(struct intel_engine_cs *engine)
> * for where we prepare the padding after the end of the
> * request.
> */
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
>
> ring = req0->ctx->engine[engine->id].ring;
> req0->tail += 8;
> @@ -742,7 +742,7 @@ int intel_execlists_submission(struct i915_execbuffer_params *params,
> struct drm_device *dev = params->dev;
> struct intel_engine_cs *engine = params->ring;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct intel_ringbuffer *ring = params->request->ring;
> + struct intel_ring *ring = params->request->ring;
> u64 exec_start;
> int instp_mode;
> u32 instp_mask;
> @@ -878,7 +878,7 @@ int logical_ring_flush_all_caches(struct drm_i915_gem_request *req)
>
> static int intel_lr_context_do_pin(struct intel_engine_cs *ring,
> struct drm_i915_gem_object *ctx_obj,
> - struct intel_ringbuffer *ringbuf)
> + struct intel_ring *ringbuf)
> {
> struct drm_i915_private *dev_priv = ring->i915;
> int ret = 0;
> @@ -889,7 +889,7 @@ static int intel_lr_context_do_pin(struct intel_engine_cs *ring,
> if (ret)
> return ret;
>
> - ret = intel_pin_and_map_ringbuffer_obj(ring->dev, ringbuf);
> + ret = intel_pin_and_map_ring(ring->dev, ringbuf);
> if (ret)
> goto unpin_ctx_obj;
>
> @@ -931,12 +931,12 @@ void intel_lr_context_unpin(struct drm_i915_gem_request *rq)
> {
> int engine = rq->engine->id;
> struct drm_i915_gem_object *ctx_obj = rq->ctx->engine[engine].state;
> - struct intel_ringbuffer *ring = rq->ring;
> + struct intel_ring *ring = rq->ring;
>
> if (ctx_obj) {
> WARN_ON(!mutex_is_locked(&rq->i915->dev->struct_mutex));
> if (--rq->ctx->engine[engine].pin_count == 0) {
> - intel_unpin_ringbuffer_obj(ring);
> + intel_unpin_ring(ring);
> i915_gem_object_ggtt_unpin(ctx_obj);
> i915_gem_context_unreference(rq->ctx);
> }
> @@ -947,7 +947,7 @@ static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
> {
> int ret, i;
> struct intel_engine_cs *engine = req->engine;
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct drm_i915_private *dev_priv = req->i915;
> struct i915_workarounds *w = &dev_priv->workarounds;
>
> @@ -1417,7 +1417,7 @@ static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)
> {
> struct i915_hw_ppgtt *ppgtt = req->ctx->ppgtt;
> struct intel_engine_cs *engine = req->engine;
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> const int num_lri_cmds = GEN8_LEGACY_PDPES * 2;
> int i, ret;
>
> @@ -1444,7 +1444,7 @@ static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)
> static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
> u64 offset, unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> bool ppgtt = !(dispatch_flags & I915_DISPATCH_SECURE);
> int ret;
>
> @@ -1503,7 +1503,7 @@ static int gen8_emit_flush(struct drm_i915_gem_request *request,
> u32 invalidate_domains,
> u32 unused)
> {
> - struct intel_ringbuffer *ring = request->ring;
> + struct intel_ring *ring = request->ring;
> uint32_t cmd;
> int ret;
>
> @@ -1541,7 +1541,7 @@ static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
> u32 invalidate_domains,
> u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = request->ring;
> + struct intel_ring *ring = request->ring;
> u32 scratch_addr = request->engine->scratch.gtt_offset + 2 * CACHELINE_BYTES;
> bool vf_flush_wa = false;
> u32 flags = 0;
> @@ -1620,7 +1620,7 @@ gen6_seqno_barrier(struct intel_engine_cs *ring)
>
> static int gen8_emit_request(struct drm_i915_gem_request *request)
> {
> - struct intel_ringbuffer *ring = request->ring;
> + struct intel_ring *ring = request->ring;
> u32 cmd;
> int ret;
>
> @@ -2039,7 +2039,7 @@ make_rpcs(struct drm_device *dev)
>
> static int
> populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_obj,
> - struct intel_engine_cs *ring, struct intel_ringbuffer *ringbuf)
> + struct intel_engine_cs *ring, struct intel_ring *ringbuf)
> {
> struct drm_device *dev = ring->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -2174,15 +2174,15 @@ void intel_lr_context_free(struct intel_context *ctx)
> struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;
>
> if (ctx_obj) {
> - struct intel_ringbuffer *ring = ctx->engine[i].ring;
> + struct intel_ring *ring = ctx->engine[i].ring;
> struct intel_engine_cs *engine = ring->engine;
>
> if (ctx == engine->default_context) {
> - intel_unpin_ringbuffer_obj(ring);
> + intel_unpin_ring(ring);
> i915_gem_object_ggtt_unpin(ctx_obj);
> }
> WARN_ON(ctx->engine[engine->id].pin_count);
> - intel_ringbuffer_free(ring);
> + intel_ring_free(ring);
> drm_gem_object_unreference(&ctx_obj->base);
> }
> }
> @@ -2262,7 +2262,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
> {
> struct drm_i915_gem_object *ctx_obj;
> uint32_t context_size;
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
> int ret;
>
> WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL);
> @@ -2279,7 +2279,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
> return -ENOMEM;
> }
>
> - ring = intel_engine_create_ringbuffer(engine, 4 * PAGE_SIZE);
> + ring = intel_engine_create_ring(engine, 4 * PAGE_SIZE);
> if (IS_ERR(ring)) {
> ret = PTR_ERR(ring);
> goto error_deref_obj;
> @@ -2316,7 +2316,7 @@ int intel_lr_context_deferred_alloc(struct intel_context *ctx,
> return 0;
>
> error_ringbuf:
> - intel_ringbuffer_free(ring);
> + intel_ring_free(ring);
> error_deref_obj:
> drm_gem_object_unreference(&ctx_obj->base);
> ctx->engine[engine->id].ring = NULL;
> @@ -2333,7 +2333,7 @@ void intel_lr_context_reset(struct drm_device *dev,
>
> for_each_ring(unused, dev_priv, i) {
> struct drm_i915_gem_object *ctx_obj = ctx->engine[i].state;
> - struct intel_ringbuffer *ring = ctx->engine[i].ring;
> + struct intel_ring *ring = ctx->engine[i].ring;
> uint32_t *reg_state;
> struct page *page;
>
> diff --git a/drivers/gpu/drm/i915/intel_mocs.c b/drivers/gpu/drm/i915/intel_mocs.c
> index 61e1704d7313..1b724c0a711e 100644
> --- a/drivers/gpu/drm/i915/intel_mocs.c
> +++ b/drivers/gpu/drm/i915/intel_mocs.c
> @@ -193,7 +193,7 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,
> const struct drm_i915_mocs_table *table,
> enum intel_engine_id id)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> unsigned int index;
> int ret;
>
> @@ -244,7 +244,7 @@ static int emit_mocs_control_table(struct drm_i915_gem_request *req,
> static int emit_mocs_l3cc_table(struct drm_i915_gem_request *req,
> const struct drm_i915_mocs_table *table)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> unsigned int count;
> unsigned int i;
> u32 value;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 1bb9f376aa0b..95974156a1d9 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -42,7 +42,7 @@ int __intel_ring_space(int head, int tail, int size)
> return space - I915_RING_FREE_SPACE;
> }
>
> -void intel_ring_update_space(struct intel_ringbuffer *ringbuf)
> +void intel_ring_update_space(struct intel_ring *ringbuf)
> {
> if (ringbuf->last_retired_head != -1) {
> ringbuf->head = ringbuf->last_retired_head;
> @@ -53,7 +53,7 @@ void intel_ring_update_space(struct intel_ringbuffer *ringbuf)
> ringbuf->tail, ringbuf->size);
> }
>
> -int intel_ring_space(struct intel_ringbuffer *ringbuf)
> +int intel_ring_space(struct intel_ring *ringbuf)
> {
> intel_ring_update_space(ringbuf);
> return ringbuf->space;
> @@ -61,7 +61,7 @@ int intel_ring_space(struct intel_ringbuffer *ringbuf)
>
> static void __intel_ring_advance(struct intel_engine_cs *ring)
> {
> - struct intel_ringbuffer *ringbuf = ring->buffer;
> + struct intel_ring *ringbuf = ring->buffer;
> ringbuf->tail &= ringbuf->size - 1;
> ring->write_tail(ring, ringbuf->tail);
> }
> @@ -71,7 +71,7 @@ gen2_render_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate_domains,
> u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 cmd;
> int ret;
>
> @@ -98,7 +98,7 @@ gen4_render_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate_domains,
> u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 cmd;
> int ret;
>
> @@ -191,7 +191,7 @@ gen4_render_ring_flush(struct drm_i915_gem_request *req,
> static int
> intel_emit_post_sync_nonzero_flush(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 scratch_addr = req->engine->scratch.gtt_offset + 2 * CACHELINE_BYTES;
> int ret;
>
> @@ -227,7 +227,7 @@ static int
> gen6_render_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate_domains, u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 flags = 0;
> u32 scratch_addr = req->engine->scratch.gtt_offset + 2 * CACHELINE_BYTES;
> int ret;
> @@ -279,7 +279,7 @@ gen6_render_ring_flush(struct drm_i915_gem_request *req,
> static int
> gen7_render_ring_cs_stall_wa(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 4);
> @@ -300,7 +300,7 @@ static int
> gen7_render_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate_domains, u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 flags = 0;
> u32 scratch_addr = req->engine->scratch.gtt_offset + 2 * CACHELINE_BYTES;
> int ret;
> @@ -363,7 +363,7 @@ static int
> gen8_emit_pipe_control(struct drm_i915_gem_request *req,
> u32 flags, u32 scratch_addr)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 6);
> @@ -547,7 +547,7 @@ static int init_ring_common(struct intel_engine_cs *ring)
> {
> struct drm_device *dev = ring->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct intel_ringbuffer *ringbuf = ring->buffer;
> + struct intel_ring *ringbuf = ring->buffer;
> struct drm_i915_gem_object *obj = ringbuf->obj;
> int ret = 0;
>
> @@ -688,7 +688,7 @@ err:
>
> static int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct drm_i915_private *dev_priv = req->i915;
> struct i915_workarounds *w = &dev_priv->workarounds;
> int ret, i;
> @@ -1191,7 +1191,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *signaller_req,
> unsigned int num_dwords)
> {
> #define MBOX_UPDATE_DWORDS 8
> - struct intel_ringbuffer *signaller = signaller_req->ring;
> + struct intel_ring *signaller = signaller_req->ring;
> struct drm_i915_private *dev_priv = signaller_req->i915;
> struct intel_engine_cs *waiter;
> int i, ret, num_rings;
> @@ -1229,7 +1229,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,
> unsigned int num_dwords)
> {
> #define MBOX_UPDATE_DWORDS 6
> - struct intel_ringbuffer *signaller = signaller_req->ring;
> + struct intel_ring *signaller = signaller_req->ring;
> struct drm_i915_private *dev_priv = signaller_req->i915;
> struct intel_engine_cs *waiter;
> int i, ret, num_rings;
> @@ -1264,7 +1264,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *signaller_req,
> static int gen6_signal(struct drm_i915_gem_request *signaller_req,
> unsigned int num_dwords)
> {
> - struct intel_ringbuffer *signaller = signaller_req->ring;
> + struct intel_ring *signaller = signaller_req->ring;
> struct drm_i915_private *dev_priv = signaller_req->i915;
> struct intel_engine_cs *useless;
> int i, ret, num_rings;
> @@ -1306,7 +1306,7 @@ static int gen6_signal(struct drm_i915_gem_request *signaller_req,
> static int
> gen6_add_request(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> if (req->engine->semaphore.signal)
> @@ -1345,7 +1345,7 @@ gen8_ring_sync(struct drm_i915_gem_request *waiter_req,
> struct intel_engine_cs *signaller,
> u32 seqno)
> {
> - struct intel_ringbuffer *waiter = waiter_req->ring;
> + struct intel_ring *waiter = waiter_req->ring;
> struct drm_i915_private *dev_priv = waiter_req->i915;
> int ret;
>
> @@ -1373,7 +1373,7 @@ gen6_ring_sync(struct drm_i915_gem_request *waiter_req,
> struct intel_engine_cs *signaller,
> u32 seqno)
> {
> - struct intel_ringbuffer *waiter = waiter_req->ring;
> + struct intel_ring *waiter = waiter_req->ring;
> u32 dw1 = MI_SEMAPHORE_MBOX |
> MI_SEMAPHORE_COMPARE |
> MI_SEMAPHORE_REGISTER;
> @@ -1421,7 +1421,7 @@ do { \
> static int
> pc_render_add_request(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 addr = req->engine->status_page.gfx_addr +
> (I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
> u32 scratch_addr = addr;
> @@ -1548,7 +1548,7 @@ bsd_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate_domains,
> u32 flush_domains)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 2);
> @@ -1564,7 +1564,7 @@ bsd_ring_flush(struct drm_i915_gem_request *req,
> static int
> i9xx_add_request(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 4);
> @@ -1658,7 +1658,7 @@ i965_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 length,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 2);
> @@ -1685,7 +1685,7 @@ i830_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 len,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> u32 cs_offset = req->engine->scratch.gtt_offset;
> int ret;
>
> @@ -1748,7 +1748,7 @@ i915_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 len,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 2);
> @@ -1845,7 +1845,7 @@ static int init_phys_status_page(struct intel_engine_cs *ring)
> return 0;
> }
>
> -void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
> +void intel_unpin_ring(struct intel_ring *ringbuf)
> {
> if (HAS_LLC(ringbuf->obj->base.dev) && !ringbuf->obj->stolen)
> i915_gem_object_unpin_vmap(ringbuf->obj);
> @@ -1854,8 +1854,7 @@ void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
> i915_gem_object_ggtt_unpin(ringbuf->obj);
> }
>
> -int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,
> - struct intel_ringbuffer *ringbuf)
> +int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ringbuf)
> {
> struct drm_i915_private *dev_priv = to_i915(dev);
> struct drm_i915_gem_object *obj = ringbuf->obj;
> @@ -1900,14 +1899,14 @@ unpin:
> return ret;
> }
>
> -static void intel_destroy_ringbuffer_obj(struct intel_ringbuffer *ringbuf)
> +static void intel_destroy_ringbuffer_obj(struct intel_ring *ringbuf)
> {
> drm_gem_object_unreference(&ringbuf->obj->base);
> ringbuf->obj = NULL;
> }
>
> static int intel_alloc_ringbuffer_obj(struct drm_device *dev,
> - struct intel_ringbuffer *ringbuf)
> + struct intel_ring *ringbuf)
> {
> struct drm_i915_gem_object *obj;
>
> @@ -1927,10 +1926,10 @@ static int intel_alloc_ringbuffer_obj(struct drm_device *dev,
> return 0;
> }
>
> -struct intel_ringbuffer *
> -intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size)
> +struct intel_ring *
> +intel_engine_create_ring(struct intel_engine_cs *engine, int size)
> {
> - struct intel_ringbuffer *ring;
> + struct intel_ring *ring;
> int ret;
>
> ring = kzalloc(sizeof(*ring), GFP_KERNEL);
> @@ -1968,7 +1967,7 @@ intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size)
> }
>
> void
> -intel_ringbuffer_free(struct intel_ringbuffer *ring)
> +intel_ring_free(struct intel_ring *ring)
> {
> intel_destroy_ringbuffer_obj(ring);
> list_del(&ring->link);
> @@ -1978,7 +1977,7 @@ intel_ringbuffer_free(struct intel_ringbuffer *ring)
> static int intel_init_engine(struct drm_device *dev,
> struct intel_engine_cs *engine)
> {
> - struct intel_ringbuffer *ringbuf;
> + struct intel_ring *ringbuf;
> int ret;
>
> WARN_ON(engine->buffer);
> @@ -1995,7 +1994,7 @@ static int intel_init_engine(struct drm_device *dev,
>
> intel_engine_init_breadcrumbs(engine);
>
> - ringbuf = intel_engine_create_ringbuffer(engine, 32 * PAGE_SIZE);
> + ringbuf = intel_engine_create_ring(engine, 32 * PAGE_SIZE);
> if (IS_ERR(ringbuf)) {
> ret = PTR_ERR(ringbuf);
> goto error;
> @@ -2013,7 +2012,7 @@ static int intel_init_engine(struct drm_device *dev,
> goto error;
> }
>
> - ret = intel_pin_and_map_ringbuffer_obj(dev, ringbuf);
> + ret = intel_pin_and_map_ring(dev, ringbuf);
> if (ret) {
> DRM_ERROR("Failed to pin and map ringbuffer %s: %d\n",
> engine->name, ret);
> @@ -2043,8 +2042,8 @@ void intel_engine_cleanup(struct intel_engine_cs *ring)
> intel_engine_stop(ring);
> WARN_ON(!IS_GEN2(ring->dev) && (I915_READ_MODE(ring) & MODE_IDLE) == 0);
>
> - intel_unpin_ringbuffer_obj(ring->buffer);
> - intel_ringbuffer_free(ring->buffer);
> + intel_unpin_ring(ring->buffer);
> + intel_ring_free(ring->buffer);
> ring->buffer = NULL;
> }
>
> @@ -2084,7 +2083,7 @@ int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request)
> return 0;
> }
>
> -void intel_ring_reserved_space_reserve(struct intel_ringbuffer *ringbuf, int size)
> +void intel_ring_reserved_space_reserve(struct intel_ring *ringbuf, int size)
> {
> WARN_ON(ringbuf->reserved_size);
> WARN_ON(ringbuf->reserved_in_use);
> @@ -2092,7 +2091,7 @@ void intel_ring_reserved_space_reserve(struct intel_ringbuffer *ringbuf, int siz
> ringbuf->reserved_size = size;
> }
>
> -void intel_ring_reserved_space_cancel(struct intel_ringbuffer *ringbuf)
> +void intel_ring_reserved_space_cancel(struct intel_ring *ringbuf)
> {
> WARN_ON(ringbuf->reserved_in_use);
>
> @@ -2100,7 +2099,7 @@ void intel_ring_reserved_space_cancel(struct intel_ringbuffer *ringbuf)
> ringbuf->reserved_in_use = false;
> }
>
> -void intel_ring_reserved_space_use(struct intel_ringbuffer *ringbuf)
> +void intel_ring_reserved_space_use(struct intel_ring *ringbuf)
> {
> WARN_ON(ringbuf->reserved_in_use);
>
> @@ -2108,7 +2107,7 @@ void intel_ring_reserved_space_use(struct intel_ringbuffer *ringbuf)
> ringbuf->reserved_tail = ringbuf->tail;
> }
>
> -void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf)
> +void intel_ring_reserved_space_end(struct intel_ring *ringbuf)
> {
> WARN_ON(!ringbuf->reserved_in_use);
> if (ringbuf->tail > ringbuf->reserved_tail) {
> @@ -2133,7 +2132,7 @@ void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf)
>
> static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> struct intel_engine_cs *engine = req->engine;
> struct drm_i915_gem_request *target;
> unsigned space;
> @@ -2172,7 +2171,7 @@ static int wait_for_space(struct drm_i915_gem_request *req, int bytes)
> return 0;
> }
>
> -static void ring_wrap(struct intel_ringbuffer *ringbuf)
> +static void ring_wrap(struct intel_ring *ringbuf)
> {
> int rem = ringbuf->size - ringbuf->tail;
> memset(ringbuf->virtual_start + ringbuf->tail, 0, rem);
> @@ -2183,7 +2182,7 @@ static void ring_wrap(struct intel_ringbuffer *ringbuf)
>
> static int ring_prepare(struct drm_i915_gem_request *req, int bytes)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int remain_usable = ring->effective_size - ring->tail;
> int remain_actual = ring->size - ring->tail;
> int ret, total_bytes, wait_bytes = 0;
> @@ -2243,7 +2242,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
> /* Align the ring tail to a cacheline boundary */
> int intel_ring_cacheline_align(struct drm_i915_gem_request *req)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int num_dwords = (ring->tail & (CACHELINE_BYTES - 1)) / sizeof(uint32_t);
> int ret;
>
> @@ -2318,7 +2317,7 @@ static void gen6_bsd_ring_write_tail(struct intel_engine_cs *ring,
> static int gen6_bsd_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate, u32 flush)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> uint32_t cmd;
> int ret;
>
> @@ -2364,7 +2363,7 @@ gen8_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 len,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> bool ppgtt = USES_PPGTT(req->i915) &&
> !(dispatch_flags & I915_DISPATCH_SECURE);
> int ret;
> @@ -2390,7 +2389,7 @@ hsw_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 len,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 2);
> @@ -2415,7 +2414,7 @@ gen6_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
> u64 offset, u32 len,
> unsigned dispatch_flags)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> int ret;
>
> ret = intel_ring_begin(req, 2);
> @@ -2438,7 +2437,7 @@ gen6_ring_dispatch_execbuffer(struct drm_i915_gem_request *req,
> static int gen6_ring_flush(struct drm_i915_gem_request *req,
> u32 invalidate, u32 flush)
> {
> - struct intel_ringbuffer *ring = req->ring;
> + struct intel_ring *ring = req->ring;
> uint32_t cmd;
> int ret;
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 6803e4820688..71941af13560 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -97,7 +97,7 @@ struct intel_engine_hangcheck {
> u32 instdone[I915_NUM_INSTDONE_REG];
> };
>
> -struct intel_ringbuffer {
> +struct intel_ring {
> struct drm_i915_gem_object *obj;
> void *virtual_start;
>
> @@ -163,7 +163,7 @@ struct intel_engine_cs {
> u32 mmio_base;
> struct drm_device *dev;
> struct drm_i915_private *i915;
> - struct intel_ringbuffer *buffer;
> + struct intel_ring *buffer;
> struct list_head buffers;
>
> /* Rather than have every client wait upon all user interrupts,
> @@ -454,12 +454,11 @@ intel_write_status_page(struct intel_engine_cs *ring,
> #define I915_GEM_HWS_SCRATCH_INDEX 0x40
> #define I915_GEM_HWS_SCRATCH_ADDR (I915_GEM_HWS_SCRATCH_INDEX << MI_STORE_DWORD_INDEX_SHIFT)
>
> -struct intel_ringbuffer *
> -intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size);
> -int intel_pin_and_map_ringbuffer_obj(struct drm_device *dev,
> - struct intel_ringbuffer *ringbuf);
> -void intel_unpin_ringbuffer_obj(struct intel_ringbuffer *ringbuf);
> -void intel_ringbuffer_free(struct intel_ringbuffer *ring);
> +struct intel_ring *
> +intel_engine_create_ring(struct intel_engine_cs *engine, int size);
> +int intel_pin_and_map_ring(struct drm_device *dev, struct intel_ring *ring);
> +void intel_unpin_ring(struct intel_ring *ring);
> +void intel_ring_free(struct intel_ring *ring);
>
> void intel_engine_stop(struct intel_engine_cs *ring);
> void intel_engine_cleanup(struct intel_engine_cs *ring);
> @@ -468,24 +467,22 @@ int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request);
>
> int __must_check intel_ring_begin(struct drm_i915_gem_request *req, int n);
> int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);
> -static inline void intel_ring_emit(struct intel_ringbuffer *rb,
> - u32 data)
> +static inline void intel_ring_emit(struct intel_ring *ring, u32 data)
> {
> - *(uint32_t *)(rb->virtual_start + rb->tail) = data;
> - rb->tail += 4;
> + *(uint32_t *)(ring->virtual_start + ring->tail) = data;
> + ring->tail += 4;
> }
> -static inline void intel_ring_emit_reg(struct intel_ringbuffer *rb,
> - i915_reg_t reg)
> +static inline void intel_ring_emit_reg(struct intel_ring *ring, i915_reg_t reg)
> {
> - intel_ring_emit(rb, i915_mmio_reg_offset(reg));
> + intel_ring_emit(ring, i915_mmio_reg_offset(reg));
> }
> -static inline void intel_ring_advance(struct intel_ringbuffer *rb)
> +static inline void intel_ring_advance(struct intel_ring *ring)
> {
> - rb->tail &= rb->size - 1;
> + ring->tail &= ring->size - 1;
> }
> int __intel_ring_space(int head, int tail, int size);
> -void intel_ring_update_space(struct intel_ringbuffer *ringbuf);
> -int intel_ring_space(struct intel_ringbuffer *ringbuf);
> +void intel_ring_update_space(struct intel_ring *ringbuf);
> +int intel_ring_space(struct intel_ring *ringbuf);
>
> int __must_check intel_engine_idle(struct intel_engine_cs *ring);
> void intel_engine_init_seqno(struct intel_engine_cs *ring, u32 seqno);
> @@ -509,7 +506,7 @@ static inline u32 intel_engine_get_seqno(struct intel_engine_cs *ring)
>
> int init_workarounds_ring(struct intel_engine_cs *ring);
>
> -static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
> +static inline u32 intel_ring_get_tail(struct intel_ring *ringbuf)
> {
> return ringbuf->tail;
> }
> @@ -528,13 +525,13 @@ static inline u32 intel_ring_get_tail(struct intel_ringbuffer *ringbuf)
> * will always have sufficient room to do its stuff. The request creation
> * code calls this automatically.
> */
> -void intel_ring_reserved_space_reserve(struct intel_ringbuffer *ringbuf, int size);
> +void intel_ring_reserved_space_reserve(struct intel_ring *ringbuf, int size);
> /* Cancel the reservation, e.g. because the request is being discarded. */
> -void intel_ring_reserved_space_cancel(struct intel_ringbuffer *ringbuf);
> +void intel_ring_reserved_space_cancel(struct intel_ring *ringbuf);
> /* Use the reserved space - for use by i915_add_request() only. */
> -void intel_ring_reserved_space_use(struct intel_ringbuffer *ringbuf);
> +void intel_ring_reserved_space_use(struct intel_ring *ringbuf);
> /* Finish with the reserved space - for use by i915_add_request() only. */
> -void intel_ring_reserved_space_end(struct intel_ringbuffer *ringbuf);
> +void intel_ring_reserved_space_end(struct intel_ring *ringbuf);
>
> /* intel_breadcrumbs.c -- user interrupt bottom-half for waiters */
> struct intel_wait {
>
More information about the Intel-gfx
mailing list