From: Daniel Vetter Date: Fri, 11 Dec 2020 16:29:41 +0000 (+0100) Subject: drm/vmwgfx: Always evict vram _before_ disabling it X-Git-Tag: microblaze-v5.13~37^2~18^2~39 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=ade94143020a16b1ee968470aec75e25ddd2bce9;p=linux-2.6-microblaze.git drm/vmwgfx: Always evict vram _before_ disabling it Other way round is a bit inconsistent (but not buggy in any kind). This is prep work so that ttm_resource_manager_set_used can assert that the resource manager is empty. Signed-off-by: Daniel Vetter Reviewed-by: Roland Scheidegger Cc: VMware Graphics Cc: Roland Scheidegger Link: https://patchwork.freedesktop.org/patch/msgid/20201211162942.3399050-2-daniel.vetter@ffwll.ch --- diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 9579c63ebca1..408847a68cf3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -1254,9 +1254,9 @@ void vmw_svga_disable(struct vmw_private *dev_priv) vmw_kms_lost_device(&dev_priv->drm); ttm_write_lock(&dev_priv->reservation_sem, false); if (ttm_resource_manager_used(man)) { - ttm_resource_manager_set_used(man, false); if (ttm_resource_manager_evict_all(&dev_priv->bdev, man)) DRM_ERROR("Failed evicting VRAM buffers.\n"); + ttm_resource_manager_set_used(man, false); vmw_write(dev_priv, SVGA_REG_ENABLE, SVGA_REG_ENABLE_HIDE | SVGA_REG_ENABLE_ENABLE);