Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / drivers / gpu / drm / radeon / radeon_drv.c

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 78367ba8bb7dc5b87aec81215793a9441e559c58..91c8f433956605e1f5106b69df1af9123e3bd2c5 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -365,10 +365,11 @@ 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
+        * torn down properly on reboot/shutdown.
+        * unfortunately we can't detect certain
+        * hypervisors so just do this all the time.
         */
-       if (radeon_device_is_virtual())
-               radeon_pci_remove(pdev);
+       radeon_pci_remove(pdev);
 }
 
 static int radeon_pmops_suspend(struct device *dev)