From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161092AbcK3Kv0 (ORCPT ); Wed, 30 Nov 2016 05:51:26 -0500 Received: from lekensteyn.nl ([178.21.112.251]:54105 "EHLO lekensteyn.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161068AbcK3KvV (ORCPT ); Wed, 30 Nov 2016 05:51:21 -0500 Date: Wed, 30 Nov 2016 11:51:00 +0100 From: Peter Wu To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Alex Deucher , Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [PATCH 4.8 14/37] drm/amdgpu: fix power state when port pm is unavailable Message-ID: <20161130105100.GA20293@al> References: <20161130092729.623248210@linuxfoundation.org> <20161130092730.460938123@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161130092730.460938123@linuxfoundation.org> User-Agent: Mutt/1.7.1 (2016-10-04) X-Spam-Score: -0.0 (/) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Greg, On Wed, Nov 30, 2016 at 10:29:51AM +0100, Greg Kroah-Hartman wrote: > 4.8-stable review patch. If anyone has any objections, please let me know. Please delay this patch (amd tje mext radeon patch, 15/37), it contains a regression for which these patches (from drm-fixes) are needed: drm/radeon: fix check for port PM availability drm/amdgpu: fix check for port PM availability Patches should appear in v4.9-rc8 via https://cgit.freedesktop.org/~airlied/linux/log/?h=drm-fixes Kind regards, Peter > ------------------ > > From: Peter Wu > > commit 1db4496f167bcc7c6541d449355ade2e7d339d52 upstream. > > 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. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98505 > Reported-and-tested-by: Nayan Deshmukh > Signed-off-by: Peter Wu > Signed-off-by: Alex Deucher > Acked-by: Christian König > Reviewed-by: Alex Deucher > Signed-off-by: Greg Kroah-Hartman > > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c > @@ -33,6 +33,7 @@ struct amdgpu_atpx { > > static struct amdgpu_atpx_priv { > bool atpx_detected; > + bool bridge_pm_usable; > /* handle for device - and atpx */ > acpi_handle dhandle; > acpi_handle other_handle; > @@ -200,7 +201,11 @@ static int amdgpu_atpx_validate(struct a > 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 = !amdgpu_atpx_priv.bridge_pm_usable; > atpx->is_hybrid = true; > } > > @@ -471,6 +476,7 @@ static int amdgpu_atpx_power_state(enum > */ > static bool amdgpu_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; > > @@ -485,6 +491,7 @@ static bool amdgpu_atpx_pci_probe_handle > } > amdgpu_atpx_priv.dhandle = dhandle; > amdgpu_atpx_priv.atpx.handle = atpx_handle; > + amdgpu_atpx_priv.bridge_pm_usable = parent_pdev && parent_pdev->bridge_d3; > return true; > } > > >