[00/10] drm/i915 and drm/xe display and compat cleanups

Message

Jani Nikula May 29, 2024, 5:48 p.m. UTC

While the i915 i915_drv.h includes absolutely everything, the xe compat
i915_drv.h is handy for reducing includes and including what's really
needed where needed. Do just that. This is also useful for figuring out
what the display code actually needs outside of display. Do some
additional header cleanups on top.

I suggest merging the lot via drm-intel-next.

BR,
Jani.


Jani Nikula (10):
  drm/i915/display: include gem/i915_gem_stolen.h where needed
  drm/i915/display: include gt/intel_gt_types.h where needed
  drm/i915/display: include i915_gpu_error.h where needed
  drm/i915/display: include intel_uncore.h where needed
  drm/i915/display: include intel_step.h where needed
  drm/i915/display: include xe_bo.h, gem_object_types etc. where needed
  drm/xe/display: move compat uncore stubs to the correct file
  drm/xe/display: move compat runtime pm stubs to the correct file
  drm/xe/display: reduce includes in compat i915_drv.h
  drm/xe/display: drop i915_drv.h include from xe code

 .../gpu/drm/i915/display/intel_atomic_plane.c |  1 +
 drivers/gpu/drm/i915/display/intel_bios.c     |  1 +
 .../drm/i915/display/intel_display_types.h    |  1 +
 drivers/gpu/drm/i915/display/intel_dmc.c      |  2 +
 drivers/gpu/drm/i915/display/intel_fb.c       |  1 +
 drivers/gpu/drm/i915/display/intel_fbc.c      |  2 +
 drivers/gpu/drm/i915/display/intel_fbdev.c    |  1 +
 .../gem/i915_gem_object_types.h               | 11 +++
 .../{ => gem}/i915_gem_stolen.h               |  0
 .../{ => gt}/intel_gt_types.h                 |  0
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 67 +------------------
 .../xe/compat-i915-headers/intel_runtime_pm.h | 51 ++++++++++++++
 .../drm/xe/compat-i915-headers/intel_uncore.h |  5 ++
 drivers/gpu/drm/xe/display/ext/i915_irq.c     |  1 -
 drivers/gpu/drm/xe/display/intel_fb_bo.c      |  7 +-
 drivers/gpu/drm/xe/display/intel_fbdev_fb.c   | 24 +++----
 drivers/gpu/drm/xe/display/xe_dsb_buffer.c    |  9 ++-
 drivers/gpu/drm/xe/display/xe_fb_pin.c        |  6 +-
 drivers/gpu/drm/xe/display/xe_plane_initial.c | 19 +++---
 19 files changed, 108 insertions(+), 101 deletions(-)
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_types.h
 rename drivers/gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h (100%)
 rename drivers/gpu/drm/xe/compat-i915-headers/{ => gt}/intel_gt_types.h (100%)