Refactor some irq/rps code to help move i915->irq_lock to display->irq.lock, and then do the move.
Jani Nikula (8): drm/i915/irq: move locking inside vlv_display_irq_reset() drm/i915/irq: move locking inside valleyview_{enable,disable}_display_irqs() drm/i915/irq: move locking inside vlv_display_irq_postinstall() drm/i915/irq: split out i915_display_irq_postinstall() drm/i915/irq: split out i965_display_irq_postinstall() drm/i915/irq: make i915_enable_asle_pipestat() static drm/i915/rps: refactor display rps support drm/i915/irq: move i915->irq_lock to display->irq.lock drivers/gpu/drm/i915/display/i9xx_plane.c | 43 +++-- .../gpu/drm/i915/display/intel_display_core.h | 3 + .../gpu/drm/i915/display/intel_display_irq.c | 153 ++++++++++-------- .../gpu/drm/i915/display/intel_display_irq.h | 3 +- .../i915/display/intel_display_power_well.c | 5 - .../gpu/drm/i915/display/intel_display_rps.c | 23 +++ .../gpu/drm/i915/display/intel_display_rps.h | 24 +++ .../drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 10 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 9 +- .../drm/i915/display/intel_fifo_underrun.c | 44 ++--- drivers/gpu/drm/i915/display/intel_hotplug.c | 129 ++++++--------- .../gpu/drm/i915/display/intel_hotplug_irq.c | 22 ++- drivers/gpu/drm/i915/display/intel_tv.c | 14 +- .../drm/i915/display/skl_universal_plane.c | 10 +- drivers/gpu/drm/i915/gt/intel_rps.c | 10 +- drivers/gpu/drm/i915/i915_driver.c | 1 - drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 27 +--- drivers/gpu/drm/xe/Makefile | 1 - .../drm/xe/compat-i915-headers/gt/intel_rps.h | 11 -- .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 11 -- drivers/gpu/drm/xe/display/xe_display_rps.c | 17 -- 23 files changed, 260 insertions(+), 314 deletions(-) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_rps.h delete mode 100644 drivers/gpu/drm/xe/display/xe_display_rps.c -- 2.39.5