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

[Jani Nikula]

Reduce display reset ifdefs.

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 25ead23cd150..c6605649a92f 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -760,11 +760,9 @@ static bool gpu_reset_clobbers_display(struct drm_i915_private *dev_priv)
 	return (INTEL_INFO(dev_priv)->gpu_reset_clobbers_display &&
 		intel_has_gpu_reset(to_gt(dev_priv)));
 }
-#endif
 
 void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
 {
-#ifdef I915
 	struct drm_modeset_acquire_ctx *ctx = &dev_priv->display.restore.reset_ctx;
 	struct drm_atomic_state *state;
 	int ret;
@@ -823,12 +821,10 @@ void intel_display_prepare_reset(struct drm_i915_private *dev_priv)
 
 	dev_priv->display.restore.modeset_state = state;
 	state->acquire_ctx = ctx;
-#endif
 }
 
 void intel_display_finish_reset(struct drm_i915_private *i915)
 {
-#ifdef I915
 	struct drm_modeset_acquire_ctx *ctx = &i915->display.restore.reset_ctx;
 	struct drm_atomic_state *state;
 	int ret;
@@ -876,8 +872,8 @@ void intel_display_finish_reset(struct drm_i915_private *i915)
 	mutex_unlock(&i915->drm.mode_config.mutex);
 
 	clear_bit_unlock(I915_RESET_MODESET, &to_gt(i915)->reset.flags);
-#endif
 }
+#endif
 
 static void icl_set_pipe_chicken(const struct intel_crtc_state *crtc_state)
 {
-- 
2.39.2