[SRU][OEM-B-OSP1][PATCH RESEND 1/1] Revert "UBUNTU: SAUCE: i915: set disable_power_well=0 for icl temporarily"

Hui Wang hui.wang at canonical.com
Thu Oct 10 04:17:46 UTC 2019


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

This reverts commit 63361ff9a85dca6bb493638e1fffcff38b755702.

After applying the fix of #1847192, 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 at canonical.com>
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 5 -----
 1 file changed, 5 deletions(-)

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;
 
-- 
2.17.1




More information about the kernel-team mailing list