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

Message ID 20191010041746.9396-2-hui.wang@canonical.com
State New
Headers show
Series
  • [SRU,OEM-B-OSP1,RESEND,1/1] Revert "UBUNTU: SAUCE: i915: set disable_power_well=0 for icl temporarily"
Related show

Commit Message

Hui Wang Oct. 10, 2019, 4:17 a.m. UTC
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@canonical.com>
---
 drivers/gpu/drm/i915/intel_runtime_pm.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Connor Kuehl Oct. 15, 2019, 4:19 p.m. UTC | #1
On 10/9/19 9:17 PM, Hui Wang wrote:
> 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@canonical.com>

Does something else need to be addressed for Comment #1 on the bug 
report? I think LP: #1847192 has been applied to OSP1 according to its 
LP tasks.

Acked-by: Connor Kuehl <connor.kuehl@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;
>   
>

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