Commit ade94143 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarRoland Scheidegger <sroland@vmware.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Roland Scheidegger <sroland@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201211162942.3399050-2-daniel.vetter@ffwll.ch
parent ff36baf8

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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);