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

[Jani Nikula]

Remove unnecessary ifdefs.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c       | 2 --
 drivers/gpu/drm/i915/display/intel_display_core.h  | 4 ----
 drivers/gpu/drm/i915/display/intel_display_types.h | 7 +------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index c6605649a92f..92042e7fcfb4 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -3888,7 +3888,6 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
 					 struct intel_crtc_state *pipe_config,
 					 struct intel_display_power_domain_set *power_domain_set)
 {
-#ifdef I915
 	struct drm_device *dev = crtc->base.dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
 	enum transcoder cpu_transcoder;
@@ -3927,7 +3926,6 @@ static bool bxt_get_dsi_transcoder_state(struct intel_crtc *crtc,
 		pipe_config->cpu_transcoder = cpu_transcoder;
 		break;
 	}
-#endif
 
 	return transcoder_is_dsi(pipe_config->cpu_transcoder);
 }
diff --git a/drivers/gpu/drm/i915/display/intel_display_core.h b/drivers/gpu/drm/i915/display/intel_display_core.h
index cc058eb303ee..e4da8902c878 100644
--- a/drivers/gpu/drm/i915/display/intel_display_core.h
+++ b/drivers/gpu/drm/i915/display/intel_display_core.h
@@ -249,13 +249,11 @@ struct intel_wm {
 	u16 skl_latency[8];
 
 	/* current hardware state */
-#ifdef I915
 	union {
 		struct ilk_wm_values hw;
 		struct vlv_wm_values vlv;
 		struct g4x_wm_values g4x;
 	};
-#endif
 
 	u8 num_levels;
 
@@ -301,12 +299,10 @@ struct intel_display {
 	} funcs;
 
 	/* Grouping using anonymous structs. Keep sorted. */
-#ifdef I915
 	struct intel_atomic_helper {
 		struct llist_head free_list;
 		struct work_struct free_work;
 	} atomic_helper;
-#endif
 
 	struct {
 		/* backlight registers and fields in struct intel_panel */
diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index d22cc99966c5..fc798734f8d6 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -867,7 +867,6 @@ struct skl_pipe_wm {
 	bool use_sagv_wm;
 };
 
-#ifdef I915
 enum vlv_wm_level {
 	VLV_WM_LEVEL_PM2,
 	VLV_WM_LEVEL_PM5,
@@ -901,7 +900,6 @@ struct g4x_wm_state {
 	bool hpll_en;
 	bool fbc_en;
 };
-#endif
 
 struct intel_crtc_wm_state {
 	union {
@@ -945,7 +943,7 @@ struct intel_crtc_wm_state {
 			/* pre-icl: for planar Y */
 			struct skl_ddb_entry plane_ddb_y[I915_MAX_PLANES];
 		} skl;
-#ifdef I915
+
 		struct {
 			struct g4x_pipe_wm raw[NUM_VLV_WM_LEVELS]; /* not inverted */
 			struct vlv_wm_state intermediate; /* inverted */
@@ -958,7 +956,6 @@ struct intel_crtc_wm_state {
 			struct g4x_wm_state intermediate;
 			struct g4x_wm_state optimal;
 		} g4x;
-#endif
 	};
 
 	/*
@@ -1411,7 +1408,6 @@ struct intel_crtc {
 	bool pch_fifo_underrun_disabled;
 
 	/* per-pipe watermark state */
-#ifdef I915
 	struct {
 		/* watermarks currently being used  */
 		union {
@@ -1420,7 +1416,6 @@ struct intel_crtc {
 			struct g4x_wm_state g4x;
 		} active;
 	} wm;
-#endif
 
 	struct {
 		struct mutex mutex;
-- 
2.39.2