drm/i915: add enable_ips module option

IPS is still enabled by default. Feature requested by the power
management team.

This should also help testing the feature on some early pre-production
hardware where there were relationship problems between IPS and PSR.

v2: Rebase on top of the newest IPS implementation.
v3: Check i915_enable_ips at compute_config, not supports_ips, so the
    kernel parameter will be ignored at haswell_get_pipe_config.

Requested-by: Kristen Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index acfc6a164a59..c112466bb769 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4034,7 +4034,8 @@ retry:
 static void hsw_compute_ips_config(struct intel_crtc *crtc,
                                    struct intel_crtc_config *pipe_config)
 {
-        pipe_config->ips_enabled = hsw_crtc_supports_ips(crtc) &&
+        pipe_config->ips_enabled = i915_enable_ips &&
+                                   hsw_crtc_supports_ips(crtc) &&
                                    pipe_config->pipe_bpp == 24;
 }