[Intel-gfx] [PATCH] drm/i915: Add a timeout to waiting for old reservation.

[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.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e10f5518bb27..ce27b79a3665 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -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;
-- 
2.7.4