Commit 5b9489cb authored by Maarten Lankhorst's avatar Maarten Lankhorst

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171115163157.14372-1-maarten.lankhorst@linux.intel.comReviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
parent 199ea381
...@@ -2026,16 +2026,27 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, ...@@ -2026,16 +2026,27 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
static int vlv_compute_intermediate_wm(struct drm_device *dev, static int vlv_compute_intermediate_wm(struct drm_device *dev,
struct intel_crtc *crtc, struct intel_crtc *crtc,
struct intel_crtc_state *crtc_state) struct intel_crtc_state *new_crtc_state)
{ {
struct vlv_wm_state *intermediate = &crtc_state->wm.vlv.intermediate; struct vlv_wm_state *intermediate = &new_crtc_state->wm.vlv.intermediate;
const struct vlv_wm_state *optimal = &crtc_state->wm.vlv.optimal; const struct vlv_wm_state *optimal = &new_crtc_state->wm.vlv.optimal;
const struct vlv_wm_state *active = &crtc->wm.active.vlv; struct intel_atomic_state *intel_state =
to_intel_atomic_state(new_crtc_state->base.state);
const struct intel_crtc_state *old_crtc_state =
intel_atomic_get_old_crtc_state(intel_state, crtc);
const struct vlv_wm_state *active = &old_crtc_state->wm.vlv.optimal;
int level; int level;
if (!new_crtc_state->base.active || drm_atomic_crtc_needs_modeset(&new_crtc_state->base)) {
*intermediate = *optimal;
intermediate->cxsr = false;
goto out;
}
intermediate->num_levels = min(optimal->num_levels, active->num_levels); intermediate->num_levels = min(optimal->num_levels, active->num_levels);
intermediate->cxsr = optimal->cxsr && active->cxsr && intermediate->cxsr = optimal->cxsr && active->cxsr &&
!crtc_state->disable_cxsr; !new_crtc_state->disable_cxsr;
for (level = 0; level < intermediate->num_levels; level++) { for (level = 0; level < intermediate->num_levels; level++) {
enum plane_id plane_id; enum plane_id plane_id;
...@@ -2054,12 +2065,13 @@ static int vlv_compute_intermediate_wm(struct drm_device *dev, ...@@ -2054,12 +2065,13 @@ static int vlv_compute_intermediate_wm(struct drm_device *dev,
vlv_invalidate_wms(crtc, intermediate, level); vlv_invalidate_wms(crtc, intermediate, level);
out:
/* /*
* If our intermediate WM are identical to the final WM, then we can * If our intermediate WM are identical to the final WM, then we can
* omit the post-vblank programming; only update if it's different. * omit the post-vblank programming; only update if it's different.
*/ */
if (memcmp(intermediate, optimal, sizeof(*intermediate)) != 0) if (memcmp(intermediate, optimal, sizeof(*intermediate)) != 0)
crtc_state->wm.need_postvbl_update = true; new_crtc_state->wm.need_postvbl_update = true;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment