[Intel-xe] [PATCH 8/8] fixup! FIXME: drm/i915/display: Remaining changes to make xe compile
Jouni Högander
jouni.hogander at intel.com
Mon Nov 6 06:48:34 UTC 2023
Now as we have common dma fence handling for i915 and Xe we don't need to
have differing intel_prepare_plane_fb implementations.
Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 563b70f6a0c7..77e281bf4cb5 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -1072,7 +1072,6 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
{
struct intel_plane_state *new_plane_state =
to_intel_plane_state(_new_plane_state);
-#ifdef I915
struct i915_sched_attr attr = { .priority = I915_PRIORITY_DISPLAY };
struct intel_plane *plane = to_intel_plane(_plane);
struct intel_atomic_state *state =
@@ -1143,12 +1142,6 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
intel_plane_unpin_fb(new_plane_state);
return ret;
-#else
- if (!intel_fb_obj(new_plane_state->hw.fb))
- return 0;
-
- return intel_plane_pin_fb(new_plane_state);
-#endif
}
/**
--
2.34.1
More information about the Intel-xe
mailing list