[PATCH 7/7] drm/i915/gvt/display_helper: Get rid of #ifdef/#undefs

[Ankit Nautiyal <ankit.k.nautiyal@intel.com>]

Now that i915/display macros have been substituted with wrappers that call
the new display-device helpers, we can drop the conflicting includes from
GVT and remove the temporary #ifdef/#undef macro overrides.

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
---
 drivers/gpu/drm/i915/gvt/cmd_parser.c      |  1 -
 drivers/gpu/drm/i915/gvt/display_helpers.h | 12 ------------
 drivers/gpu/drm/i915/gvt/fb_decoder.c      |  1 -
 drivers/gpu/drm/i915/gvt/handlers.c        |  1 -
 4 files changed, 15 deletions(-)

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index fbc8a5e28576..e5301733f4e4 100644
--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
+++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
@@ -53,7 +53,6 @@
 #include "trace.h"
 
 #include "display/i9xx_plane_regs.h"
-#include "display/intel_display_core.h"
 #include "display/intel_sprite_regs.h"
 #include "gem/i915_gem_context.h"
 #include "gem/i915_gem_pm.h"
diff --git a/drivers/gpu/drm/i915/gvt/display_helpers.h b/drivers/gpu/drm/i915/gvt/display_helpers.h
index a910f8b8833d..f365e02a71fb 100644
--- a/drivers/gpu/drm/i915/gvt/display_helpers.h
+++ b/drivers/gpu/drm/i915/gvt/display_helpers.h
@@ -8,27 +8,15 @@
 
 #include "display/intel_gvt_api.h"
 
-#ifdef DISPLAY_MMIO_BASE
-#undef DISPLAY_MMIO_BASE
-#endif
 #define DISPLAY_MMIO_BASE(display) \
 	intel_display_device_mmio_base((display))
 
-#ifdef INTEL_DISPLAY_DEVICE_PIPE_OFFSET
-#undef INTEL_DISPLAY_DEVICE_PIPE_OFFSET
-#endif
 #define INTEL_DISPLAY_DEVICE_PIPE_OFFSET(display, idx) \
 	intel_display_device_pipe_offset((display), (enum pipe)(idx))
 
-#ifdef INTEL_DISPLAY_DEVICE_TRANS_OFFSET
-#undef INTEL_DISPLAY_DEVICE_TRANS_OFFSET
-#endif
 #define INTEL_DISPLAY_DEVICE_TRANS_OFFSET(display, trans) \
 	intel_display_device_trans_offset((display), (trans))
 
-#ifdef INTEL_DISPLAY_DEVICE_CURSOR_OFFSET
-#undef INTEL_DISPLAY_DEVICE_CURSOR_OFFSET
-#endif
 #define INTEL_DISPLAY_DEVICE_CURSOR_OFFSET(display, pipe) \
 	intel_display_device_cursor_offset((display), (pipe))
 
diff --git a/drivers/gpu/drm/i915/gvt/fb_decoder.c b/drivers/gpu/drm/i915/gvt/fb_decoder.c
index c402f3b5a0ab..3d1a7e5c8cd3 100644
--- a/drivers/gpu/drm/i915/gvt/fb_decoder.c
+++ b/drivers/gpu/drm/i915/gvt/fb_decoder.c
@@ -43,7 +43,6 @@
 
 #include "display/i9xx_plane_regs.h"
 #include "display/intel_cursor_regs.h"
-#include "display/intel_display_core.h"
 #include "display/intel_sprite_regs.h"
 #include "display/skl_universal_plane_regs.h"
 #include "display_helpers.h"
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c
index 9ada97d01b6c..7063d3c77562 100644
--- a/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -49,7 +49,6 @@
 #include "display/i9xx_plane_regs.h"
 #include "display/intel_crt_regs.h"
 #include "display/intel_cursor_regs.h"
-#include "display/intel_display_core.h"
 #include "display/intel_display_types.h"
 #include "display/intel_dmc_regs.h"
 #include "display/intel_dp_aux_regs.h"
-- 
2.45.2