A couple recent changes to the display watermark code by Tvrtko and me haven't played well together and resulted in a situation where we can miscalculate watermarks or even panic the kernel by disabling/enabling the primary display plane. This series should clean up the problem areas and prevent these issues until the proper atomic watermark rework is ready. Matt Roper (5): drm/i915: Ensure crtc_state backpointer is initialized drm/i915: Kill intel_crtc->active drm/i915: Update intel_crtc_active() to use state values drm/i915: Use crtc->state->active in ilk/skl watermark calculations drm/i915: Don't assume primary & cursor are always on for wm calculation (v3) drivers/gpu/drm/i915/i915_debugfs.c | 9 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 134 ++++++++++++++-------------- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_drv.h | 6 -- drivers/gpu/drm/i915/intel_fbdev.c | 6 +- drivers/gpu/drm/i915/intel_overlay.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 139 ++++++++++++++++++++---------- drivers/gpu/drm/i915/intel_sprite.c | 6 +- 10 files changed, 178 insertions(+), 134 deletions(-) -- 1.8.5.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx