[Intel-gfx] [PATCH] drm/i915: Move irqs enabled assertion deeper for mock breadcrumbs

[Chris Wilson]

Quoting Chris Wilson (2017-11-07 10:20:03)
> In order to allow the mock breadcrumbs tests to run without device irqs
> being enabled, move the intel_irqs_enabled() assert deeper to just
> before we commit to enabling the HW irq.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Matthew Auld <matthew.william.auld at gmail.com>

Ping? I hear rumours and rumblings of the selftests coming to town...
-Chris

> ---
>  drivers/gpu/drm/i915/intel_breadcrumbs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> index 4de054f8c1ba..43cf227a51c2 100644
> --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c
> +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c
> @@ -145,6 +145,8 @@ static void intel_breadcrumbs_fake_irq(struct timer_list *t)
>  
>  static void irq_enable(struct intel_engine_cs *engine)
>  {
> +       GEM_BUG_ON(!intel_irqs_enabled(engine->i915));
> +
>         /* Enabling the IRQ may miss the generation of the interrupt, but
>          * we still need to force the barrier before reading the seqno,
>          * just in case.
> @@ -266,8 +268,6 @@ static bool __intel_breadcrumbs_enable_irq(struct intel_breadcrumbs *b)
>         struct drm_i915_private *i915 = engine->i915;
>         bool enabled;
>  
> -       GEM_BUG_ON(!intel_irqs_enabled(i915));
> -
>         lockdep_assert_held(&b->irq_lock);
>         if (b->irq_armed)
>                 return false;
> -- 
> 2.15.0
>