[Intel-xe] [PATCH 2/8] Revert "FIXME: drm/i915: fence stuff"

[Jouni Högander]

This reverts commit 71d917d54a6083bea663977b4ff0b40b3a1faa94.

Next patch will backport common dma fence handling for Xe and i915 ->
revert temporary hack.

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_atomic.c   |  2 --
 drivers/gpu/drm/i915/display/intel_display.c  | 23 -------------------
 .../drm/i915/display/intel_display_types.h    |  2 --
 3 files changed, 27 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c
index f0f38a86b8ad..5d18145da279 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic.c
@@ -332,9 +332,7 @@ void intel_atomic_state_free(struct drm_atomic_state *_state)
 	drm_atomic_state_default_release(&state->base);
 	kfree(state->global_objs);
 
-#ifdef I915
 	i915_sw_fence_fini(&state->commit_ready);
-#endif
 
 	kfree(state);
 }
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9874025cb77e..d4b4334d0f6f 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -7056,7 +7056,6 @@ void intel_atomic_helper_free_state_worker(struct work_struct *work)
 
 static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_state)
 {
-#ifdef I915
 	struct wait_queue_entry wait_fence, wait_reset;
 	struct drm_i915_private *dev_priv = to_i915(intel_state->base.dev);
 
@@ -7080,24 +7079,6 @@ static void intel_atomic_commit_fence_wait(struct intel_atomic_state *intel_stat
 	finish_wait(bit_waitqueue(&to_gt(dev_priv)->reset.flags,
 				  I915_RESET_MODESET),
 		    &wait_reset);
-#else
-	struct intel_plane_state *plane_state;
-	struct intel_plane *plane;
-	int i;
-
-	for_each_new_intel_plane_in_state(intel_state, plane, plane_state, i) {
-		struct xe_bo *bo;
-
-		if (plane_state->uapi.fence)
-			dma_fence_wait(plane_state->uapi.fence, false);
-		bo = intel_fb_obj(plane_state->hw.fb);
-		if (!bo)
-			continue;
-
-		/* TODO: May deadlock, need to grab all fences in prepare_plane_fb */
-		dma_resv_wait_timeout(bo->ttm.base.resv, DMA_RESV_USAGE_KERNEL, false, MAX_SCHEDULE_TIMEOUT);
-	}
-#endif
 }
 
 static void intel_atomic_cleanup_work(struct work_struct *work)
@@ -7423,7 +7404,6 @@ static void intel_atomic_commit_work(struct work_struct *work)
 	intel_atomic_commit_tail(state);
 }
 
-#ifdef I915
 static int
 intel_atomic_commit_ready(struct i915_sw_fence *fence,
 			  enum i915_sw_fence_notify notify)
@@ -7449,7 +7429,6 @@ intel_atomic_commit_ready(struct i915_sw_fence *fence,
 
 	return NOTIFY_DONE;
 }
-#endif
 
 static void intel_atomic_track_fbs(struct intel_atomic_state *state)
 {
@@ -7473,11 +7452,9 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state,
 
 	state->wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);
 
-#ifdef I915
 	drm_atomic_state_get(&state->base);
 	i915_sw_fence_init(&state->commit_ready,
 			   intel_atomic_commit_ready);
-#endif
 
 	/*
 	 * The intel_legacy_cursor_update() fast path takes care
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 1861372077f0..df2681258ef1 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -672,9 +672,7 @@ struct intel_atomic_state {
 
 	bool rps_interactive;
 
-#ifdef I915
 	struct i915_sw_fence commit_ready;
-#endif
 
 	struct llist_node freed;
 };
-- 
2.34.1