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

[Jani Nikula]

intel_pch_display.h ifdef cleanup

To be replaced with better conditional build.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_pch_display.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_pch_display.h b/drivers/gpu/drm/i915/display/intel_pch_display.h
index e8b50e9a4969..41a63413cb3d 100644
--- a/drivers/gpu/drm/i915/display/intel_pch_display.h
+++ b/drivers/gpu/drm/i915/display/intel_pch_display.h
@@ -15,7 +15,6 @@ struct intel_crtc;
 struct intel_crtc_state;
 struct intel_link_m_n;
 
-#ifdef I915
 bool intel_has_pch_trancoder(struct drm_i915_private *i915,
 			     enum pipe pch_transcoder);
 enum pipe intel_crtc_pch_transcoder(struct intel_crtc *crtc);
@@ -42,20 +41,5 @@ void intel_pch_transcoder_get_m2_n2(struct intel_crtc *crtc,
 				    struct intel_link_m_n *m_n);
 
 void intel_pch_sanitize(struct drm_i915_private *i915);
-#else
-#define intel_has_pch_trancoder(xe, pipe) (xe && pipe && 0)
-#define intel_crtc_pch_transcoder(crtc) ((crtc)->pipe)
-#define ilk_pch_pre_enable(state, crtc) do { } while (0)
-#define ilk_pch_enable(state, crtc) do { } while (0)
-#define ilk_pch_disable(state, crtc) do { } while (0)
-#define ilk_pch_post_disable(state, crtc) do { } while (0)
-#define ilk_pch_get_config(crtc) do { } while (0)
-#define lpt_pch_enable(state, crtc) do { } while (0)
-#define lpt_pch_disable(state, crtc) do { } while (0)
-#define lpt_pch_get_config(crtc) do { } while (0)
-#define intel_pch_transcoder_get_m1_n1(crtc, m_n) memset((m_n), 0, sizeof(*m_n))
-#define intel_pch_transcoder_get_m2_n2(crtc, m_n) memset((m_n), 0, sizeof(*m_n))
-#define intel_pch_sanitize(xe) do { } while (0)
-#endif
 
 #endif
-- 
2.39.2