[Intel-xe] [PATCH v2 0/8] drm/xe: clean up i915 includes both sides

Jani Nikula jani.nikula at intel.com
Fri Mar 3 10:52:14 UTC 2023


v2 of https://patchwork.freedesktop.org/series/114573/

Jani Nikula (8):
  drm/i915/display: don't use relative ../i915 includes
  drm/i915/display: drop redundant display/ from includes
  drm/xe: drop unnecessary include
  drm/xe: drop redundant display/ from includes
  drm/xe: drop redundant ../ from includes
  drm/xe: move all top level i915 compat headers to a separate
    subdirectory
  drm/xe: remove unnecessary include
  drm/xe: drop top level i915 from include path

 .../gpu/drm/i915/display/intel_backlight.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_bw.c       |  2 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_display.c  | 48 +++++++++----------
 .../drm/i915/display/intel_display_power.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_gmbus.c    |  2 +-
 drivers/gpu/drm/i915/display/intel_opregion.c |  2 +-
 drivers/gpu/drm/i915/display/intel_psr.c      |  2 +-
 drivers/gpu/drm/i915/display/skl_watermark.c  |  2 +-
 drivers/gpu/drm/xe/Makefile                   |  7 +--
 .../i915_active_types.h                       |  0
 .../i915_drv.h                                |  2 +-
 .../drm/xe/compat-i915-headers/i915_fixed.h   |  1 +
 .../gpu/drm/xe/compat-i915-headers/i915_reg.h |  1 +
 .../xe/compat-i915-headers/i915_reg_defs.h    |  1 +
 .../drm/xe/compat-i915-headers/i915_utils.h   |  1 +
 .../i915_vma.h                                |  0
 .../i915_vma_types.h                          |  0
 .../compat-i915-headers/intel_mchbar_regs.h   |  1 +
 .../xe/compat-i915-headers/intel_pci_config.h |  1 +
 .../intel_pm_types.h                          |  2 -
 .../intel_runtime_pm.h                        |  0
 .../intel_wakeref.h                           |  0
 drivers/gpu/drm/xe/display/ext/i915_irq.c     | 18 +++----
 .../drm/xe/display/ext/intel_device_info.c    |  5 +-
 drivers/gpu/drm/xe/display/ext/intel_dram.c   |  2 +-
 drivers/gpu/drm/xe/display/ext/intel_pm.c     |  6 +--
 drivers/gpu/drm/xe/regs/xe_reg_defs.h         |  2 +-
 drivers/gpu/drm/xe/xe_device_types.h          |  6 +--
 drivers/gpu/drm/xe/xe_display.c               | 26 +++++-----
 30 files changed, 76 insertions(+), 72 deletions(-)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_active_types.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_drv.h (99%)
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg_defs.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_vma.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/i915_vma_types.h (100%)
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_pm_types.h (95%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_runtime_pm.h (100%)
 rename drivers/gpu/drm/xe/{display => compat-i915-headers}/intel_wakeref.h (100%)

-- 
2.39.1



More information about the Intel-xe mailing list