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

[Jani Nikula]

CRT is now better abstracted. No longer needed.

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 859db9ead755..f701b75d1f37 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -46,7 +46,6 @@
 #include <drm/drm_rect.h>
 
 #ifdef I915
-#include "intel_crt.h"
 #include "intel_dvo.h"
 #include "intel_sdvo.h"
 #include "intel_tv.h"
@@ -75,6 +74,7 @@
 #include "intel_bw.h"
 #include "intel_cdclk.h"
 #include "intel_color.h"
+#include "intel_crt.h"
 #include "intel_crtc.h"
 #include "intel_crtc_state_dump.h"
 #include "intel_ddi.h"
@@ -7947,10 +7947,9 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		intel_ddi_init(dev_priv, PORT_E);
 	} else if (HAS_DDI(dev_priv)) {
 		u32 found;
-#ifdef I915
+
 		if (intel_ddi_crt_present(dev_priv))
 			intel_crt_init(dev_priv);
-#endif
 
 		/* Haswell uses DDI functions to detect digital outputs. */
 		found = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_INIT_DISPLAY_DETECTED;
diff --git a/drivers/gpu/drm/i915/display/intel_display_power_well.c b/drivers/gpu/drm/i915/display/intel_display_power_well.c
index 7cd52e545ae1..ddea30240a5b 100644
--- a/drivers/gpu/drm/i915/display/intel_display_power_well.c
+++ b/drivers/gpu/drm/i915/display/intel_display_power_well.c
@@ -8,6 +8,7 @@
 #include "intel_backlight_regs.h"
 #include "intel_combo_phy.h"
 #include "intel_combo_phy_regs.h"
+#include "intel_crt.h"
 #include "intel_de.h"
 #include "intel_display_power_well.h"
 #include "intel_display_types.h"
@@ -24,10 +25,6 @@
 #include "vlv_sideband.h"
 #include "vlv_sideband_reg.h"
 
-#ifdef I915
-#include "intel_crt.h"
-#endif
-
 struct i915_power_well_regs {
 	i915_reg_t bios;
 	i915_reg_t driver;
-- 
2.39.2