All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/radeon: fix power state when port pm is unavailable (v2)
@ 2016-11-23 17:43 Alex Deucher
  2016-11-23 18:34   ` Peter Wu
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2016-11-23 17:43 UTC (permalink / raw)
  To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
  Cc: Alex Deucher, stable-u79uwXL29TY76Z2rM5mHXA, Peter Wu

From: Peter Wu <peter@lekensteyn.nl>

When PCIe port PM is not enabled (system BIOS is pre-2015 or the
pcie_port_pm=off parameter is set), legacy ATPX PM should still be
marked as supported. Otherwise the GPU can fail to power on after
runtime suspend. This affected a Dell Inspiron 5548.

Ideally the BIOS date in the PCI core is lowered to 2013 (the first year
where hybrid graphics platforms using power resources was introduced),
but that seems more risky at this point and would not solve the
pcie_port_pm=off issue.

v2: agd: fix typo

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98505
Signed-off-by: Peter Wu <peter@lekensteyn.nl>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 4.8
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/radeon/radeon_atpx_handler.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
index 2fdcd04..4129b12 100644
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
@@ -34,6 +34,7 @@ struct radeon_atpx {
 
 static struct radeon_atpx_priv {
 	bool atpx_detected;
+	bool bridge_pm_usable;
 	/* handle for device - and atpx */
 	acpi_handle dhandle;
 	struct radeon_atpx atpx;
@@ -203,7 +204,11 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
 	atpx->is_hybrid = false;
 	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
 		printk("ATPX Hybrid Graphics\n");
-		atpx->functions.power_cntl = false;
+		/*
+		 * Disable legacy PM methods only when pcie port PM is usable,
+		 * otherwise the device might fail to power off or power on.
+		 */
+		atpx->functions.power_cntl = !radeon_atpx_priv.bridge_pm_usable;
 		atpx->is_hybrid = true;
 	}
 
@@ -474,6 +479,7 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
  */
 static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 {
+	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
 	acpi_handle dhandle, atpx_handle;
 	acpi_status status;
 
@@ -487,6 +493,7 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
 
 	radeon_atpx_priv.dhandle = dhandle;
 	radeon_atpx_priv.atpx.handle = atpx_handle;
+	radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
 	return true;
 }
 
-- 
2.5.5

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix power state when port pm is unavailable (v2)
@ 2016-11-23 18:34   ` Peter Wu
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Wu @ 2016-11-23 18:34 UTC (permalink / raw)
  To: Alex Deucher; +Cc: amd-gfx, Alex Deucher, stable

On Wed, Nov 23, 2016 at 12:43:33PM -0500, Alex Deucher wrote:
> From: Peter Wu <peter@lekensteyn.nl>
> 
> When PCIe port PM is not enabled (system BIOS is pre-2015 or the
> pcie_port_pm=off parameter is set), legacy ATPX PM should still be
> marked as supported. Otherwise the GPU can fail to power on after
> runtime suspend. This affected a Dell Inspiron 5548.
> 
> Ideally the BIOS date in the PCI core is lowered to 2013 (the first year
> where hybrid graphics platforms using power resources was introduced),
> but that seems more risky at this point and would not solve the
> pcie_port_pm=off issue.
> 
> v2: agd: fix typo

Oops, silly copy/paste error from my side (accidentally replaced
is_hybrid instead of power_cntl). Good catch!

Peter

PS. mail server refused to accept mail due to '#' in Cc, need CC:
<stable@...> # 4.8+ below.

> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98505
> Signed-off-by: Peter Wu <peter@lekensteyn.nl>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org # 4.8
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/radeon/radeon_atpx_handler.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> index 2fdcd04..4129b12 100644
> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> @@ -34,6 +34,7 @@ struct radeon_atpx {
>  
>  static struct radeon_atpx_priv {
>  	bool atpx_detected;
> +	bool bridge_pm_usable;
>  	/* handle for device - and atpx */
>  	acpi_handle dhandle;
>  	struct radeon_atpx atpx;
> @@ -203,7 +204,11 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
>  	atpx->is_hybrid = false;
>  	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
>  		printk("ATPX Hybrid Graphics\n");
> -		atpx->functions.power_cntl = false;
> +		/*
> +		 * Disable legacy PM methods only when pcie port PM is usable,
> +		 * otherwise the device might fail to power off or power on.
> +		 */
> +		atpx->functions.power_cntl = !radeon_atpx_priv.bridge_pm_usable;
>  		atpx->is_hybrid = true;
>  	}
>  
> @@ -474,6 +479,7 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
>   */
>  static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>  {
> +	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
>  	acpi_handle dhandle, atpx_handle;
>  	acpi_status status;
>  
> @@ -487,6 +493,7 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>  
>  	radeon_atpx_priv.dhandle = dhandle;
>  	radeon_atpx_priv.atpx.handle = atpx_handle;
> +	radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
>  	return true;
>  }
>  
> -- 
> 2.5.5

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix power state when port pm is unavailable (v2)
@ 2016-11-23 18:34   ` Peter Wu
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Wu @ 2016-11-23 18:34 UTC (permalink / raw)
  To: Alex Deucher
  Cc: Alex Deucher, stable-u79uwXL29TY76Z2rM5mHXA,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW

On Wed, Nov 23, 2016 at 12:43:33PM -0500, Alex Deucher wrote:
> From: Peter Wu <peter@lekensteyn.nl>
> 
> When PCIe port PM is not enabled (system BIOS is pre-2015 or the
> pcie_port_pm=off parameter is set), legacy ATPX PM should still be
> marked as supported. Otherwise the GPU can fail to power on after
> runtime suspend. This affected a Dell Inspiron 5548.
> 
> Ideally the BIOS date in the PCI core is lowered to 2013 (the first year
> where hybrid graphics platforms using power resources was introduced),
> but that seems more risky at this point and would not solve the
> pcie_port_pm=off issue.
> 
> v2: agd: fix typo

Oops, silly copy/paste error from my side (accidentally replaced
is_hybrid instead of power_cntl). Good catch!

Peter

PS. mail server refused to accept mail due to '#' in Cc, need CC:
<stable@...> # 4.8+ below.

> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98505
> Signed-off-by: Peter Wu <peter@lekensteyn.nl>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: stable@vger.kernel.org # 4.8
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/radeon/radeon_atpx_handler.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> index 2fdcd04..4129b12 100644
> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
> @@ -34,6 +34,7 @@ struct radeon_atpx {
>  
>  static struct radeon_atpx_priv {
>  	bool atpx_detected;
> +	bool bridge_pm_usable;
>  	/* handle for device - and atpx */
>  	acpi_handle dhandle;
>  	struct radeon_atpx atpx;
> @@ -203,7 +204,11 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
>  	atpx->is_hybrid = false;
>  	if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
>  		printk("ATPX Hybrid Graphics\n");
> -		atpx->functions.power_cntl = false;
> +		/*
> +		 * Disable legacy PM methods only when pcie port PM is usable,
> +		 * otherwise the device might fail to power off or power on.
> +		 */
> +		atpx->functions.power_cntl = !radeon_atpx_priv.bridge_pm_usable;
>  		atpx->is_hybrid = true;
>  	}
>  
> @@ -474,6 +479,7 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
>   */
>  static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>  {
> +	struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
>  	acpi_handle dhandle, atpx_handle;
>  	acpi_status status;
>  
> @@ -487,6 +493,7 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>  
>  	radeon_atpx_priv.dhandle = dhandle;
>  	radeon_atpx_priv.atpx.handle = atpx_handle;
> +	radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
>  	return true;
>  }
>  
> -- 
> 2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/radeon: fix power state when port pm is unavailable (v2)
  2016-11-23 18:34   ` Peter Wu
  (?)
@ 2016-11-23 18:58   ` Alex Deucher
  -1 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2016-11-23 18:58 UTC (permalink / raw)
  To: Peter Wu; +Cc: amd-gfx list, Alex Deucher, for 3.8

On Wed, Nov 23, 2016 at 1:34 PM, Peter Wu <peter@lekensteyn.nl> wrote:
> On Wed, Nov 23, 2016 at 12:43:33PM -0500, Alex Deucher wrote:
>> From: Peter Wu <peter@lekensteyn.nl>
>>
>> When PCIe port PM is not enabled (system BIOS is pre-2015 or the
>> pcie_port_pm=off parameter is set), legacy ATPX PM should still be
>> marked as supported. Otherwise the GPU can fail to power on after
>> runtime suspend. This affected a Dell Inspiron 5548.
>>
>> Ideally the BIOS date in the PCI core is lowered to 2013 (the first year
>> where hybrid graphics platforms using power resources was introduced),
>> but that seems more risky at this point and would not solve the
>> pcie_port_pm=off issue.
>>
>> v2: agd: fix typo
>
> Oops, silly copy/paste error from my side (accidentally replaced
> is_hybrid instead of power_cntl). Good catch!
>
> Peter
>
> PS. mail server refused to accept mail due to '#' in Cc, need CC:
> <stable@...> # 4.8+ below.

Whoops.  fixed.  thanks.

Alex

>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98505
>> Signed-off-by: Peter Wu <peter@lekensteyn.nl>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Cc: stable@vger.kernel.org # 4.8
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>> ---
>>  drivers/gpu/drm/radeon/radeon_atpx_handler.c | 9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
>> index 2fdcd04..4129b12 100644
>> --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
>> +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
>> @@ -34,6 +34,7 @@ struct radeon_atpx {
>>
>>  static struct radeon_atpx_priv {
>>       bool atpx_detected;
>> +     bool bridge_pm_usable;
>>       /* handle for device - and atpx */
>>       acpi_handle dhandle;
>>       struct radeon_atpx atpx;
>> @@ -203,7 +204,11 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx)
>>       atpx->is_hybrid = false;
>>       if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) {
>>               printk("ATPX Hybrid Graphics\n");
>> -             atpx->functions.power_cntl = false;
>> +             /*
>> +              * Disable legacy PM methods only when pcie port PM is usable,
>> +              * otherwise the device might fail to power off or power on.
>> +              */
>> +             atpx->functions.power_cntl = !radeon_atpx_priv.bridge_pm_usable;
>>               atpx->is_hybrid = true;
>>       }
>>
>> @@ -474,6 +479,7 @@ static int radeon_atpx_power_state(enum vga_switcheroo_client_id id,
>>   */
>>  static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>>  {
>> +     struct pci_dev *parent_pdev = pci_upstream_bridge(pdev);
>>       acpi_handle dhandle, atpx_handle;
>>       acpi_status status;
>>
>> @@ -487,6 +493,7 @@ static bool radeon_atpx_pci_probe_handle(struct pci_dev *pdev)
>>
>>       radeon_atpx_priv.dhandle = dhandle;
>>       radeon_atpx_priv.atpx.handle = atpx_handle;
>> +     radeon_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3;
>>       return true;
>>  }
>>
>> --
>> 2.5.5

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-23 19:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-23 17:43 [PATCH] drm/radeon: fix power state when port pm is unavailable (v2) Alex Deucher
2016-11-23 18:34 ` Peter Wu
2016-11-23 18:34   ` Peter Wu
2016-11-23 18:58   ` Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.