drm/amdgpu: wire up a pci shutdown callback
Subsystems (2)
PATCH 1/2 drm/amdgpu: wire up a pci shutdown callback
Normally on shutdown or reboot we don't care about necessarily making sure the hw is in a good state because the system is about to be powered down or reset. However, after a shutdown or reboot in a VM, it's best to tear down the hw properly otherwise there can be problems with the next VM use.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +14 -0
@@ -392,6 +392,19 @@ amdgpu_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } +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 +*/ +if (adev->virtualization.is_virtual) +amdgpu_pci_remove (pdev); +} +static int amdgpu_pmops_suspend (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
@@ -605,6 +618,7 @@ static struct pci_driver amdgpu_kms_pci_driver = { .id_table = pciidlist, .probe = amdgpu_pci_probe, .remove = amdgpu_pci_remove, + .shutdown = amdgpu_pci_shutdown, .driver.pm = &amdgpu_pm_ops, };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1471890641-4759-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/radeon: wire up a pci shutdown callback
Normally on shutdown or reboot we don't care about necessarily making sure the hw is in a good state because the system is about to be powered down or reset. However, after a shutdown or reboot in a VM, it's best to tear down the hw properly otherwise there can be problems with the next VM use.
--- drivers/gpu/drm/radeon/radeon_device.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_device.c +1 -1
@@ -639,7 +639,7 @@ void radeon_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc)* Used at driver startup. * Returns true if virtual or false if not. */ -static bool radeon_device_is_virtual (void ) +bool radeon_device_is_virtual (void ) {#ifdef CONFIG_X86 return boot_cpu_has (X86_FEATURE_HYPERVISOR );
drivers/gpu/drm/radeon/radeon_drv.c +13 -0
@@ -309,6 +309,8 @@ MODULE_DEVICE_TABLE(pci, pciidlist);static struct drm_driver kms_driver; +bool radeon_device_is_virtual (void ); +static int radeon_kick_out_firmware_fb (struct pci_dev *pdev) {struct apertures_struct *ap;
@@ -362,6 +364,16 @@ radeon_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } +static void +radeon_pci_shutdown (struct pci_dev *pdev) +{ +/* if we are running in a VM, make sure the device +* torn down properly on reboot/shutdown +*/ +if (radeon_device_is_virtual ()) +radeon_pci_remove (pdev); +} +static int radeon_pmops_suspend (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
@@ -574,6 +586,7 @@ static struct pci_driver radeon_kms_pci_driver = { .id_table = pciidlist, .probe = radeon_pci_probe, .remove = radeon_pci_remove, + .shutdown = radeon_pci_shutdown, .driver.pm = &radeon_pm_ops, };
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Edward O'Callaghan
Reviewed-byThis series is,
Quoted 37 lines · Alex Deucher
Normally on shutdown or reboot we don't care about necessarily making sure the hw is in a good state because the system is about to be powered down or reset. However, after a shutdown or reboot in a VM, it's best to tear down the hw properly otherwise there can be problems with the next VM use.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +13
-0@@ -392,6 +392,19 @@ amdgpu_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } +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 +*/ +if (adev->virtualization.is_virtual) +amdgpu_pci_remove (pdev); +} +static int amdgpu_pmops_suspend (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c static struct pci_driver amdgpu_kms_pci_driver = { · line 624
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0@@ -605,6 +618,7 @@ static struct pci_driver amdgpu_kms_pci_driver = { .id_table = pciidlist, .probe = amdgpu_pci_probe, .remove = amdgpu_pci_remove, + .shutdown = amdgpu_pci_shutdown, .driver.pm = &amdgpu_pm_ops, };
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 22.08.2016 um 20:30 schrieb Alex Deucher:
Quoted 7 lines
Normally on shutdown or reboot we don't care about necessarily making sure the hw is in a good state because the system is about to be powered down or reset. However, after a shutdown or reboot in a VM, it's best to tear down the hw properly otherwise there can be problems with the next VM use.
Signed-off-by Alex Deucher <[email protected]>
Both patches are Reviewed-by: Christian König <[email protected]>
Regards,
Christian.
Quoted 29 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +13
-0@@ -392,6 +392,19 @@ amdgpu_pci_remove(struct pci_dev *pdev)drm_put_dev (dev); } +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 +*/ +if (adev->virtualization.is_virtual) +amdgpu_pci_remove (pdev); +} +static int amdgpu_pmops_suspend (struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c static struct pci_driver amdgpu_kms_pci_driver = { · line 624
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1
-0@@ -605,6 +618,7 @@ static struct pci_driver amdgpu_kms_pci_driver = { .id_table = pciidlist, .probe = amdgpu_pci_probe, .remove = amdgpu_pci_remove, + .shutdown = amdgpu_pci_shutdown, .driver.pm = &amdgpu_pm_ops, };
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx