drm/i915: vlv: fix display IRQ enable/disable
Subsystems (2)
PATCH 1/1 drm/i915: vlv: fix display IRQ enable/disable
We want to enable/disable display IRQs only if global i915 IRQs are enabled. To check the latter it's not enough to consult the DRM dev->irq_enabled flag, since runtime PM can disable/enable IRQs and it won't adjust this flag only the i915 specific dev_priv->pm._irqs_disabled flag. Fix this by using the proper intel_irqs_enabled() helper instead.
Fortunately this didn't cause an actual problem since even if we enabled display IRQs too early (before enabling global i915 IRQs) the VLV_MASTER_IER would still be clear masking all IRQs.
This issue was caught by
commit 920dd15a2b2fc60d054646a8a1ffd6aeb6090e05
Author: Daniel Vetter <[email protected]> Date: Wed Aug 27 10:43:37 2014 +0200
drm/i915: WARN if interrupts aren't on in en/disable_pipestat
--- drivers/gpu/drm/i915/i915_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +2 -2
@@ -3723,7 +3723,7 @@ void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv) dev_priv->display_irqs_enabled = true; -if (dev_priv->dev->irq_enabled) +if (intel_irqs_enabled (dev_priv))valleyview_display_irqs_install (dev_priv); }
@@ -3736,7 +3736,7 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv) dev_priv->display_irqs_enabled = false; -if (dev_priv->dev->irq_enabled) +if (intel_irqs_enabled (dev_priv))valleyview_display_irqs_uninstall (dev_priv); }
Signature · 1 line
1.8.4
Daniel Vetter
AppliedQuoted 13 lines · Imre Deak
We want to enable/disable display IRQs only if global i915 IRQs are enabled. To check the latter it's not enough to consult the DRM
dev->irq_enabledflag, since runtime PM can disable/enable IRQs and it won't adjust this flag only the i915 specificdev_priv->pm._irqs_disabledflag. Fix this by using the properintel_irqs_enabled()helper instead.Fortunately this didn't cause an actual problem since even if we enabled display IRQs too early (before enabling global i915 IRQs) the
VLV_MASTER_IERwould still be clear masking all IRQs.This issue was caught by
Quoted 7 lines
commit
920dd15a2b2fc60d054646a8a1ffd6aeb6090e05Author: Daniel Vetter <[email protected]> Date: Wed Aug 27 10:43:37 2014 +0200drm/i915: WARN if interrupts aren't on in en/disable_pipestat
Signed-off-by Imre Deak <[email protected]>
Please cc relevant people next time around, for this Jesse (since this all goes down to his soix enabling). Thanks for the patch, yours here is better than the one I've just posted in response to prts.
Queued for -next, thanks for the patch.
-Daniel
Quoted 33 lines
--- drivers/gpu/drm/i915/i915_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/i915_irq.c +2
-2@@ -3723,7 +3723,7 @@ void valleyview_enable_display_irqs(struct drm_i915_private *dev_priv) dev_priv->display_irqs_enabled = true; -if (dev_priv->dev->irq_enabled) +if (intel_irqs_enabled (dev_priv))valleyview_display_irqs_install (dev_priv); }@@ -3736,7 +3736,7 @@ void valleyview_disable_display_irqs(struct drm_i915_private *dev_priv) dev_priv->display_irqs_enabled = false; -if (dev_priv->dev->irq_enabled) +if (intel_irqs_enabled (dev_priv))valleyview_display_irqs_uninstall (dev_priv); }Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch