drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 15 Nov 2017 16:31:56 +0000 (17:31 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fri, 17 Nov 2017 14:23:36 +0000 (15:23 +0100)
commit5b9489cb8ee23b41ab5a4cca6652511fa252bad8
tree7f629146ffdba8a72edad93bf201bc044b207867
parent199ea381d9887bc8b1720176c443e203d9664cd3
drm/i915: Calculate vlv/chv intermediate watermarks correctly, v3.

The watermarks it should calculate against are the old optimal watermarks.
The currently active crtc watermarks are pure fiction, and are invalid in
case of a nonblocking modeset, page flip enabling/disabling planes or any
other reason.

When the crtc is disabled or during a modeset the intermediate watermarks
don't need to be programmed separately, and could be directly assigned
to the optimal watermarks.

CXSR must always be disabled in the intermediate case for modesets, else
we get a WARN for vblank wait timeout.

Also rename crtc_state to new_crtc_state, to distinguish it from the old state.

Changes since v1:
- Use intel_atomic_get_old_crtc_state. (ville)
Changes since v2:
- Always unset cxsr during modeset.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171115163157.14372-1-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
drivers/gpu/drm/i915/intel_pm.c