[SRU,OEM-OSP1-B,1/1] Revert "UBUNTU: SAUCE: i915: set disable_power_well=0 for icl temporarily"
diff mbox series

Message ID 20190813100856.4232-2-hui.wang@canonical.com
State New
Headers show
  • drm/i915: revert the patch of "set disable_power_well=0 for icl temporarily"
Related show

Commit Message

Hui Wang Aug. 13, 2019, 10:08 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1839950

This reverts commit 02a7f5d9b444d19ea915c6568bd11c6d22306899.

We can't reproduce the hdmi audio issue anymore on the icl laptop even
without disable_power_well=0, and disable_power_well=0 will prevent
the CPU from entering PC10 power state, let us revert this patch.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
 drivers/gpu/drm/i915/intel_runtime_pm.c | 5 -----
 1 file changed, 5 deletions(-)

diff mbox series

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index cbe3ac3003c2..a4cd90251491 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -3037,11 +3037,6 @@  static int
 sanitize_disable_power_well_option(const struct drm_i915_private *dev_priv,
 				   int disable_power_well)
-	struct pci_dev *pdev = dev_priv->drm.pdev;
-	/* icl hdmi audio needs to set disable_power_well=0 temporarily, will remove it later */
-	if ((pdev->device == 0x8a56) || (pdev->device == 0x8a52))
-		return 0;
 	if (disable_power_well >= 0)
 		return !!disable_power_well;