[PATCH 2/3] Revert "UBUNTU: SAUCE: drm/i915/psr: allow overriding PSR disable param by quirk"

[Kai-Heng Feng]

BugLink: https://bugs.launchpad.net/bugs/1907285

This reverts commit c73a5c4ffaffe3d88ceaa1863c75cd35cc06357a.

Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 drivers/gpu/drm/i915/display/intel_psr.c | 8 --------
 include/drm/drm_dp_helper.h              | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index cc47802154bd..40e9cb29233d 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -1582,14 +1582,6 @@ void intel_psr_init(struct drm_i915_private *dev_priv)
 		 */
 		dev_priv->hsw_psr_mmio_adjust = _SRD_CTL_EDP - _HSW_EDP_PSR_BASE;
 
-	/*
-	 * PSR was disabled by module parameters but the underlying panel is
-	 * depending on it, so use per-chip default to probe that automatically.
-	 */
-	if ((dev_priv->psr.dp->edid_quirks & BIT(DP_QUIRK_FORCE_PSR_CHIP_DEFAULT)) &&
-	    dev_priv->params.enable_psr == 0)
-		dev_priv->params.enable_psr = -1;
-
 	if (dev_priv->params.enable_psr == -1)
 		if (INTEL_GEN(dev_priv) < 9 || !dev_priv->vbt.psr.enable)
 			dev_priv->params.enable_psr = 0;
diff --git a/include/drm/drm_dp_helper.h b/include/drm/drm_dp_helper.h
index 75500bfc7aa1..a53243abd945 100644
--- a/include/drm/drm_dp_helper.h
+++ b/include/drm/drm_dp_helper.h
@@ -1781,14 +1781,6 @@ enum drm_dp_quirk {
 	 * the DP_MAX_LINK_RATE register reporting a lower max multiplier.
 	 */
 	DP_DPCD_QUIRK_CAN_DO_MAX_LINK_RATE_3_24_GBPS,
-	/**
-	 * @DP_QUIRK_FORCE_PSR_CHIP_DEFAULT
-	 *
-	 * PSR was disabled by default in Ubuntu 5.0 kernels and on, but some
-	 * platforms might be depending on them. If so, use per-chip default to
-	 * probe that automatically.
-	 */
-	DP_QUIRK_FORCE_PSR_CHIP_DEFAULT,
 };
 
 /**
-- 
2.29.2