drm/i915/psr: Remove few mod parameters option.

Reduce the module parameter to enable or disable.

The link stand by vs full link off was used only once.

And it was actually masking another bug fixed by commit
'84bb2916a683 ("drm/i915/psr: Check for SET_POWER_CAPABLE
bit at PSR init time.")'

So, let's remove these options for now. End goal is to
fully remove the mod param, moving it to a debugfs
interface in upcoming patches.

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Tarun Vyas <tarun.vyas@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180712052715.8177-1-rodrigo.vivi@intel.com

diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 49fcc4679db67e47c2d49f77db9ae09417b64b1d..817576701ed7565c94f5e378506066e4f346a92b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -92,7 +92,7 @@ i915_param_named_unsafe(enable_ppgtt, int, 0400,
 
 i915_param_named_unsafe(enable_psr, int, 0600,
        "Enable PSR "
-       "(0=disabled, 1=enabled - link mode chosen per-platform, 2=force link-standby mode, 3=force link-off mode) "
+       "(0=disabled, 1=enabled) "
        "Default: -1 (use per-chip default)");
 
 i915_param_named_unsafe(alpha_support, bool, 0400,

diff --git a/drivers/gpu/drm/i915/intel_psr.c b/drivers/gpu/drm/i915/intel_psr.c
index e97db5dd75b1cfab8e5b5bb90c2f99a5d456c2a9..4bd5768731ee26b282b5ad92f8d446af1f21e7a0 100644 (file)
--- a/drivers/gpu/drm/i915/intel_psr.c
+++ b/drivers/gpu/drm/i915/intel_psr.c
@@ -971,16 +971,6 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
                /* For new platforms let's respect VBT back again */
                dev_priv->psr.link_standby = dev_priv->vbt.psr.full_link;
 
-       /* Override link_standby x link_off defaults */
-       if (i915_modparams.enable_psr == 2 && !dev_priv->psr.link_standby) {
-               DRM_DEBUG_KMS("PSR: Forcing link standby\n");
-               dev_priv->psr.link_standby = true;
-       }
-       if (i915_modparams.enable_psr == 3 && dev_priv->psr.link_standby) {
-               DRM_DEBUG_KMS("PSR: Forcing main link off\n");
-               dev_priv->psr.link_standby = false;
-       }
-
        INIT_WORK(&dev_priv->psr.work, intel_psr_work);
        mutex_init(&dev_priv->psr.lock);
 }