Re: [PATCH 25/53] drm/i915: Update init_context() to take a request structure

Tomas Elf
2015-03-05T18:38:20Z

On 19/02/2015 17:17, John.C.Harrison@Intel.com wrote:
> From: John Harrison <John.C.Harrison@Intel.com>
>
> Now that everything above has been converted to use requests, it is possible to
> update init_context() to take a request pointer instead of a ring/context pair.
>
> For: VIZ-5115
> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
> ---
> drivers/gpu/drm/i915/i915_gem_context.c | 4 ++--
> drivers/gpu/drm/i915/intel_lrc.c | 9 ++++-----
> drivers/gpu/drm/i915/intel_ringbuffer.c | 7 +++----
> drivers/gpu/drm/i915/intel_ringbuffer.h | 3 +--
> 4 files changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index eedb994..938cd26 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -412,7 +412,7 @@ int i915_gem_context_enable(struct drm_i915_gem_request *req)
> if (ring->init_context == NULL)
> return 0;
>
> - ret = ring->init_context(req->ring, ring->default_context);
> + ret = ring->init_context(req);
> } else
> ret = i915_switch_context(req);
>
> @@ -678,7 +678,7 @@ done:
>
> if (uninitialized) {
> if (ring->init_context) {
> - ret = ring->init_context(req->ring, to);
> + ret = ring->init_context(req);
> if (ret)
> DRM_ERROR("ring init context: %d\n", ret);
> }
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 4bcb70e..cbec056 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -1376,16 +1376,15 @@ out:
> return ret;
> }
>
> -static int gen8_init_rcs_context(struct intel_engine_cs *ring,
> - struct intel_context *ctx)
> +static int gen8_init_rcs_context(struct drm_i915_gem_request *req)
> {
> int ret;
>
> - ret = intel_logical_ring_workarounds_emit(ring, ctx);
> + ret = intel_logical_ring_workarounds_emit(req->ring, req->ctx);
> if (ret)
> return ret;
>
> - return intel_lr_context_render_state_init(ring, ctx);
> + return intel_lr_context_render_state_init(req->ring, req->ctx);
> }
>
> /**
> @@ -1936,7 +1935,7 @@ int intel_lr_context_deferred_create(struct intel_context *ctx,
> if (ret)
> return ret;
>
> - ret = ring->init_context(req->ring, ctx);
> + ret = ring->init_context(req);
> if (ret) {
> DRM_ERROR("ring init context: %d\n", ret);
> i915_gem_request_unreference(req);
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 05a7e33..26964a2 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -775,16 +775,15 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
> return 0;
> }
>
> -static int intel_rcs_ctx_init(struct intel_engine_cs *ring,
> - struct intel_context *ctx)
> +static int intel_rcs_ctx_init(struct drm_i915_gem_request *req)
> {
> int ret;
>
> - ret = intel_ring_workarounds_emit(ring, ctx);
> + ret = intel_ring_workarounds_emit(req->ring, req->ctx);
> if (ret != 0)
> return ret;
>
> - ret = i915_gem_render_state_init(ring);
> + ret = i915_gem_render_state_init(req->ring);
> if (ret)
> DRM_ERROR("init render state: %d\n", ret);
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
> index 4f8a14a..c32f5a1 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.h
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
> @@ -143,8 +143,7 @@ struct intel_engine_cs {
>
> int (*init_hw)(struct intel_engine_cs *ring);
>
> - int (*init_context)(struct intel_engine_cs *ring,
> - struct intel_context *ctx);
> + int (*init_context)(struct drm_i915_gem_request *req);
>
> void (*write_tail)(struct intel_engine_cs *ring,
> u32 value);
>

Reviewed-by: Tomas Elf <tomas.elf@intel.com>

Thanks,
Tomas