diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2011-08-31 11:42:52 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-09-01 12:38:00 +0400 |
| commit | 05730b32a78dab4bed8fb7ccc64c53d9fcf31e9d (patch) | |
| tree | 0c01aee6881e52d22c727284e18e2efd3dd31592 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | |
| parent | be38ab6ea7b0de0542a0ff78690d63bb22f66a4d (diff) | |
| download | linux-05730b32a78dab4bed8fb7ccc64c53d9fcf31e9d.tar.xz | |
vmwgfx: Switch to VGA when we drop master and vmwgfx fbdev is not active
Previously this was not done when any 3D resource was active,
since that meant disabling the fifo with all 3D state lost.
Now, if there are still 3D resources active, we use the svga hide feature.
This fixes X server VT switching with 3D enabled.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h index ec09a3fa2ac2..95b75000f0c9 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h @@ -319,8 +319,8 @@ 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); +int vmw_3d_resource_inc(struct vmw_private *dev_priv, bool unhide_svga); +void vmw_3d_resource_dec(struct vmw_private *dev_priv, bool hide_svga); /** * GMR utilities - vmwgfx_gmr.c |