Commit d9f36a00 authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie

drm/vmwgfx: Implement basic pm operations.

Currently we really only support S3, since the device doesn't support
saving of the 3D state.

On S3/S4, move all buffer objects to swappable memory and take down
GMR bindings. We need to do that from a PM notifier since we can't
do persistant memory allocations from the standard PM callbacks.
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent e99e1e78
...@@ -147,6 +147,8 @@ static char *vmw_devname = "vmwgfx"; ...@@ -147,6 +147,8 @@ static char *vmw_devname = "vmwgfx";
static int vmw_probe(struct pci_dev *, const struct pci_device_id *); static int vmw_probe(struct pci_dev *, const struct pci_device_id *);
static void vmw_master_init(struct vmw_master *); static void vmw_master_init(struct vmw_master *);
static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
void *ptr);
static void vmw_print_capabilities(uint32_t capabilities) static void vmw_print_capabilities(uint32_t capabilities)
{ {
...@@ -352,6 +354,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) ...@@ -352,6 +354,9 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
vmw_fb_init(dev_priv); vmw_fb_init(dev_priv);
} }
dev_priv->pm_nb.notifier_call = vmwgfx_pm_notifier;
register_pm_notifier(&dev_priv->pm_nb);
return 0; return 0;
out_no_device: out_no_device:
...@@ -386,6 +391,8 @@ static int vmw_driver_unload(struct drm_device *dev) ...@@ -386,6 +391,8 @@ static int vmw_driver_unload(struct drm_device *dev)
DRM_INFO(VMWGFX_DRIVER_NAME " unload.\n"); DRM_INFO(VMWGFX_DRIVER_NAME " unload.\n");
unregister_pm_notifier(&dev_priv->pm_nb);
if (!dev_priv->stealth) { if (!dev_priv->stealth) {
vmw_fb_close(dev_priv); vmw_fb_close(dev_priv);
vmw_kms_close(dev_priv); vmw_kms_close(dev_priv);
...@@ -651,6 +658,57 @@ static void vmw_remove(struct pci_dev *pdev) ...@@ -651,6 +658,57 @@ static void vmw_remove(struct pci_dev *pdev)
drm_put_dev(dev); drm_put_dev(dev);
} }
static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,
void *ptr)
{
struct vmw_private *dev_priv =
container_of(nb, struct vmw_private, pm_nb);
struct vmw_master *vmaster = dev_priv->active_master;
switch (val) {
case PM_HIBERNATION_PREPARE:
case PM_SUSPEND_PREPARE:
ttm_suspend_lock(&vmaster->lock);
/**
* This empties VRAM and unbinds all GMR bindings.
* Buffer contents is moved to swappable memory.
*/
ttm_bo_swapout_all(&dev_priv->bdev);
break;
case PM_POST_HIBERNATION:
case PM_POST_SUSPEND:
ttm_suspend_unlock(&vmaster->lock);
break;
case PM_RESTORE_PREPARE:
break;
case PM_POST_RESTORE:
break;
default:
break;
}
return 0;
}
/**
* These might not be needed with the virtual SVGA device.
*/
int vmw_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
pci_save_state(pdev);
pci_disable_device(pdev);
pci_set_power_state(pdev, PCI_D3hot);
return 0;
}
int vmw_pci_resume(struct pci_dev *pdev)
{
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
return pci_enable_device(pdev);
}
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
DRIVER_MODESET, DRIVER_MODESET,
...@@ -690,7 +748,9 @@ static struct drm_driver driver = { ...@@ -690,7 +748,9 @@ static struct drm_driver driver = {
.name = VMWGFX_DRIVER_NAME, .name = VMWGFX_DRIVER_NAME,
.id_table = vmw_pci_id_list, .id_table = vmw_pci_id_list,
.probe = vmw_probe, .probe = vmw_probe,
.remove = vmw_remove .remove = vmw_remove,
.suspend = vmw_pci_suspend,
.resume = vmw_pci_resume
}, },
.name = VMWGFX_DRIVER_NAME, .name = VMWGFX_DRIVER_NAME,
.desc = VMWGFX_DRIVER_DESC, .desc = VMWGFX_DRIVER_DESC,
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "drmP.h" #include "drmP.h"
#include "vmwgfx_drm.h" #include "vmwgfx_drm.h"
#include "drm_hashtab.h" #include "drm_hashtab.h"
#include "linux/suspend.h"
#include "ttm/ttm_bo_driver.h" #include "ttm/ttm_bo_driver.h"
#include "ttm/ttm_object.h" #include "ttm/ttm_object.h"
#include "ttm/ttm_lock.h" #include "ttm/ttm_lock.h"
...@@ -258,6 +259,7 @@ struct vmw_private { ...@@ -258,6 +259,7 @@ struct vmw_private {
struct vmw_master *active_master; struct vmw_master *active_master;
struct vmw_master fbdev_master; struct vmw_master fbdev_master;
struct notifier_block pm_nb;
}; };
static inline struct vmw_private *vmw_priv(struct drm_device *dev) static inline struct vmw_private *vmw_priv(struct drm_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment