drm/i915: vlv: fix IRQ masking when uninstalling interrupts
Subsystems (2)
PATCH 1/1 drm/i915: vlv: fix IRQ masking when uninstalling interrupts
irq_mask should include all IRQ bits that we want to mask, but atm we set it incorrectly to the inverse of this. If the mask is used subsequently to enable/disable some IRQ bits, we may unintentionally unmask unrelated IRQs. I can't see any way that this can lead to a real problem in the current -nightly code, since the first place the mask will be used next (after a suspend/resume cycle) is in valleyview_irq_postinstall(), but the mask is reset there to its proper value.
This causes a problem in the upstream kernel though, where - due to another issue - the mask is used in the above way to disable only the display IRQs. This other issue is fixed by:
commit 950eabaf5a87257040e0c207be09487954113f54
Author: Imre Deak <[email protected]> Date: Mon Sep 8 15:21:09 2014 +0300
drm/i915: vlv: fix display IRQ enable/disable
Interestingly, even with the above two bugs, we shouldn't in theory have any real problems (arguably a famous last sentence:). That's because even if we unmask something unintentionally via the VLV_IMR/VLV_IER register the master IRQ masking bit in VLV_MASTER_IER is still set and should prevent all i915 interrupts. According to my testing on an ASUS T100 with DSI output this isn't the case at least with the MIPIA_INTERRUPT. Leaving this one unmasked in IMR/IER, while having VLV_MASTER_IER set to 0 may lead to a lockup during system suspend as shown in the bugzilla ticket below. This fix should get rid of the problem reported there in upstream and older kernels.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85920
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -3597,7 +3597,7 @@ static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)vlv_display_irq_reset (dev_priv); - dev_priv->irq_mask =0 ; + dev_priv->irq_mask = ~0 ; }static void valleyview_irq_uninstall (struct drm_device *dev)
Signature · 1 line
1.8.4
Quoted 42 lines · Imre Deak
irq_maskshould include all IRQ bits that we want to mask, but atm we set it incorrectly to the inverse of this. If the mask is used subsequently to enable/disable some IRQ bits, we may unintentionally unmask unrelated IRQs. I can't see any way that this can lead to a real problem in the current -nightly code, since the first place the mask will be used next (after a suspend/resume cycle) is invalleyview_irq_postinstall(), but the mask is reset there to its proper value.This causes a problem in the upstream kernel though, where - due to another issue - the mask is used in the above way to disable only the display IRQs. This other issue is fixed by:
commit
950eabaf5a87257040e0c207be09487954113f54Author: Imre Deak <[email protected]> Date: Mon Sep 8 15:21:09 2014 +0300drm/i915: vlv: fix display IRQ enable/disable
Interestingly, even with the above two bugs, we shouldn't in theory have any real problems (arguably a famous last sentence:). That's because even if we unmask something unintentionally via the VLV_IMR/VLV_IER register the master IRQ masking bit in
VLV_MASTER_IERis still set and should prevent all i915 interrupts. According to my testing on an ASUS T100 with DSI output this isn't the case at least with theMIPIA_INTERRUPT. Leaving this one unmasked in IMR/IER, while havingVLV_MASTER_IERset to 0 may lead to a lockup during system suspend as shown in the bugzilla ticket below. This fix should get rid of the problem reported there in upstream and older kernels.Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85920
Cc [email protected] (v3.15+)Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +0
-0
drivers/gpu/drm/i915/i915_irq.c static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv) · line 3600
Quoted 5 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -3597,7 +3597,7 @@ static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)vlv_display_irq_reset (dev_priv); - dev_priv->irq_mask =0 ; + dev_priv->irq_mask = ~0 ;
vlv seems to be the only platform which resets irq masks in the uninstall hook. That smells fishy - can't we just remove this completely? -Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 44 lines · Daniel Vetter
Quoted 43 lines · Imre Deak
irq_maskshould include all IRQ bits that we want to mask, but atm we set it incorrectly to the inverse of this. If the mask is used subsequently to enable/disable some IRQ bits, we may unintentionally unmask unrelated IRQs. I can't see any way that this can lead to a real problem in the current -nightly code, since the first place the mask will be used next (after a suspend/resume cycle) is invalleyview_irq_postinstall(), but the mask is reset there to its proper value.This causes a problem in the upstream kernel though, where - due to another issue - the mask is used in the above way to disable only the display IRQs. This other issue is fixed by:
commit
950eabaf5a87257040e0c207be09487954113f54Author: Imre Deak <[email protected]> Date: Mon Sep 8 15:21:09 2014 +0300drm/i915: vlv: fix display IRQ enable/disable
Interestingly, even with the above two bugs, we shouldn't in theory have any real problems (arguably a famous last sentence:). That's because even if we unmask something unintentionally via the VLV_IMR/VLV_IER register the master IRQ masking bit in
VLV_MASTER_IERis still set and should prevent all i915 interrupts. According to my testing on an ASUS T100 with DSI output this isn't the case at least with theMIPIA_INTERRUPT. Leaving this one unmasked in IMR/IER, while havingVLV_MASTER_IERset to 0 may lead to a lockup during system suspend as shown in the bugzilla ticket below. This fix should get rid of the problem reported there in upstream and older kernels.Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85920
Cc [email protected] (v3.15+)Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +0
-0@@ -3597,7 +3597,7 @@ static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)
Quoted 7 lines
drivers/gpu/drm/i915/i915_irq.c static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv) · line 3600
Quoted 4 lines
drivers/gpu/drm/i915/i915_irq.c +1
-1vlv_display_irq_reset (dev_priv); - dev_priv->irq_mask =0 ; + dev_priv->irq_mask = ~0 ;vlv seems to be the only platform which resets irq masks in the uninstall hook. That smells fishy - can't we just remove this completely?
Yes, we can look into removing it. But on older kernels the irq_mask was used in the way I described in the commit log, so I'd suggest this fix for -stable at least, together with commit 950eabaf5 which isn't upstream yet.
Quoted 1 line
-Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: vlv: fix IRQ masking when
In reply to Imre Deak-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 367/367 367/367
ILK +2 373/375 375/375 SNB -1 450/450 449/450 IVB -2 503/503 501/503
BYT 289/289 289/289
HSW -3 567/567 564/567
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
ILK igt_kms_flip_flip-vs-panning NSPT(1, M26) PASS(2, M37) ILK igt_kms_flip_nonexisting-fb DMESG_WARN(1, M26) PASS(2, M37) SNB igt_kms_rotation_crc_sprite-rotation PASS(1, M35) DMESG_WARN(1, M22)PASS(1, M22) IVB igt_gem_bad_reloc_negative-reloc PASS(1, M21) NSPT(2, M21) IVB igt_gem_bad_reloc_negative-reloc-lut PASS(1, M21) NSPT(1, M21)PASS(1, M21) HSW igt_gem_bad_reloc_negative-reloc-lut PASS(1, M19) NSPT(2, M40) HSW igt_kms_rotation_crc_primary-rotation PASS(1, M19) DMESG_WARN(1, M40)PASS(1, M40) HSW igt_pm_rc6_residency_rc6-accuracy PASS(1, M19) FAIL(1, M40)PASS(1, M40)
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 30 lines · Imre Deak
irq_maskshould include all IRQ bits that we want to mask, but atm we set it incorrectly to the inverse of this. If the mask is used subsequently to enable/disable some IRQ bits, we may unintentionally unmask unrelated IRQs. I can't see any way that this can lead to a real problem in the current -nightly code, since the first place the mask will be used next (after a suspend/resume cycle) is invalleyview_irq_postinstall(), but the mask is reset there to its proper value.This causes a problem in the upstream kernel though, where - due to another issue - the mask is used in the above way to disable only the display IRQs. This other issue is fixed by:
commit
950eabaf5a87257040e0c207be09487954113f54Author: Imre Deak <[email protected]> Date: Mon Sep 8 15:21:09 2014 +0300drm/i915: vlv: fix display IRQ enable/disable
Interestingly, even with the above two bugs, we shouldn't in theory have any real problems (arguably a famous last sentence:). That's because even if we unmask something unintentionally via the VLV_IMR/VLV_IER register the master IRQ masking bit in
VLV_MASTER_IERis still set and should prevent all i915 interrupts. According to my testing on an ASUS T100 with DSI output this isn't the case at least with theMIPIA_INTERRUPT. Leaving this one unmasked in IMR/IER, while havingVLV_MASTER_IERset to 0 may lead to a lockup during system suspend as shown in the bugzilla ticket below. This fix should get rid of the problem reported there in upstream and older kernels.
Quoted 3 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85920
Cc [email protected] (v3.15+)Signed-off-by Imre Deak <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -3597,7 +3597,7 @@ static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)vlv_display_irq_reset (dev_priv); - dev_priv->irq_mask =0 ; + dev_priv->irq_mask = ~0 ; }static void valleyview_irq_uninstall (struct drm_device *dev)Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 31 lines · Ville Syrjälä
Quoted 30 lines · Imre Deak
irq_maskshould include all IRQ bits that we want to mask, but atm we set it incorrectly to the inverse of this. If the mask is used subsequently to enable/disable some IRQ bits, we may unintentionally unmask unrelated IRQs. I can't see any way that this can lead to a real problem in the current -nightly code, since the first place the mask will be used next (after a suspend/resume cycle) is invalleyview_irq_postinstall(), but the mask is reset there to its proper value.This causes a problem in the upstream kernel though, where - due to another issue - the mask is used in the above way to disable only the display IRQs. This other issue is fixed by:
commit
950eabaf5a87257040e0c207be09487954113f54Author: Imre Deak <[email protected]> Date: Mon Sep 8 15:21:09 2014 +0300drm/i915: vlv: fix display IRQ enable/disable
Interestingly, even with the above two bugs, we shouldn't in theory have any real problems (arguably a famous last sentence:). That's because even if we unmask something unintentionally via the VLV_IMR/VLV_IER register the master IRQ masking bit in
VLV_MASTER_IERis still set and should prevent all i915 interrupts. According to my testing on an ASUS T100 with DSI output this isn't the case at least with theMIPIA_INTERRUPT. Leaving this one unmasked in IMR/IER, while havingVLV_MASTER_IERset to 0 may lead to a lockup during system suspend as shown in the bugzilla ticket below. This fix should get rid of the problem reported there in upstream and older kernels.
Quoted 5 lines
Quoted 3 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85920
Cc [email protected] (v3.15+)Signed-off-by Imre Deak <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>
Pushed to drm-intel-next-fixes, thanks for the patch and review.
BR,
Jani.
Quoted 33 lines
Quoted 25 lines
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -3597,7 +3597,7 @@ static void vlv_display_irq_uninstall(struct drm_i915_private *dev_priv)vlv_display_irq_reset (dev_priv); - dev_priv->irq_mask =0 ; + dev_priv->irq_mask = ~0 ; }static void valleyview_irq_uninstall (struct drm_device *dev)Signature · 6 lines
1.8.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center