Commit d7c59750 authored by Christian König's avatar Christian König
Browse files

drm/vmwgfx: move ttm_bo_swapout_all into vmwgfx 



It is the sole user of this.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/393498/
parent 4561b366

drivers/gpu/drm/ttm/ttm_bo.c

+0 −11
Original line number Diff line number Diff line
@@ -1525,17 +1525,6 @@ int ttm_bo_swapout(struct ttm_operation_ctx *ctx) 
}

EXPORT_SYMBOL(ttm_bo_swapout);



void ttm_bo_swapout_all(void)

{

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false

	};



	while (ttm_bo_swapout(&ctx) == 0);

}

EXPORT_SYMBOL(ttm_bo_swapout_all);



void ttm_bo_tt_destroy(struct ttm_buffer_object *bo)

{

	if (bo->ttm == NULL)

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+5 −1
Original line number Diff line number Diff line
@@ -1370,6 +1370,10 @@ static int vmw_pm_freeze(struct device *kdev) 
	struct pci_dev *pdev = to_pci_dev(kdev);

	struct drm_device *dev = pci_get_drvdata(pdev);

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct ttm_operation_ctx ctx = {

		.interruptible = false,

		.no_wait_gpu = false

	};

	int ret;



	/*
@@ -1390,7 +1394,7 @@ static int vmw_pm_freeze(struct device *kdev) 
	vmw_execbuf_release_pinned_bo(dev_priv);

	vmw_resource_evict_all(dev_priv);

	vmw_release_device_early(dev_priv);

	ttm_bo_swapout_all();

	while (ttm_bo_swapout(&ctx) == 0);

	if (dev_priv->enable_fb)

		vmw_fifo_resource_dec(dev_priv);

	if (atomic_read(&dev_priv->num_fifo_resources) != 0) {

include/drm/ttm/ttm_bo_api.h

+0 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp, 
		  size_t count, loff_t *f_pos, bool write);



int ttm_bo_swapout(struct ttm_operation_ctx *ctx);

void ttm_bo_swapout_all(void);



/**

 * ttm_bo_uses_embedded_gem_object - check if the given bo uses the