From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Fix some remaining issues around plane updates vs. CxSR on gmch platforms. Also throw in a few watermark fixes/cleanups, and finally flip on atomic for g4x since everything is ready. Ville Syrjälä (14): drm/i915: s/crtc_state/new_crtc_state/ etc. drm/i915: Fix g4x cxsr enable condition drm/i915: Use u8 consistently for active_planes bitmask drm/i915: Apply WaUse32BppForSRWM to elk as well as ctg drm/i915: Fix HPLL watermark readout for g4x drm/i915: Split g4x_compute_pipe_wm() into two drm/i915: Split vlv_compute_pipe_wm() into two drm/i915: Simplify up g4x watermark sanitation drm/i915: Simplify up vlv watermark sanitation drm/i915: Add missing invalidate to g4x wm readout drm/i915: Fix g4x/vlv/chv CxSR vs. format/tiling/rotation changes drm/i915: Fix pipe gamma enable/disable vs. CxSR on gmch platforms drm/i915: Write watermarks for disabled pipes on gmch platforms drm/i915: Enable atomic by default on ctg/elk drivers/gpu/drm/i915/display/intel_color.c | 4 + drivers/gpu/drm/i915/display/intel_display.c | 89 ++++--- drivers/gpu/drm/i915/i915_drv.c | 7 +- drivers/gpu/drm/i915/intel_pm.c | 232 ++++++++++--------- 4 files changed, 193 insertions(+), 139 deletions(-) -- 2.26.3 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx