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

[Jani Nikula]

VGPU is now properly abstracted. No longer needed.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 drivers/gpu/drm/i915/display/intel_crtc.c   | 4 ----
 drivers/gpu/drm/i915/display/intel_fbc.c    | 3 +--
 drivers/gpu/drm/i915/display/intel_sprite.c | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index df363ffd939c..fca73a4f7c47 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -12,9 +12,7 @@
 #include <drm/drm_vblank_work.h>
 
 #include "i915_irq.h"
-#ifdef I915
 #include "i915_vgpu.h"
-#endif
 #include "i9xx_plane.h"
 #include "icl_dsi.h"
 #include "intel_atomic.h"
@@ -700,10 +698,8 @@ void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state)
 
 	local_irq_enable();
 
-#ifdef I915
 	if (intel_vgpu_active(dev_priv))
 		return;
-#endif
 
 	if (crtc->debug.start_vbl_count &&
 	    crtc->debug.start_vbl_count != end_vbl_count) {
diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
index 309cce443941..b1e7b2588fd9 100644
--- a/drivers/gpu/drm/i915/display/intel_fbc.c
+++ b/drivers/gpu/drm/i915/display/intel_fbc.c
@@ -45,6 +45,7 @@
 
 #include "i915_drv.h"
 #include "i915_utils.h"
+#include "i915_vgpu.h"
 #include "intel_cdclk.h"
 #include "intel_de.h"
 #include "intel_display_trace.h"
@@ -54,8 +55,6 @@
 
 #ifdef I915
 
-#include "i915_vgpu.h"
-
 #define i915_gem_stolen_initialized(i915) (drm_mm_initialized(&(i915)->mm.stolen))
 #define i915_gem_stolen_allocated(node) drm_mm_node_allocated(&(node))
 #define i915_gem_stolen_compressed_offset(node) ((node).start)
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c b/drivers/gpu/drm/i915/display/intel_sprite.c
index 23e23f119a2e..718fe026c5f7 100644
--- a/drivers/gpu/drm/i915/display/intel_sprite.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite.c
@@ -40,11 +40,7 @@
 
 #include "i915_drv.h"
 #include "i915_reg.h"
-
-#ifdef I915
 #include "i915_vgpu.h"
-#endif
-
 #include "i9xx_plane.h"
 #include "intel_atomic_plane.h"
 #include "intel_de.h"
-- 
2.39.2