[Intel-xe] [PATCH 0/9] xe & i915 display integration cleanups
Jani Nikula
jani.nikula at intel.com
Wed Apr 19 12:39:38 UTC 2023
Change the way i915 display gets built for xe. Additional cleanups and
backports on top to make future changes simpler.
Jani Nikula (9):
fixup! drm/xe/display: Implement display support
drm/i915/wm: remove stale and unused ilk_wm_max_level() declaration
drm/i915/display: add I915 conditional build to i9xx_wm.h
fixup! drm/xe/display: Implement display support
drm/i915: rename intel_pm.[ch] to intel_clock_gating.[ch]
fixup! drm/xe/display: Implement display support
drm/i915: use explicit includes for i915_reg.h and i915_irq.h
fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile
drivers/gpu/drm/i915/Makefile | 2 +-
drivers/gpu/drm/i915/display/i9xx_wm.c | 1 +
drivers/gpu/drm/i915/display/i9xx_wm.h | 18 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 +-
.../drm/i915/display/intel_display_power.c | 1 +
.../i915/display/intel_display_power_well.c | 1 +
.../drm/i915/display/intel_display_reg_defs.h | 4 -
.../drm/i915/display/intel_display_trace.h | 1 -
drivers/gpu/drm/i915/display/intel_fbc.c | 1 +
.../drm/i915/display/intel_fifo_underrun.c | 2 +
drivers/gpu/drm/i915/gt/intel_gt_irq.c | 1 +
drivers/gpu/drm/i915/gt/intel_reset.c | 1 +
drivers/gpu/drm/i915/gt/intel_rps.c | 1 +
drivers/gpu/drm/i915/gt/selftest_rps.c | 1 +
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 +
drivers/gpu/drm/i915/i915_debugfs.c | 1 +
drivers/gpu/drm/i915/i915_driver.c | 8 +-
drivers/gpu/drm/i915/i915_gem.c | 8 +-
drivers/gpu/drm/i915/i915_irq.c | 1 +
drivers/gpu/drm/i915/i915_irq.h | 2 +-
.../i915/{intel_pm.c => intel_clock_gating.c} | 9 +-
drivers/gpu/drm/i915/intel_clock_gating.h | 14 ++
drivers/gpu/drm/i915/intel_pm.h | 18 --
drivers/gpu/drm/i915/vlv_suspend.c | 4 +-
drivers/gpu/drm/xe/Makefile | 170 +++++++++---------
.../compat-i915-headers/intel_clock_gating.h | 1 +
drivers/gpu/drm/xe/display/ext/i915_irq.c | 2 +-
drivers/gpu/drm/xe/display/ext/i9xx_wm.c | 24 ---
drivers/gpu/drm/xe/display/ext/i9xx_wm.h | 20 ---
.../ext/{intel_pm.c => intel_clock_gating.c} | 4 +-
drivers/gpu/drm/xe/display/ext/intel_pm.h | 29 ---
drivers/gpu/drm/xe/xe_device_types.h | 3 +
drivers/gpu/drm/xe/xe_display.c | 4 +-
33 files changed, 152 insertions(+), 210 deletions(-)
rename drivers/gpu/drm/i915/{intel_pm.c => intel_clock_gating.c} (99%)
create mode 100644 drivers/gpu/drm/i915/intel_clock_gating.h
delete mode 100644 drivers/gpu/drm/i915/intel_pm.h
create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h
delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.c
delete mode 100644 drivers/gpu/drm/xe/display/ext/i9xx_wm.h
rename drivers/gpu/drm/xe/display/ext/{intel_pm.c => intel_clock_gating.c} (97%)
delete mode 100644 drivers/gpu/drm/xe/display/ext/intel_pm.h
--
2.39.2
More information about the Intel-xe
mailing list