]>
Commit | Line | Data |
---|---|---|
d4dbfc08 GKH |
1 | From 95e8f6a21996c4cc2c4574b231c6e858b749dce3 Mon Sep 17 00:00:00 2001 |
2 | From: Thomas Hellstrom <thellstrom@vmware.com> | |
3 | Date: Fri, 9 Nov 2012 10:05:57 +0100 | |
4 | Subject: drm/vmwgfx: Fix hibernation device reset | |
5 | ||
6 | From: Thomas Hellstrom <thellstrom@vmware.com> | |
7 | ||
8 | commit 95e8f6a21996c4cc2c4574b231c6e858b749dce3 upstream. | |
9 | ||
10 | The device would not reset properly when resuming from hibernation. | |
11 | ||
12 | Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> | |
13 | Reviewed-by: Brian Paul <brianp@vmware.com> | |
14 | Reviewed-by: Dmitry Torokhov <dtor@vmware.com> | |
15 | Cc: linux-graphics-maintainer@vmware.com | |
16 | Signed-off-by: Dave Airlie <airlied@redhat.com> | |
17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
18 | ||
19 | --- | |
20 | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +++++ | |
21 | 1 file changed, 5 insertions(+) | |
22 | ||
23 | --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
24 | +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
25 | @@ -858,6 +858,11 @@ static void vmw_pm_complete(struct devic | |
26 | struct drm_device *dev = pci_get_drvdata(pdev); | |
27 | struct vmw_private *dev_priv = vmw_priv(dev); | |
28 | ||
29 | + mutex_lock(&dev_priv->hw_mutex); | |
30 | + vmw_write(dev_priv, SVGA_REG_ID, SVGA_ID_2); | |
31 | + (void) vmw_read(dev_priv, SVGA_REG_ID); | |
32 | + mutex_unlock(&dev_priv->hw_mutex); | |
33 | + | |
34 | /** | |
35 | * Reclaim 3d reference held by fbdev and potentially | |
36 | * start fifo. |