[Intel-xe] [PATCH 09/21] fixup! drm/i915/display: Remaining changes to make xe compile

[Jani Nikula]

Remove i9xx_plane.h related ifdefs

With the conditional build for i9xx_plane.h this is no longer needed.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_crtc.c    | 6 +-----
 drivers/gpu/drm/i915/display/intel_display.c | 5 -----
 drivers/gpu/drm/i915/display/intel_sprite.c  | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index d3c6542de3d7..df363ffd939c 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -14,8 +14,8 @@
 #include "i915_irq.h"
 #ifdef I915
 #include "i915_vgpu.h"
-#include "i9xx_plane.h"
 #endif
+#include "i9xx_plane.h"
 #include "icl_dsi.h"
 #include "intel_atomic.h"
 #include "intel_atomic_plane.h"
@@ -310,11 +310,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
 		primary = skl_universal_plane_create(dev_priv, pipe,
 						     PLANE_PRIMARY);
 	else
-#ifdef I915
 		primary = intel_primary_plane_create(dev_priv, pipe);
-#else
-		BUG_ON(1);
-#endif
 	if (IS_ERR(primary)) {
 		ret = PTR_ERR(primary);
 		goto fail;
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9c80292e5666..cb14c201cc17 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -57,7 +57,6 @@
 
 #include "g4x_dp.h"
 #include "g4x_hdmi.h"
-#include "i9xx_plane.h"
 #include "vlv_dsi.h"
 #include "vlv_dsi_pll.h"
 #include "vlv_dsi_regs.h"
@@ -8294,10 +8293,6 @@ static const struct intel_display_funcs skl_display_funcs = {
 	.get_initial_plane_config = skl_get_initial_plane_config,
 };
 
-#ifndef I915
-#define i9xx_get_initial_plane_config skl_get_initial_plane_config
-#endif
-
 static const struct intel_display_funcs ddi_display_funcs = {
 	.get_pipe_config = hsw_get_pipe_config,
 	.crtc_enable = hsw_crtc_enable,
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index e8564fdd8930..69603563f741 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -43,9 +43,9 @@
 
 #ifdef I915
 #include "i915_vgpu.h"
-#include "i9xx_plane.h"
 #endif
 
+#include "i9xx_plane.h"
 #include "intel_atomic_plane.h"
 #include "intel_de.h"
 #include "intel_display_types.h"
-- 
2.39.2