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

[Jani Nikula]

With the earlier changes this can just be removed.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index a5ffd92bb8f3..25ead23cd150 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -46,19 +46,12 @@
 #include <drm/drm_rect.h>
 
 #ifdef I915
-#include "intel_dvo.h"
-#include "intel_sdvo.h"
-#include "intel_tv.h"
-
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_object.h"
-
-#include "g4x_hdmi.h"
-#include "vlv_dsi_pll.h"
-#include "vlv_dsi_regs.h"
 #endif
 
 #include "g4x_dp.h"
+#include "g4x_hdmi.h"
 #include "hsw_ips.h"
 #include "i915_drv.h"
 #include "i915_reg.h"
@@ -91,6 +84,7 @@
 #include "intel_dpt.h"
 #include "intel_drrs.h"
 #include "intel_dsi.h"
+#include "intel_dvo.h"
 #include "intel_fb.h"
 #include "intel_fbc.h"
 #include "intel_fbdev.h"
@@ -116,8 +110,10 @@
 #include "intel_pps.h"
 #include "intel_psr.h"
 #include "intel_quirks.h"
+#include "intel_sdvo.h"
 #include "intel_snps_phy.h"
 #include "intel_tc.h"
+#include "intel_tv.h"
 #include "intel_vblank.h"
 #include "intel_vdsc.h"
 #include "intel_vdsc_regs.h"
@@ -128,6 +124,8 @@
 #include "skl_universal_plane.h"
 #include "skl_watermark.h"
 #include "vlv_dsi.h"
+#include "vlv_dsi_pll.h"
+#include "vlv_dsi_regs.h"
 #include "vlv_sideband.h"
 
 static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state);
@@ -7963,7 +7961,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 			intel_ddi_init(dev_priv, PORT_D);
 		if (found & SFUSE_STRAP_DDIF_DETECTED)
 			intel_ddi_init(dev_priv, PORT_F);
-#ifdef I915
 	} else if (HAS_PCH_SPLIT(dev_priv)) {
 		bool dpd_is_edp = false;
 		int found;
@@ -8102,7 +8099,6 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 
 		intel_crt_init(dev_priv);
 		intel_dvo_init(dev_priv);
-#endif
 	}
 
 	for_each_intel_encoder(&dev_priv->drm, encoder) {
-- 
2.39.2