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

[Jani Nikula]

Clean up atomic plane conditionals.

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

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 1491655e7fe0..b756561f08bd 100644
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -36,6 +36,7 @@
 #include <drm/drm_fourcc.h>
 
 #include "i915_config.h"
+#include "i915_reg.h"
 #include "intel_atomic_plane.h"
 #include "intel_cdclk.h"
 #include "intel_display_rps.h"
@@ -434,7 +435,6 @@ static bool i9xx_must_disable_cxsr(const struct intel_crtc_state *new_crtc_state
 				   const struct intel_plane_state *old_plane_state,
 				   const struct intel_plane_state *new_plane_state)
 {
-#ifdef I915
 	struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);
 	bool old_visible = old_plane_state->uapi.visible;
 	bool new_visible = new_plane_state->uapi.visible;
@@ -470,9 +470,6 @@ static bool i9xx_must_disable_cxsr(const struct intel_crtc_state *new_crtc_state
 	}
 
 	return old_ctl != new_ctl;
-#else
-	return false;
-#endif
 }
 
 static int intel_plane_atomic_calc_changes(const struct intel_crtc_state *old_crtc_state,
-- 
2.39.2