From: Maarten Lankhorst <dev@xxxxxxxxxxxx>
The fence api specifies you should wait for fence to completion, not
give up after whatever timeout was originally configured. The fences
themselves should prevent the timeout from being indefinite.
Signed-off-by: Maarten Lankhorst <dev@xxxxxxxxxxxx>
---
.../gpu/drm/i915/display/intel_atomic_plane.c | 1 -
drivers/gpu/drm/i915/display/intel_display.c | 23 +------------------
2 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 6b3851d77b6d..ef553270c079 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -38,7 +38,6 @@
#include <drm/drm_blend.h>
#include <drm/drm_fourcc.h>
-#include "i915_config.h"
#include "i915_reg.h"
#include "intel_atomic_plane.h"
#include "intel_cdclk.h"
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 67cfc0eb1af5..28992f368b38 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -48,7 +48,6 @@
#include "g4x_dp.h"
#include "g4x_hdmi.h"
#include "hsw_ips.h"
-#include "i915_config.h"
#include "i915_drv.h"
#include "i915_reg.h"
#include "i915_utils.h"
@@ -7053,26 +7052,6 @@ void intel_atomic_helper_free_state_worker(struct work_struct *work)
intel_atomic_helper_free_state(dev_priv);
}
-static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_state)
-{
- struct drm_i915_private *i915 = to_i915(intel_state->base.dev);
- struct drm_plane *plane;
- struct drm_plane_state *new_plane_state;
- int ret, i;
-
- for_each_new_plane_in_state(&intel_state->base, plane, new_plane_state, i) {
- if (new_plane_state->fence) {
- ret = dma_fence_wait_timeout(new_plane_state->fence, false,
- i915_fence_timeout(i915));
- if (ret <= 0)
- break;
-
- dma_fence_put(new_plane_state->fence);
- new_plane_state->fence = NULL;
- }
- }
-}
-
static void intel_atomic_cleanup_work(struct work_struct *work)
{
struct intel_atomic_state *state =
@@ -7145,7 +7124,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state)
intel_wakeref_t wakeref = 0;
int i;
- intel_atomic_commit_fence_wait(state);
+ drm_atomic_helper_wait_for_fences(dev, &state->base, false);
drm_atomic_helper_wait_for_dependencies(&state->base);
drm_dp_mst_atomic_wait_for_dependencies(&state->base);
--
2.40.1
