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. v2: Just rebase from a year ago Ville Syrjälä (9): 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 .../gpu/drm/i915/display/intel_atomic_plane.c | 53 ++++- drivers/gpu/drm/i915/display/intel_color.c | 4 + drivers/gpu/drm/i915/display/intel_display.c | 4 +- drivers/gpu/drm/i915/i915_driver.c | 7 +- drivers/gpu/drm/i915/intel_pm.c | 206 ++++++++++-------- 5 files changed, 165 insertions(+), 109 deletions(-) -- 2.35.1
