[Intel-xe] [PATCH 00/41] xe & i915 display integration ifdef cleanups, part 2

[Jani Nikula]

This continues the ifdef cleanups [1].

BR,
Jani.

[1] https://lore.kernel.org/r/20230405153920.926583-1-jani.nikula@intel.com

Jani Nikula (41):
  drm/i915/display: add I915 conditional build to g4x_dp.h
  fixup! drm/i915/display: Remaining changes to make xe compile
  drm/i915/display: add I915 conditional build to intel_dpio_phy.h
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  drm/i915/display: add I915 conditional build to intel_crt.h
  fixup! drm/i915/display: Remaining changes to make xe compile
  drm/i915/display: add I915 conditional build to vlv_dsi.h
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remove all uncore mmio accesses in favor of
    intel_de
  drm/i915/display: remove unnecessary i915_debugfs.h includes
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/xe/display: Implement display support
  fixup! drm/i915/display: Remaining changes to make xe compile
  fixup! drm/i915/display: Remaining changes to make xe compile

 drivers/gpu/drm/i915/display/g4x_dp.h         |  26 ++++
 .../gpu/drm/i915/display/intel_atomic_plane.c |   5 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  15 --
 drivers/gpu/drm/i915/display/intel_crt.h      |  14 ++
 drivers/gpu/drm/i915/display/intel_crtc.c     |   4 -
 drivers/gpu/drm/i915/display/intel_display.c  |  55 ++------
 .../gpu/drm/i915/display/intel_display_core.h |   4 -
 .../drm/i915/display/intel_display_debugfs.c  |   9 +-
 .../drm/i915/display/intel_display_power.c    |  10 --
 .../i915/display/intel_display_power_map.c    |   8 --
 .../i915/display/intel_display_power_well.c   |  17 +--
 .../drm/i915/display/intel_display_trace.h    |   2 -
 .../drm/i915/display/intel_display_types.h    |   9 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  10 --
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |   4 -
 drivers/gpu/drm/i915/display/intel_dpio_phy.h | 104 ++++++++++++--
 drivers/gpu/drm/i915/display/intel_dpll.c     |   7 -
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c |   4 -
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |  20 +--
 drivers/gpu/drm/i915/display/intel_fbc.c      |   3 +-
 drivers/gpu/drm/i915/display/intel_pps.c      |  13 +-
 drivers/gpu/drm/i915/display/intel_sprite.c   |   4 -
 drivers/gpu/drm/i915/display/skl_scaler.c     |   2 -
 .../drm/i915/display/skl_universal_plane.c    |  30 +---
 drivers/gpu/drm/i915/display/vlv_dsi.h        |  13 ++
 .../drm/xe/compat-i915-headers/i915_debugfs.h |  14 ++
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |   4 -
 .../drm/xe/compat-i915-headers/i915_trace.h   |   6 +
 .../drm/xe/compat-i915-headers/i915_vgpu.h    |  44 ++++++
 .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   1 +
 .../drm/xe/compat-i915-headers/vlv_sideband.h | 132 ++++++++++++++++++
 .../xe/compat-i915-headers/vlv_sideband_reg.h |   1 +
 drivers/gpu/drm/xe/display/ext/i915_irq.h     |   8 +-
 drivers/gpu/drm/xe/xe_device_types.h          |   6 +
 34 files changed, 383 insertions(+), 225 deletions(-)
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_debugfs.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_trace.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h

-- 
2.39.2