diff options
author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-11-09 07:26:11 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-20 01:19:48 -0500 |
commit | ba723fe8b7e88d86825862fa528a75f94b1ad8b1 (patch) | |
tree | 093addc2428cabee7e9bfa9b28a6b7abd5e66ff7 /drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |
parent | 654aa79259a19f0d5e3cf9cb20aff56dc3b041b7 (diff) |
drm/vmwgfx: Enable traces *after* we've hidden SVGA
Hiding SVGA seems to trigger a VGA screen clear, and with no
traces dirty it doesn't seem to repaint
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_drv.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 9f37b72a472..a8b60b86727 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -924,11 +924,11 @@ static int vmw_master_set(struct drm_device *dev, | |||
924 | 924 | ||
925 | out_no_active_lock: | 925 | out_no_active_lock: |
926 | if (!dev_priv->enable_fb) { | 926 | if (!dev_priv->enable_fb) { |
927 | vmw_kms_restore_vga(dev_priv); | ||
928 | vmw_3d_resource_dec(dev_priv, true); | ||
927 | mutex_lock(&dev_priv->hw_mutex); | 929 | mutex_lock(&dev_priv->hw_mutex); |
928 | vmw_write(dev_priv, SVGA_REG_TRACES, 1); | 930 | vmw_write(dev_priv, SVGA_REG_TRACES, 1); |
929 | mutex_unlock(&dev_priv->hw_mutex); | 931 | mutex_unlock(&dev_priv->hw_mutex); |
930 | vmw_kms_restore_vga(dev_priv); | ||
931 | vmw_3d_resource_dec(dev_priv, true); | ||
932 | } | 932 | } |
933 | return ret; | 933 | return ret; |
934 | } | 934 | } |
@@ -962,11 +962,11 @@ static void vmw_master_drop(struct drm_device *dev, | |||
962 | ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM); | 962 | ret = ttm_bo_evict_mm(&dev_priv->bdev, TTM_PL_VRAM); |
963 | if (unlikely(ret != 0)) | 963 | if (unlikely(ret != 0)) |
964 | DRM_ERROR("Unable to clean VRAM on master drop.\n"); | 964 | DRM_ERROR("Unable to clean VRAM on master drop.\n"); |
965 | vmw_kms_restore_vga(dev_priv); | ||
966 | vmw_3d_resource_dec(dev_priv, true); | ||
965 | mutex_lock(&dev_priv->hw_mutex); | 967 | mutex_lock(&dev_priv->hw_mutex); |
966 | vmw_write(dev_priv, SVGA_REG_TRACES, 1); | 968 | vmw_write(dev_priv, SVGA_REG_TRACES, 1); |
967 | mutex_unlock(&dev_priv->hw_mutex); | 969 | mutex_unlock(&dev_priv->hw_mutex); |
968 | vmw_kms_restore_vga(dev_priv); | ||
969 | vmw_3d_resource_dec(dev_priv, true); | ||
970 | } | 970 | } |
971 | 971 | ||
972 | dev_priv->active_master = &dev_priv->fbdev_master; | 972 | dev_priv->active_master = &dev_priv->fbdev_master; |