[Intel-gfx] [PATCH 32/53] drm/i915: Update mi_set_context() to take a request structure

[Tomas Elf]

On 19/02/2015 17:17, John.C.Harrison at Intel.com wrote:
> From: John Harrison <John.C.Harrison at Intel.com>
>
> Updated mi_set_context() to take a request structure instead of a ring and
> context pair.
>
> For: VIZ-5115
> Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
> ---
>   drivers/gpu/drm/i915/i915_gem_context.c |    9 ++++-----
>   1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 475d1fd..9e66fac 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -472,10 +472,9 @@ i915_gem_context_get(struct drm_i915_file_private *file_priv, u32 id)
>   }
>
>   static inline int
> -mi_set_context(struct intel_engine_cs *ring,
> -	       struct intel_context *new_context,
> -	       u32 hw_flags)
> +mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)
>   {
> +	struct intel_engine_cs *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 */
> @@ -527,7 +526,7 @@ mi_set_context(struct intel_engine_cs *ring,
>
>   	intel_ring_emit(ring, MI_NOOP);
>   	intel_ring_emit(ring, MI_SET_CONTEXT);
> -	intel_ring_emit(ring, i915_gem_obj_ggtt_offset(new_context->legacy_hw_ctx.rcs_state) |
> +	intel_ring_emit(ring, i915_gem_obj_ggtt_offset(req->ctx->legacy_hw_ctx.rcs_state) |
>   			flags);
>   	/*
>   	 * w/a: MI_SET_CONTEXT must always be followed by MI_NOOP
> @@ -628,7 +627,7 @@ static int do_switch(struct drm_i915_gem_request *req)
>   	if (!to->legacy_hw_ctx.initialized || i915_gem_context_is_default(to))
>   		hw_flags |= MI_RESTORE_INHIBIT;
>
> -	ret = mi_set_context(req->ring, to, hw_flags);
> +	ret = mi_set_context(req, hw_flags);
>   	if (ret)
>   		goto unpin_out;
>
>

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

Thanks,
Tomas