Having ringbuf->ring point to an engine is confusing, so rename it once again to ring->engine.
Signed-off-by: Chris Wilson <[email protected]> --- drivers/gpu/drm/i915/i915_guc_submission.c | 10 +++--- drivers/gpu/drm/i915/intel_lrc.c | 35 +++++++++---------- drivers/gpu/drm/i915/intel_ringbuffer.c | 54 +++++++++++++++--------------- drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +- 4 files changed, 49 insertions(+), 52 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c index e82cc9182dfa..53abe2143f8a 100644 --- a/drivers/gpu/drm/i915/i915_guc_submission.c +++ b/drivers/gpu/drm/i915/i915_guc_submission.c @@ -391,7 +391,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 *ringbuf = ctx->engine[i].ringbuf; - struct intel_engine_cs *ring; + struct intel_engine_cs *engine; struct drm_i915_gem_object *obj; uint64_t ctx_desc; @@ -406,15 +406,15 @@ static void guc_init_ctx_desc(struct intel_guc *guc, if (!obj) break; /* XXX: continue? */ - ring = ringbuf->ring; - ctx_desc = intel_lr_context_descriptor(ctx, ring); + engine = ringbuf->engine; + ctx_desc = intel_lr_context_descriptor(ctx, engine); lrc->context_desc = (u32)ctx_desc; /* The state page is after PPHWSP */ lrc->ring_lcra = i915_gem_obj_ggtt_offset(obj) + LRC_STATE_PN * PAGE_SIZE; lrc->context_id = (client->ctx_index << GUC_ELC_CTXID_OFFSET) | - (ring->id << GUC_ELC_ENGINE_OFFSET); + (engine->id << GUC_ELC_ENGINE_OFFSET); obj = ringbuf->obj; @@ -423,7 +423,7 @@ static void guc_init_ctx_desc(struct intel_guc *guc, lrc->ring_next_free_location = lrc->ring_begin; lrc->ring_current_tail_pointer_value = 0; - desc.engines_used |= (1 << ring->id); + desc.engines_used |= (1 << engine->id); } WARN_ON(desc.engines_used == 0); diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 87d325b6e7dc..8639ebfab96f 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -2179,13 +2179,13 @@ void intel_lr_context_free(struct intel_context *ctx) if (ctx_obj) { struct intel_ringbuffer *ringbuf = ctx->engine[i].ringbuf; - struct intel_engine_cs *ring = ringbuf->ring; + struct intel_engine_cs *engine = ringbuf->engine; - if (ctx == ring->default_context) { + if (ctx == engine->default_context) { intel_unpin_ringbuffer_obj(ringbuf); i915_gem_object_ggtt_unpin(ctx_obj); } - WARN_ON(ctx->engine[ring->id].pin_count); + WARN_ON(ctx->engine[engine->id].pin_count); intel_ringbuffer_free(ringbuf); drm_gem_object_unreference(&ctx_obj->base); } @@ -2261,57 +2261,54 @@ static void lrc_setup_hardware_status_page(struct intel_engine_cs *ring, * * Return: non-zero on error. */ - int intel_lr_context_deferred_alloc(struct intel_context *ctx, - struct intel_engine_cs *ring) + struct intel_engine_cs *engine) { - struct drm_device *dev = ring->dev; struct drm_i915_gem_object *ctx_obj; uint32_t context_size; struct intel_ringbuffer *ringbuf; int ret; WARN_ON(ctx->legacy_hw_ctx.rcs_state != NULL); - WARN_ON(ctx->engine[ring->id].state); + WARN_ON(ctx->engine[engine->id].state); - context_size = round_up(intel_lr_context_size(ring), 4096); + context_size = round_up(intel_lr_context_size(engine), 4096); /* One extra page as the sharing data between driver and GuC */ context_size += PAGE_SIZE * LRC_PPHWSP_PN; - ctx_obj = i915_gem_alloc_object(dev, context_size); + ctx_obj = i915_gem_alloc_object(engine->dev, context_size); if (!ctx_obj) { DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n"); return -ENOMEM; } - ringbuf = intel_engine_create_ringbuffer(ring, 4 * PAGE_SIZE); + ringbuf = intel_engine_create_ringbuffer(engine, 4 * PAGE_SIZE); if (IS_ERR(ringbuf)) { ret = PTR_ERR(ringbuf); goto error_deref_obj; } - ret = populate_lr_context(ctx, ctx_obj, ring, ringbuf); + ret = populate_lr_context(ctx, ctx_obj, engine, ringbuf); if (ret) { DRM_DEBUG_DRIVER("Failed to populate LRC: %d\n", ret); goto error_ringbuf; } - ctx->engine[ring->id].ringbuf = ringbuf; - ctx->engine[ring->id].state = ctx_obj; + ctx->engine[engine->id].ringbuf = ringbuf; + ctx->engine[engine->id].state = ctx_obj; - if (ctx != ring->default_context && ring->init_context) { + if (ctx != engine->default_context && engine->init_context) { struct drm_i915_gem_request *req; - ret = i915_gem_request_alloc(ring, - ctx, &req); + ret = i915_gem_request_alloc(engine, ctx, &req); if (ret) { DRM_ERROR("ring create req: %d\n", ret); goto error_ringbuf; } - ret = ring->init_context(req); + ret = engine->init_context(req); if (ret) { DRM_ERROR("ring init context: %d\n", ret); @@ -2326,8 +2323,8 @@ error_ringbuf: intel_ringbuffer_free(ringbuf); error_deref_obj: drm_gem_object_unreference(&ctx_obj->base); - ctx->engine[ring->id].ringbuf = NULL; - ctx->engine[ring->id].state = NULL; + ctx->engine[engine->id].ringbuf = NULL; + ctx->engine[engine->id].state = NULL; return ret; } diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index ae00e79c9c99..c437b61ac1d0 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1940,7 +1940,7 @@ intel_engine_create_ringbuffer(struct intel_engine_cs *engine, int size) return ERR_PTR(-ENOMEM); } - ring->ring = engine; + ring->engine = engine; list_add(&ring->link, &engine->buffers); ring->size = size; @@ -1975,40 +1975,40 @@ intel_ringbuffer_free(struct intel_ringbuffer *ring) kfree(ring); } -static int intel_init_ring_buffer(struct drm_device *dev, - struct intel_engine_cs *ring) +static int intel_init_engine(struct drm_device *dev, + struct intel_engine_cs *engine) { struct intel_ringbuffer *ringbuf; int ret; - WARN_ON(ring->buffer); + WARN_ON(engine->buffer); - ring->dev = dev; - ring->i915 = to_i915(dev); - ring->fence_context = fence_context_alloc(1); - INIT_LIST_HEAD(&ring->active_list); - INIT_LIST_HEAD(&ring->request_list); - INIT_LIST_HEAD(&ring->execlist_queue); - INIT_LIST_HEAD(&ring->buffers); - i915_gem_batch_pool_init(dev, &ring->batch_pool); - memset(ring->semaphore.sync_seqno, 0, sizeof(ring->semaphore.sync_seqno)); + engine->dev = dev; + engine->i915 = to_i915(dev); + engine->fence_context = fence_context_alloc(1); + INIT_LIST_HEAD(&engine->active_list); + INIT_LIST_HEAD(&engine->request_list); + INIT_LIST_HEAD(&engine->execlist_queue); + INIT_LIST_HEAD(&engine->buffers); + i915_gem_batch_pool_init(dev, &engine->batch_pool); + memset(engine->semaphore.sync_seqno, 0, sizeof(engine->semaphore.sync_seqno)); - intel_engine_init_breadcrumbs(ring); + intel_engine_init_breadcrumbs(engine); - ringbuf = intel_engine_create_ringbuffer(ring, 32 * PAGE_SIZE); + ringbuf = intel_engine_create_ringbuffer(engine, 32 * PAGE_SIZE); if (IS_ERR(ringbuf)) { ret = PTR_ERR(ringbuf); goto error; } - ring->buffer = ringbuf; + engine->buffer = ringbuf; if (I915_NEED_GFX_HWS(dev)) { - ret = init_status_page(ring); + ret = init_status_page(engine); if (ret) goto error; } else { - BUG_ON(ring->id != RCS); - ret = init_phys_status_page(ring); + BUG_ON(engine->id != RCS); + ret = init_phys_status_page(engine); if (ret) goto error; } @@ -2016,19 +2016,19 @@ static int intel_init_ring_buffer(struct drm_device *dev, ret = intel_pin_and_map_ringbuffer_obj(dev, ringbuf); if (ret) { DRM_ERROR("Failed to pin and map ringbuffer %s: %d\n", - ring->name, ret); + engine->name, ret); intel_destroy_ringbuffer_obj(ringbuf); goto error; } - ret = i915_cmd_parser_init_ring(ring); + ret = i915_cmd_parser_init_ring(engine); if (ret) goto error; return 0; error: - intel_cleanup_ring_buffer(ring); + intel_cleanup_ring_buffer(engine); return ret; } @@ -2612,7 +2612,7 @@ int intel_init_render_ring_buffer(struct drm_device *dev) ring->scratch.gtt_offset = i915_gem_obj_ggtt_offset(obj); } - ret = intel_init_ring_buffer(dev, ring); + ret = intel_init_engine(dev, ring); if (ret) return ret; @@ -2692,7 +2692,7 @@ int intel_init_bsd_ring_buffer(struct drm_device *dev) } ring->init_hw = init_ring_common; - return intel_init_ring_buffer(dev, ring); + return intel_init_engine(dev, ring); } /** @@ -2724,7 +2724,7 @@ int intel_init_bsd2_ring_buffer(struct drm_device *dev) } ring->init_hw = init_ring_common; - return intel_init_ring_buffer(dev, ring); + return intel_init_engine(dev, ring); } int intel_init_blt_ring_buffer(struct drm_device *dev) @@ -2780,7 +2780,7 @@ int intel_init_blt_ring_buffer(struct drm_device *dev) } ring->init_hw = init_ring_common; - return intel_init_ring_buffer(dev, ring); + return intel_init_engine(dev, ring); } int intel_init_vebox_ring_buffer(struct drm_device *dev) @@ -2830,7 +2830,7 @@ int intel_init_vebox_ring_buffer(struct drm_device *dev) } ring->init_hw = init_ring_common; - return intel_init_ring_buffer(dev, ring); + return intel_init_engine(dev, ring); } int diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index bc6ceb54b1f3..6bd9b356c95d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -101,7 +101,7 @@ struct intel_ringbuffer { struct drm_i915_gem_object *obj; void *virtual_start; - struct intel_engine_cs *ring; + struct intel_engine_cs *engine; struct list_head link; u32 head; -- 2.7.0.rc3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
