github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 06:31:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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
This commit is contained in:
Ankit Nautiyal 2025-12-19 11:32:59 +05:30
parent 1908784fbc
commit a2e3dda51d
4 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/gvt/cmd_parser.c
View File

@ -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"

12
drivers/gpu/drm/i915/gvt/display_helpers.h
View File

@ -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))

1
drivers/gpu/drm/i915/gvt/fb_decoder.c
View File

@ -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"

1
drivers/gpu/drm/i915/gvt/handlers.c
View File

@ -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"