[Intel-xe] [PATCH 3/8] Revert "drm/xe/display: Append dma_buf fences to framebuffer fences"

[Jouni Högander]

This reverts commit 7e0573248ae49ffcabe9d2cfb415292ae9a802bd.

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

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_atomic_plane.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 62b6108c4380..e90e96061f48 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -34,7 +34,6 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_blend.h>
 #include <drm/drm_fourcc.h>
-#include <drm/drm_gem_atomic_helper.h>
 
 #include "i915_config.h"
 #include "i915_reg.h"
@@ -1134,20 +1133,10 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
 
 	return ret;
 #else
-	int ret;
-
 	if (!intel_fb_obj(new_plane_state->hw.fb))
 		return 0;
 
-	ret = intel_plane_pin_fb(new_plane_state);
-	if (ret)
-		return ret;
-
-	ret = drm_gem_plane_helper_prepare_fb(_plane, _new_plane_state);
-	if (ret)
-		intel_plane_unpin_fb(new_plane_state);
-
-	return ret;
+	return intel_plane_pin_fb(new_plane_state);
 #endif
 }
 
-- 
2.34.1