diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-11-09 10:05:57 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-09 11:49:02 +0100 |
| commit | 95e8f6a21996c4cc2c4574b231c6e858b749dce3 (patch) | |
| tree | 937fef773ca11ac1a984f6d4e36c473286729c1c /drivers | |
| parent | Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau... (diff) | |
| download | linux-95e8f6a21996c4cc2c4574b231c6e858b749dce3.tar.xz linux-95e8f6a21996c4cc2c4574b231c6e858b749dce3.zip | |
drm/vmwgfx: Fix hibernation device reset
The device would not reset properly when resuming from hibernation.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
Cc: stable@vger.kernel.org
Cc: linux-graphics-maintainer@vmware.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index ed3c1e7ddde9..2dd185e42f21 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1098,6 +1098,11 @@ static void vmw_pm_complete(struct device *kdev) struct drm_device *dev = pci_get_drvdata(pdev); struct vmw_private *dev_priv = vmw_priv(dev); + mutex_lock(&dev_priv->hw_mutex); + vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2); + (void) vmw_read(dev_priv, SVGA_REG_ID); + mutex_unlock(&dev_priv->hw_mutex); + /** * Reclaim 3d reference held by fbdev and potentially * start fifo. |