drm/i915/gvt/display_helper: Get rid of #ifdef/#undefs

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>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20251219060302.2365123-7-ankit.k.nautiyal@intel.com

diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
index fbc8a5e2857686566057d9e5f0830c5573305992..e5301733f4e446d97677f958c44ef27f1214b2c6 100644 (file)
--- 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 d0975ed507d33f06552894f76ba4c94e142392e9..0418397c09c462d4e3ebb86abfe59226e772dc85 100644 (file)
--- a/drivers/gpu/drm/i915/gvt/display_helpers.h
+++ b/drivers/gpu/drm/i915/gvt/display_helpers.h
@@ -8,15 +8,9 @@
 
 #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
 /*
  * #FIXME:
  * TRANSCONF() uses pipe-based addressing via _MMIO_PIPE2().
@@ -30,15 +24,9 @@
 #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 c402f3b5a0abf7bdeaaa2e39c574e73397c89cc9..3d1a7e5c8cd3c4067befcde4e44b749dd24efcec 100644 (file)
--- 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 9ada97d01b6c89b55974a85e1bd68ba34e5f4aca..7063d3c7756239d306f8992fb623f5433de78efe 100644 (file)
--- 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"