[Intel-gfx] [PATCH 09/17 v2] drm/i915: Expose two LRC functions for GuC submission mode

[Yu Dai]

On 06/25/2015 07:40 AM, Dave Gordon wrote:
> GuC submission is basically execlist submission, but with the GuC
> handling the actual writes to the ELSP and the resulting context
> switch interrupts. So to prepare a context for submission via the
> GuC, we need some of the same functions used in execlist mode.
> This commit exposes two such functions, changing their names to
> better describe what they do (they're related to logical ring
> contexts rather than to execlists per se).
>
> v2:
>      Replaces previous "drm/i915: Move execlists defines from .c to .h"
>
> Issue: VIZ-4884
> Signed-off-by: Dave Gordon <david.s.gordon at intel.com>
> ---
>   drivers/gpu/drm/i915/intel_lrc.c |   27 +++++++++++++--------------
>   drivers/gpu/drm/i915/intel_lrc.h |    5 +++++
>   2 files changed, 18 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index e5f4040..a77b22d 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -264,8 +264,8 @@ u32 intel_execlists_ctx_id(struct drm_i915_gem_object *ctx_obj)
>   	return lrca >> 12;
>   }
>   
> -static uint64_t execlists_ctx_descriptor(struct intel_engine_cs *ring,
> -					 struct drm_i915_gem_object *ctx_obj)
> +uint64_t intel_lr_context_descriptor(struct intel_engine_cs *ring,
> +				     struct drm_i915_gem_object *ctx_obj)
>   {
>   	struct drm_device *dev = ring->dev;
>   	uint64_t desc;
> @@ -306,13 +306,13 @@ static void execlists_elsp_write(struct intel_engine_cs *ring,
>   
>   	/* XXX: You must always write both descriptors in the order below. */
>   	if (ctx_obj1)
> -		temp = execlists_ctx_descriptor(ring, ctx_obj1);
> +		temp = intel_lr_context_descriptor(ring, ctx_obj1);
>   	else
>   		temp = 0;
>   	desc[1] = (u32)(temp >> 32);
>   	desc[0] = (u32)temp;
>   
> -	temp = execlists_ctx_descriptor(ring, ctx_obj0);
> +	temp = intel_lr_context_descriptor(ring, ctx_obj0);
>   	desc[3] = (u32)(temp >> 32);
>   	desc[2] = (u32)temp;
>   
> @@ -331,10 +331,10 @@ static void execlists_elsp_write(struct intel_engine_cs *ring,
>   	spin_unlock(&dev_priv->uncore.lock);
>   }
>   
> -static int execlists_update_context(struct drm_i915_gem_object *ctx_obj,
> -				    struct drm_i915_gem_object *ring_obj,
> -				    struct i915_hw_ppgtt *ppgtt,
> -				    u32 tail)
> +/* Update the ringbuffer pointer and tail offset in a saved context image */
> +void intel_lr_context_update(struct drm_i915_gem_object *ctx_obj,
> +			     struct drm_i915_gem_object *ring_obj,
> +			     u32 tail)
>   {
>   	struct page *page;
>   	uint32_t *reg_state;
> @@ -342,12 +342,11 @@ static int execlists_update_context(struct drm_i915_gem_object *ctx_obj,
>   	page = i915_gem_object_get_page(ctx_obj, 1);
>   	reg_state = kmap_atomic(page);
>   
> -	reg_state[CTX_RING_TAIL+1] = tail;
>   	reg_state[CTX_RING_BUFFER_START+1] = i915_gem_obj_ggtt_offset(ring_obj);
> +	if (tail != ~0u)
> +		reg_state[CTX_RING_TAIL+1] = tail;
I actually regret my original copycat of this function for guc. Because 
updating ring tail is moved to guc, there is no need to call this for 
each submission. Maybe we should split this call into two parts. The 
updating of ring buffer base is moved to where ring buffer is newly 
mapped. And the updating of tail is kept here for execlist submission only.

Alex