Hi all, Jani's recent comment that this is a mess spurred me to pick this up again. An it looks like it'll simplify parts of the vlv display register rework, too (the 3rd patch to disable legacy VGA safe/restore). Big move here is that I'm starting a i915_ums.c file to hide all this display-related non-kms stuff from our views. Review and comments highly welcome. Cheers, Daniel Daniel Vetter (4): drm/i915: move modeset checks out of save/restore_modeset_reg drm/i915: extract ums suspend/resume into i915_ums.c drm/i915: dont save/restore VGA state for kms drm/i915: move DP save/restore into i915_ums.c drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 7 +- drivers/gpu/drm/i915/i915_suspend.c | 540 ++--------------------------------- drivers/gpu/drm/i915/i915_ums.c | 503 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 2 +- 5 files changed, 540 insertions(+), 513 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_ums.c -- 1.7.11.7