Join series [1] and [2] together, converging on having the intel_parent.[ch] wrappers. Also added a couple more patches for individual functions in the interface.
[1] https://lore.kernel.org/r/[email protected] [2] https://lore.kernel.org/r/[email protected] Jani Nikula (10): drm/{i915,xe}/display: duplicate gen2 irq/error init/reset in display irq drm/i915/display: convert the display irq interfaces to struct intel_display drm/{i915,xe}/display: move irq calls to parent interface drm/i915: add .vgpu_active to parent interface drm/i915: add .fence_support_legacy to parent interface drm/i915/rps: store struct dma_fence in struct wait_rps_boost drm/i915/rps: call RPS functions via the parent interface drm/i915/rps: postpone i915 fence check to boost drm/i915: add .fence_priority_display to parent interface drm/xe/rps: build RPS as part of xe drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_crtc.c | 6 +- .../gpu/drm/i915/display/intel_display_irq.c | 191 +++++++++--------- .../drm/i915/display/intel_display_power.c | 5 +- .../i915/display/intel_display_power_well.c | 15 +- .../gpu/drm/i915/display/intel_display_rps.c | 34 ++-- .../gpu/drm/i915/display/intel_display_rps.h | 21 -- drivers/gpu/drm/i915/display/intel_fbc.c | 13 +- drivers/gpu/drm/i915/display/intel_gmbus.c | 6 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 6 +- .../gpu/drm/i915/display/intel_lpe_audio.c | 1 - drivers/gpu/drm/i915/display/intel_parent.c | 72 +++++++ drivers/gpu/drm/i915/display/intel_parent.h | 26 +++ drivers/gpu/drm/i915/display/intel_pipe_crc.c | 6 +- drivers/gpu/drm/i915/display/intel_plane.c | 5 +- drivers/gpu/drm/i915/gt/intel_rps.c | 39 ++++ drivers/gpu/drm/i915/gt/intel_rps.h | 2 + drivers/gpu/drm/i915/i915_driver.c | 22 ++ drivers/gpu/drm/i915/i915_irq.c | 16 ++ drivers/gpu/drm/i915/i915_irq.h | 2 + drivers/gpu/drm/xe/Makefile | 6 +- .../compat-i915-headers/gem/i915_gem_object.h | 13 -- .../compat-i915-headers/gt/intel_gt_types.h | 11 - .../gpu/drm/xe/compat-i915-headers/i915_irq.h | 6 - .../drm/xe/compat-i915-headers/i915_vgpu.h | 18 -- drivers/gpu/drm/xe/display/ext/i915_irq.c | 85 -------- drivers/gpu/drm/xe/display/xe_display.c | 18 ++ include/drm/intel/display_parent_interface.h | 27 +++ 28 files changed, 360 insertions(+), 313 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_parent.c create mode 100644 drivers/gpu/drm/i915/display/intel_parent.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_irq.c -- 2.47.3
