drm/i915: Don't call intel_prepare_page_flip() multiple times on gen2-4
Subsystems (2)
PATCH 1/1 drm/i915: Don't call intel_prepare_page_flip() multiple times on gen2-4
From: Ville Syrjälä <[email protected]>
The flip stall detector kicks in when pending>=INTEL_FLIP_COMPLETE. That means if we first call intel_prepare_page_flip() but don't call intel_finish_page_flip(), the next stall check will erroneosly think the page flip was somehow stuck.
With enough debug spew emitted from the interrupt handler my 830 hangs when this happens. My theory is that the previous vblank interrupt gets sufficiently delayed that the handler will see the pending bit set in IIR, but ISR still has the bit set as well (ie. the flip was processed by CS but didn't complete yet). In this case the handler will proceed to call intel_check_page_flip() immediately after intel_prepare_page_flip(). It then tries to print a backtrace for the stuck flip WARN, which apparetly results in way too much debug spew delaying interrupt processing further. That then seems to cause an endless loop in the interrupt handler, and the machine is dead until the watchdog kicks in and reboots. At least limiting the number of iterations of the loop in the interrupt handler also prevented the hang.
So it seems better to not call intel_prepare_page_flip() without immediately calling intel_finish_page_flip(). The IIR/ISR trickery avoids races here so this is a perfectly safe thing to do.
v2: Fix typo in commit message (checkpatch)
Cc: [email protected]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88381
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85888
--- drivers/gpu/drm/i915/i915_irq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_irq.c +2 -4
@@ -3731,8 +3731,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if ((iir & flip_pending) ==0 ) goto check_page_flip; -intel_prepare_page_flip (dev, plane); -/* We detect FlipDone by looking for the change in PendingFlip from '1' * to '0' on the following vblank, i.e. IIR has the Pendingflip * asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence
@@ -3742,6 +3740,7 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; +intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
@@ -3913,8 +3912,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if ((iir & flip_pending) ==0 ) goto check_page_flip; -intel_prepare_page_flip (dev, plane); -/* We detect FlipDone by looking for the change in PendingFlip from '1' * to '0' on the following vblank, i.e. IIR has the Pendingflip * asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence
@@ -3924,6 +3921,7 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; +intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;
Signature · 1 line
2.0.4
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 364/364 364/364
ILK +1 364/366 365/366
SNB 448/450 448/450 IVB 497/498 497/498 BYT 289/289 289/289 HSW 563/564 563/564 BDW 416/417 416/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
ILK igt_kms_flip_bcs-flip-vs-modeset-interruptible DMESG_WARN(1, M26)PASS(4, M37M26) PASS(1, M37)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · On Wed, 17 Dec 2014, [email protected] wrote:
From: Ville Syrjälä <[email protected]>
The flip stall detector kicks in when pending>=INTEL_FLIP_COMPLETE. That means if we first call
intel_prepare_page_flip()but don't callintel_finish_page_flip(), the next stall check will erroneosly think the page flip was somehow stuck.With enough debug spew emitted from the interrupt handler my 830 hangs when this happens. My theory is that the previous vblank interrupt gets sufficiently delayed that the handler will see the pending bit set in IIR, but ISR still has the bit set as well (ie. the flip was processed by CS but didn't complete yet). In this case the handler will proceed to call
intel_check_page_flip()immediately afterintel_prepare_page_flip(). It then tries to print a backtrace for the stuck flip WARN, which apparetly results in way too much debug spew delaying interrupt processing further. That then seems to cause an endless loop in the interrupt handler, and the machine is dead until the watchdog kicks in and reboots. At least limiting the number of iterations of the loop in the interrupt handler also prevented the hang.So it seems better to not call
intel_prepare_page_flip()without immediately callingintel_finish_page_flip(). The IIR/ISR trickery avoids races here so this is a perfectly safe thing to do.
Quoted 7 lines
v2: Fix typo in commit message (checkpatch)
Cc: [email protected]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88381
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=85888Reviewed-by Chris Wilson <[email protected]>Signed-off-by Ville Syrjälä <[email protected]>
Pushed to drm-intel-next-fixes, thanks for the patch and review.
BR,
Jani.
Quoted 49 lines
--- drivers/gpu/drm/i915/i915_irq.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_irq.c +2
-4@@ -3731,8 +3731,6 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if ((iir & flip_pending) ==0 ) goto check_page_flip; -intel_prepare_page_flip (dev, plane); -/* We detect FlipDone by looking for the change in PendingFlip from '1' * to '0' on the following vblank, i.e. IIR has the Pendingflip * asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence @@ -3742,6 +3740,7 @@ static bool i8xx_handle_vblank(struct drm_device *dev,if (I915_READ16 (ISR ) & flip_pending) goto check_page_flip; +intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;@@ -3913,8 +3912,6 @@ static bool i915_handle_vblank(struct drm_device *dev,if ((iir & flip_pending) ==0 ) goto check_page_flip; -intel_prepare_page_flip (dev, plane); -/* We detect FlipDone by looking for the change in PendingFlip from '1' * to '0' on the following vblank, i.e. IIR has the Pendingflip * asserted following the MI_DISPLAY_FLIP, but ISR is deasserted, hence @@ -3924,6 +3921,7 @@ static bool i915_handle_vblank(struct drm_device *dev,if (I915_READ (ISR ) & flip_pending) goto check_page_flip; +intel_prepare_page_flip (dev, plane);intel_finish_page_flip (dev, pipe);return true;Signature · 6 lines
2.0.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center