Commit b4ede6df authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Only use update_wm_{pre,post} for pre-ilk platforms

Now that vlv/chv have more proper wm programming support, let's reduce
the the update_wm_{pre,post} flags to only cover the pre-ilk platforms.
When we finally convert those as well we can drop these flags entirely.
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-12-ville.syrjala@linux.intel.com
parent 5eeb798b
...@@ -10845,21 +10845,25 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, ...@@ -10845,21 +10845,25 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
turn_off, turn_on, mode_changed); turn_off, turn_on, mode_changed);
if (turn_on) { if (turn_on) {
pipe_config->update_wm_pre = true; if (INTEL_GEN(dev_priv) < 5)
pipe_config->update_wm_pre = true;
/* must disable cxsr around plane enable/disable */ /* must disable cxsr around plane enable/disable */
if (plane->id != PLANE_CURSOR) if (plane->id != PLANE_CURSOR)
pipe_config->disable_cxsr = true; pipe_config->disable_cxsr = true;
} else if (turn_off) { } else if (turn_off) {
pipe_config->update_wm_post = true; if (INTEL_GEN(dev_priv) < 5)
pipe_config->update_wm_post = true;
/* must disable cxsr around plane enable/disable */ /* must disable cxsr around plane enable/disable */
if (plane->id != PLANE_CURSOR) if (plane->id != PLANE_CURSOR)
pipe_config->disable_cxsr = true; pipe_config->disable_cxsr = true;
} else if (intel_wm_need_update(&plane->base, plane_state)) { } else if (intel_wm_need_update(&plane->base, plane_state)) {
/* FIXME bollocks */ if (INTEL_GEN(dev_priv) < 5) {
pipe_config->update_wm_pre = true; /* FIXME bollocks */
pipe_config->update_wm_post = true; pipe_config->update_wm_pre = true;
pipe_config->update_wm_post = true;
}
} }
if (visible || was_visible) if (visible || was_visible)
......
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