[Intel-gfx] [PATCH] drm/i915/execlists: Move the GEM_BUG_ON context matches CSB later

[Mika Kuoppala]

Chris Wilson <chris at chris-wilson.co.uk> writes:

> Print out the current request/context before doing the GEM_BUG_ON, so
> that we can inspect the values in the ftrace.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Mika Kuoppala <mika.kuoppala at linux.intel.com>

Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/intel_lrc.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 9b6d781b22ec..2ad55c1ffd54 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -872,14 +872,15 @@ static void execlists_submission_tasklet(unsigned long data)
>  			GEM_BUG_ON(!execlists_is_active(execlists,
>  							EXECLISTS_ACTIVE_USER));
>  
> -			/* Check the context/desc id for this event matches */
> -			GEM_DEBUG_BUG_ON(buf[2 * head + 1] != port->context_id);
> -
>  			rq = port_unpack(port, &count);
>  			GEM_TRACE("%s out[0]: ctx=%d.%d, seqno=%x\n",
>  				  engine->name,
>  				  port->context_id, count,
>  				  rq ? rq->global_seqno : 0);
> +
> +			/* Check the context/desc id for this event matches */
> +			GEM_DEBUG_BUG_ON(buf[2 * head + 1] != port->context_id);
> +
>  			GEM_BUG_ON(count == 0);
>  			if (--count == 0) {
>  				GEM_BUG_ON(status & GEN8_CTX_STATUS_PREEMPTED);
> -- 
> 2.16.1