Simplified the series of fixes; we leave intel_crtc->active alone for now (since it's tightly tied to our current legacy modeset pipeline) and use it in place of intel_crtc_active() in the watermark code. As Ander's work on atomic CRTC state progresses, some of the places we use intel_crtc->active will need to be converted to crtc->state->active instead. Matt Roper (3): drm/i915: Update intel_crtc_active() to use state values (v2) drm/i915: Use crtc->state->active in ilk/skl watermark calculations (v3) drm/i915: Don't assume primary & cursor are always on for wm calculation (v3) drivers/gpu/drm/i915/intel_display.c | 6 +- drivers/gpu/drm/i915/intel_pm.c | 129 ++++++++++++++++++++++++----------- 2 files changed, 95 insertions(+), 40 deletions(-) -- 1.8.5.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx