v2 of [1] rebased on top of Ville's watermark level count changes. [1] https://patchwork.freedesktop.org/series/113775/ Jani Nikula (7): drm/i915: move memory frequency detection to intel_dram.c drm/i915/wm: move remaining watermark code out of intel_pm.c drm/i915/wm: move functions to call watermark hooks to intel_wm.[ch] drm/i915/wm: add .get_hw_state to watermark funcs drm/i915/wm: move watermark sanitization to intel_wm.[ch] drm/i915/wm: move watermark debugfs to intel_wm.c drm/i915: rename intel_pm_types.h -> display/intel_wm_types.h drivers/gpu/drm/i915/Makefile | 2 + drivers/gpu/drm/i915/display/i9xx_wm.c | 3938 ++++++++++++++++ drivers/gpu/drm/i915/display/i9xx_wm.h | 20 + drivers/gpu/drm/i915/display/intel_display.c | 223 +- drivers/gpu/drm/i915/display/intel_display.h | 2 + .../gpu/drm/i915/display/intel_display_core.h | 3 +- .../drm/i915/display/intel_display_debugfs.c | 218 +- .../drm/i915/display/intel_display_types.h | 13 +- .../drm/i915/display/intel_modeset_setup.c | 15 +- drivers/gpu/drm/i915/display/intel_wm.c | 527 +++ drivers/gpu/drm/i915/display/intel_wm.h | 38 + .../intel_wm_types.h} | 6 +- drivers/gpu/drm/i915/display/skl_watermark.c | 22 +- drivers/gpu/drm/i915/display/skl_watermark.h | 5 +- drivers/gpu/drm/i915/gt/intel_rps.c | 29 - drivers/gpu/drm/i915/intel_pm.c | 4052 ----------------- drivers/gpu/drm/i915/intel_pm.h | 13 - drivers/gpu/drm/i915/soc/intel_dram.c | 152 + 18 files changed, 4712 insertions(+), 4566 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.c create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm.h create mode 100644 drivers/gpu/drm/i915/display/intel_wm.c create mode 100644 drivers/gpu/drm/i915/display/intel_wm.h rename drivers/gpu/drm/i915/{intel_pm_types.h => display/intel_wm_types.h} (93%) -- 2.34.1
