Resend for CI. Jani Nikula (6): drm/i915/display: add display specific runtime PM wrappers drm/i915/display: conversions to with_intel_display_rpm() drm/i915/display: use display runtime PM interfaces for for atomic state drm/i915/display: convert to display runtime PM interfaces drm/i915/power: convert to display runtime PM interfaces drm/xe/compat: remove intel_runtime_pm.h drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/hsw_ips.c | 8 +- .../gpu/drm/i915/display/intel_backlight.c | 5 +- drivers/gpu/drm/i915/display/intel_bios.c | 6 +- drivers/gpu/drm/i915/display/intel_display.c | 12 +-- .../drm/i915/display/intel_display_debugfs.c | 17 ++--- .../gpu/drm/i915/display/intel_display_irq.c | 5 +- .../drm/i915/display/intel_display_power.c | 63 +++++++-------- .../i915/display/intel_display_power_well.c | 4 +- .../gpu/drm/i915/display/intel_display_rpm.c | 68 +++++++++++++++++ .../gpu/drm/i915/display/intel_display_rpm.h | 37 +++++++++ .../drm/i915/display/intel_display_types.h | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 9 ++- drivers/gpu/drm/i915/display/intel_dp.c | 5 +- drivers/gpu/drm/i915/display/intel_dpt.c | 7 +- drivers/gpu/drm/i915/display/intel_dsb.c | 17 +++-- drivers/gpu/drm/i915/display/intel_fb_pin.c | 7 +- drivers/gpu/drm/i915/display/intel_fbc.c | 8 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 11 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +- drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- drivers/gpu/drm/i915/display/intel_psr.c | 17 ++--- drivers/gpu/drm/i915/display/skl_watermark.c | 9 ++- drivers/gpu/drm/xe/Makefile | 1 + .../gpu/drm/xe/compat-i915-headers/i915_drv.h | 1 - .../xe/compat-i915-headers/intel_runtime_pm.h | 76 ------------------- drivers/gpu/drm/xe/display/xe_display_rpm.c | 71 +++++++++++++++++ 27 files changed, 287 insertions(+), 193 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_display_rpm.c create mode 100644 drivers/gpu/drm/i915/display/intel_display_rpm.h delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_runtime_pm.h create mode 100644 drivers/gpu/drm/xe/display/xe_display_rpm.c -- 2.39.5