Attachment 128355 Details for Bug 97980 – possible fix

[patch] possible fix

0001-drm-amdgpu-just-suspend-the-hw-on-pci-shutdown.patch (text/plain), 2.53 KB, created by Alex Deucher on 2016-12-06 15:45:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2016-12-06 15:45:43 UTC

Size: 2.53 KB

patch

obsolete

>From 750e5245bb7c7aee130e7fc704da3179046064ff Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 6 Dec 2016 10:38:29 -0500
>Subject: [PATCH] drm/amdgpu: just suspend the hw on pci shutdown
>
>We can't just reuse pci_remove as there may be userspace still
>doing things.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98638
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97980
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h        | 1 +
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c    | 5 ++++-
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>index b548000..8f96a9b 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>@@ -1711,6 +1711,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
> 				 struct drm_file *file_priv);
> void amdgpu_driver_preclose_kms(struct drm_device *dev,
> 				struct drm_file *file_priv);
>+int amdgpu_suspend(struct amdgpu_device *adev);
> int amdgpu_device_suspend(struct drm_device *dev, bool suspend, bool fbcon);
> int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon);
> u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>index 59adeb5..fd5df8f 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>@@ -1517,7 +1517,7 @@ static int amdgpu_fini(struct amdgpu_device *adev)
> 	return 0;
> }
> 
>-static int amdgpu_suspend(struct amdgpu_device *adev)
>+int amdgpu_suspend(struct amdgpu_device *adev)
> {
> 	int i, r;
> 
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>index 7914f99..8cb937b 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>@@ -486,12 +486,15 @@ amdgpu_pci_remove(struct pci_dev *pdev)
> static void
> amdgpu_pci_shutdown(struct pci_dev *pdev)
> {
>+	struct drm_device *dev = pci_get_drvdata(pdev);
>+	struct amdgpu_device *adev = dev->dev_private;
>+
> 	/* if we are running in a VM, make sure the device
> 	 * torn down properly on reboot/shutdown.
> 	 * unfortunately we can't detect certain
> 	 * hypervisors so just do this all the time.
> 	 */
>-	amdgpu_pci_remove(pdev);
>+	amdgpu_suspend(adev);
> }
> 
> static int amdgpu_pmops_suspend(struct device *dev)
>-- 
>2.5.5
>

Actions: View | Splinter Review

Attachments on bug 97980: 126886 | 127331 | 127340 | 127341 | 127565 | 127566 | 128355 | 128372

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.