Commit db168f11 authored by Maarten Lankhorst's avatar Maarten Lankhorst

drm/i915: Remove intel_crtc->atomic.disable_ips.

This is a revert of commit 066cf55b "drm/i915: Fix IPS related flicker".
intel_pre_disable_primary already handles this, and now everything
goes through the atomic path there's no need to try to disable ips twice.
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1454514805-10595-2-git-send-email-maarten.lankhorst@linux.intel.com
parent 274008e8
...@@ -4815,9 +4815,6 @@ static void intel_pre_plane_update(struct intel_crtc *crtc) ...@@ -4815,9 +4815,6 @@ static void intel_pre_plane_update(struct intel_crtc *crtc)
if (atomic->update_fbc) if (atomic->update_fbc)
intel_fbc_pre_update(crtc); intel_fbc_pre_update(crtc);
if (crtc->atomic.disable_ips)
hsw_disable_ips(crtc);
if (atomic->pre_disable_primary) if (atomic->pre_disable_primary)
intel_pre_disable_primary(&crtc->base); intel_pre_disable_primary(&crtc->base);
...@@ -11889,18 +11886,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state, ...@@ -11889,18 +11886,6 @@ int intel_plane_atomic_calc_changes(struct drm_crtc_state *crtc_state,
intel_crtc->atomic.post_enable_primary = turn_on; intel_crtc->atomic.post_enable_primary = turn_on;
intel_crtc->atomic.update_fbc = true; intel_crtc->atomic.update_fbc = true;
if (turn_off) {
/*
* FIXME: Actually if we will still have any other
* plane enabled on the pipe we could let IPS enabled
* still, but for now lets consider that when we make
* primary invisible by setting DSPCNTR to 0 on
* update_primary_plane function IPS needs to be
* disable.
*/
intel_crtc->atomic.disable_ips = true;
}
/* /*
* BDW signals flip done immediately if the plane * BDW signals flip done immediately if the plane
* is disabled, even if the plane enable is already * is disabled, even if the plane enable is already
......
...@@ -544,7 +544,6 @@ struct intel_mmio_flip { ...@@ -544,7 +544,6 @@ struct intel_mmio_flip {
*/ */
struct intel_crtc_atomic_commit { struct intel_crtc_atomic_commit {
/* Sleepable operations to perform before commit */ /* Sleepable operations to perform before commit */
bool disable_ips;
bool pre_disable_primary; bool pre_disable_primary;
/* Sleepable operations to perform after commit */ /* Sleepable operations to perform after commit */
......
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