Skip to contentSkip to conversation

drm/i915: Add a timeout to waiting for old reservation.

PATCH In review Maarten Lankhorst 3 participants 4 messages Jan 19, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Add a timeout to waiting for old reservation.

This prevents hangs in kms_flip. We should also either decrease I915_FENCE_TIMEOUT to 5s, or increase the timeouts in drm_atomic_helper.c to prevent errors like flip_done/hw_done timed out.

---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index e10f5518bb27..ce27b79a3665 100644
@@ -14788,7 +14788,7 @@ intel_prepare_plane_fb(struct drm_plane *plane,
 		if (needs_modeset(crtc_state)) {
 			ret = i915_sw_fence_await_reservation(&intel_state->commit_ready,
 							      old_obj->resv, NULL,
-							      false, 0,
+							      false, I915_FENCE_TIMEOUT,
 							      GFP_KERNEL);
 			if (ret < 0)
 				return ret;
Signature · 6 lines
2.7.4

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 5 lines · Maarten Lankhorst

This prevents hangs in kms_flip. We should also either decrease I915_FENCE_TIMEOUT to 5s, or increase the timeouts in drm_atomic_helper.c to prevent errors like flip_done/hw_done timed out.

This is a nak. This one *has* to wait until the previous i915 requests are complete, which is (supposed to be) guaranteed eventually. If later phases of a modeset are completing before any earlier phase, that sounds buggy.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Op 19-01-17 om 15:48 schreef Chris Wilson:

Quoted 10 lines · Maarten Lankhorst
Quoted 5 lines

This prevents hangs in kms_flip. We should also either decrease I915_FENCE_TIMEOUT to 5s, or increase the timeouts in drm_atomic_helper.c to prevent errors like flip_done/hw_done timed out.

This is a nak. This one *has* to wait until the previous i915 requests are complete, which is (supposed to be) guaranteed eventually. If later phases of a modeset are completing before any earlier phase, that sounds buggy.

drm_atomic_helper.c has some protection against buggy hardware in drm_atomic_helper_wait_for_dependencies,
where it waits for previous updates to complete. The problem is in kms_flip one of the tests does a dpms off with the gpu wedged, which means it has to wait for the full gpu reset to kick in. This will definitely take longer than 10s, so it times out and continues.

Of course the test is buggy now. What it did won't work any more with atomic doing a full modeset during dpms, but there's a real issue there and I'm uncertain of the solution.

~Maarten
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Add a timeout to waiting for old reservation.

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Add a timeout to waiting for old reservation.
URL : https://patchwork.freedesktop.org/series/18234/
State : failure

== Summary ==

Series 18234v1 drm/i915: Add a timeout to waiting for old reservation.
https://patchwork.freedesktop.org/api/1.0/series/18234/revisions/1/mbox/

Test gem_busy:

        Subgroup basic-busy-default:
                fail       -> PASS       (fi-ivb-3520m)
        Subgroup basic-hang-default:
                pass       -> FAIL       (fi-ivb-3520m)
Test kms_force_connector_basic:
        Subgroup prune-stale-modes:
                pass       -> DMESG-WARN (fi-snb-2520m)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-bxt-j4205)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> INCOMPLETE (fi-byt-n2820)
fi-bdw-5557u     total:246  pass:232  dwarn:0   dfail:0   fail:0   skip:14 
fi-bsw-n3050     total:246  pass:207  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:246  pass:223  dwarn:1   dfail:0   fail:0   skip:22 
fi-bxt-t5700     total:79   pass:66   dwarn:0   dfail:0   fail:0   skip:12 
fi-byt-j1900     total:246  pass:219  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:211  pass:179  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-hsw-4770r     total:246  pass:227  dwarn:0   dfail:0   fail:0   skip:19 
fi-ivb-3520m     total:246  pass:224  dwarn:0   dfail:0   fail:1   skip:21 
fi-ivb-3770      total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-kbl-7500u     total:246  pass:225  dwarn:0   dfail:0   fail:0   skip:21 
fi-skl-6260u     total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-skl-6700hq    total:246  pass:226  dwarn:0   dfail:0   fail:0   skip:20 
fi-skl-6700k     total:246  pass:222  dwarn:3   dfail:0   fail:0   skip:21 
fi-skl-6770hq    total:246  pass:233  dwarn:0   dfail:0   fail:0   skip:13 
fi-snb-2520m     total:246  pass:214  dwarn:1   dfail:0   fail:0   skip:31 
fi-snb-2600      total:246  pass:214  dwarn:0   dfail:0   fail:0   skip:32 

434c351793e1f4527b701ce297876c259ac98812 drm-tip: 2017y-01m-19d-13h-44m-18s UTC integration manifest f1347e6 drm/i915: Add a timeout to waiting for old reservation.

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3548/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx