On Mon, Sep 15, 2014 at 11:41:19AM +0200, Daniel Vetter wrote: > Yet another place that wasn't properly transformed when implementing > SOix. While at it convert the checks to WARN_ON on gen5+ (since we > don't have UMS potentially doing stupid things on those platforms). > And also add the corresponding checks to the put functions (again with > a WARN_ON) for gen5+. > > Cc: Imre Deak <imre.deak@xxxxxxxxx> > Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx> > Cc: "Volkin, Bradley D" <bradley.d.volkin@xxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_lrc.c | 4 +++- > drivers/gpu/drm/i915/intel_ringbuffer.c | 23 ++++++++++++++--------- > 2 files changed, 17 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index bafd38b5703e..5fb61d76fd60 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -1063,7 +1063,7 @@ static bool gen8_logical_ring_get_irq(struct intel_engine_cs *ring) > struct drm_i915_private *dev_priv = dev->dev_private; > unsigned long flags; > > - if (!dev->irq_enabled) > + if (WARN_ON(!intel_irqs_enabled(dev_priv))) > return false; > > spin_lock_irqsave(&dev_priv->irq_lock, flags); > @@ -1082,6 +1082,8 @@ static void gen8_logical_ring_put_irq(struct intel_engine_cs *ring) > struct drm_i915_private *dev_priv = dev->dev_private; > unsigned long flags; > > + WARN_ON(!intel_irqs_enabled(dev_priv)); Please no. This would be a BUG(). -Chris -- Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
