Commit 17cc5139 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next 



Two minor cleanups / fixes for -next.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m=20=28VMware=29?=
Link: https://patchwork.freedesktop.org/patch/msgid/20191114131703.8607-1-thomas_os@shipmail.org
parents 2d0720f5 b4011644

drivers/gpu/drm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ config DRM_TTM 
	  GPU memory types. Will be enabled automatically if a device driver

	  uses it.



config DRM_TTM_DMA_PAGE_POOL

	bool

	depends on DRM_TTM && (SWIOTLB || INTEL_IOMMU)

	default y

	help

	  Choose this if you need the TTM dma page pool



config DRM_VRAM_HELPER

	tristate

	depends on DRM

drivers/gpu/drm/ttm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 


ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \

	ttm_bo_util.o ttm_bo_vm.o ttm_module.o \

	ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o \

	ttm_page_alloc_dma.o

	ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o

ttm-$(CONFIG_AGP) += ttm_agp_backend.o

ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o



obj-$(CONFIG_DRM_TTM) += ttm.o

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

+0 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
 *   when freed).

 */



#if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU)

#define pr_fmt(fmt) "[TTM] " fmt



#include <linux/dma-mapping.h>
@@ -1238,5 +1237,3 @@ int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data) 
	return 0;

}

EXPORT_SYMBOL_GPL(ttm_dma_page_alloc_debugfs);
 


#endif

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -576,8 +576,7 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv) 
	else

		dev_priv->map_mode = vmw_dma_map_populate;



	/* No TTM coherent page pool? FIXME: Ask TTM instead! */

        if (!(IS_ENABLED(CONFIG_SWIOTLB) || IS_ENABLED(CONFIG_INTEL_IOMMU)) &&

        if (!IS_ENABLED(CONFIG_DRM_TTM_DMA_PAGE_POOL) &&

	    (dev_priv->map_mode == vmw_dma_alloc_coherent))

		return -EINVAL;

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

+0 −2
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ static void vmw_hw_surface_destroy(struct vmw_resource *res) 
{



	struct vmw_private *dev_priv = res->dev_priv;

	struct vmw_surface *srf;

	void *cmd;



	if (res->func->destroy == vmw_gb_surface_destroy) {
@@ -360,7 +359,6 @@ static void vmw_hw_surface_destroy(struct vmw_resource *res) 
		 */



		mutex_lock(&dev_priv->cmdbuf_mutex);

		srf = vmw_res_to_srf(res);

		dev_priv->used_memory_size -= res->backup_size;

		mutex_unlock(&dev_priv->cmdbuf_mutex);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE