[Intel-gfx] [PATCH v2 2/3] drm/i915: Enable IPS with only sprite plane visible too, v2.

[Maarten Lankhorst]

This comment predates atomic, and I think with the way we currently
track IPS, it's safe to enable this for the case we switch too.

Changes since v1:
- Keep IPS enabled when switching planes.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0b9ba415839a..09817bc6f9a8 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6237,13 +6237,8 @@ static bool hsw_compute_ips_config(struct intel_crtc_state *pipe_config)
 	if (pipe_config->ips_force_disable)
 		return false;
 
-	/*
-	 * FIXME IPS should be fine as long as one plane is
-	 * enabled, but in practice it seems to have problems
-	 * when going from primary only to sprite only and vice
-	 * versa.
-	 */
-	if (!(pipe_config->active_planes & BIT(PLANE_PRIMARY)))
+	/* IPS should be fine as long as one plane is enabled. */
+	if (hweight32(pipe_config->active_planes & ~BIT(PLANE_CURSOR)) != 1)
 		return false;
 
 	/* HSW can handle pixel rate up to cdclk? */
-- 
2.15.0