diff options
| author | Thomas Hellstrom | 2010-10-01 10:21:48 +0200 |
|---|---|---|
| committer | Dave Airlie | 2010-10-01 13:08:50 +0200 |
| commit | 30c78bb838b26ec7997515844c0c734e454b3cba (patch) | |
| tree | 04df1e7175ee697874a099477298eed3c706ec8b /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | drm/vmwgfx: Fix breakage introduced by commit "drm: block userspace under all... (diff) | |
| download | kernel-qcow2-linux-30c78bb838b26ec7997515844c0c734e454b3cba.tar.gz kernel-qcow2-linux-30c78bb838b26ec7997515844c0c734e454b3cba.tar.xz kernel-qcow2-linux-30c78bb838b26ec7997515844c0c734e454b3cba.zip | |
vmwgfx: vt-switch (master drop) fixes
We add an option not to enable fbdev, this option is off (0) by default.
Not enabling fbdev at load time makes it possible to co-operate with
vga16fb and vga text mode when VT switching.
However, if 3D resources are active when VT switching, we're currently
not able to switch over to vga, due to device limitations.
This fixes a bug where we previously lost 3D state during VT switch.
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 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index 429f917b60bf..9142454cc91e 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -277,6 +277,7 @@ struct vmw_private { bool stealth; bool is_opened; + bool enable_fb; /** * Master management. @@ -285,6 +286,9 @@ struct vmw_private { struct vmw_master *active_master; struct vmw_master fbdev_master; struct notifier_block pm_nb; + + struct mutex release_mutex; + uint32_t num_3d_resources; }; static inline struct vmw_private *vmw_priv(struct drm_device *dev) @@ -319,6 +323,9 @@ static inline uint32_t vmw_read(struct vmw_private *dev_priv, return val; } +int vmw_3d_resource_inc(struct vmw_private *dev_priv); +void vmw_3d_resource_dec(struct vmw_private *dev_priv); + /** * GMR utilities - vmwgfx_gmr.c */ |