[Intel-gfx] [PATCH] drm/i915/execlists: Detect cross-contamination with GuC

[Tvrtko Ursulin]

On 18/06/2019 12:07, Chris Wilson wrote:
> The process_csb routine from execlists_submission is incompatible with
> the GuC backend. Add a warning to detect if we accidentally end up in
> the wrong spot.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> ---
>   drivers/gpu/drm/i915/gt/intel_lrc.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index c400c66d0ee5..bbe6ece9b010 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -1169,6 +1169,7 @@ static void process_csb(struct intel_engine_cs *engine)
>   	u8 head, tail;
>   
>   	lockdep_assert_held(&engine->active.lock);
> +	GEM_BUG_ON(USES_GUC_SUBMISSION(engine->i915));
>   
>   	/*
>   	 * Note that csb_write, csb_status may be either in HWSP or mmio.
> 

I assume it somehow and somewhere happened or you wouldn't be adding the 
assert?

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko