diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2010-10-05 12:43:00 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-06 11:29:33 +1000 |
| commit | 094e0fa8b96c9fab5df9597e728d82f3d87ee471 (patch) | |
| tree | 2cd6825c18acba42fea36b8b3e604266dcdbd5f2 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | d3216a0c3133d8e88ec45c7ecd9f38b421f90c03 (diff) | |
drm/vmwgfx: Fix ACPI S3 & S4 functionality.
Don't suspend or hibernate when there are 3D resources active since we
can't restore the device's 3D state. Instead fail with an error message.
In other cases, make sure we re-enable the fifo and unlock ttm on resume.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.h')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 58de6393f61..132cc248d22 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -286,6 +286,7 @@ struct vmw_private { struct vmw_master *active_master; struct vmw_master fbdev_master; struct notifier_block pm_nb; + bool suspended; struct mutex release_mutex; uint32_t num_3d_resources; |