+7

drivers/gpu/drm/Kconfig

reviewed

··· 179 179 GPU memory types. Will be enabled automatically if a device driver 180 180 uses it. 181 181 182 182 + config DRM_TTM_DMA_PAGE_POOL 183 183 + bool 184 184 + depends on DRM_TTM && (SWIOTLB || INTEL_IOMMU) 185 185 + default y 186 186 + help 187 187 + Choose this if you need the TTM dma page pool 188 188 + 182 189 config DRM_VRAM_HELPER 183 190 tristate 184 191 depends on DRM

+2 -2

drivers/gpu/drm/ttm/Makefile

reviewed

··· 4 4 5 5 ttm-y := ttm_memory.o ttm_tt.o ttm_bo.o \ 6 6 ttm_bo_util.o ttm_bo_vm.o ttm_module.o \ 7 7 - ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o \ 8 8 - ttm_page_alloc_dma.o 7 7 + ttm_execbuf_util.o ttm_page_alloc.o ttm_bo_manager.o 9 8 ttm-$(CONFIG_AGP) += ttm_agp_backend.o 9 9 + ttm-$(CONFIG_DRM_TTM_DMA_PAGE_POOL) += ttm_page_alloc_dma.o 10 10 11 11 obj-$(CONFIG_DRM_TTM) += ttm.o

-3

drivers/gpu/drm/ttm/ttm_page_alloc_dma.c

reviewed

··· 33 33 * when freed). 34 34 */ 35 35 36 36 - #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) 37 36 #define pr_fmt(fmt) "[TTM] " fmt 38 37 39 38 #include <linux/dma-mapping.h> ··· 1237 1238 return 0; 1238 1239 } 1239 1240 EXPORT_SYMBOL_GPL(ttm_dma_page_alloc_debugfs); 1240 1240 - 1241 1241 - #endif

+1 -2

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

reviewed

··· 576 576 else 577 577 dev_priv->map_mode = vmw_dma_map_populate; 578 578 579 579 - /* No TTM coherent page pool? FIXME: Ask TTM instead! */ 580 580 - if (!(IS_ENABLED(CONFIG_SWIOTLB) || IS_ENABLED(CONFIG_INTEL_IOMMU)) && 579 579 + if (!IS_ENABLED(CONFIG_DRM_TTM_DMA_PAGE_POOL) && 581 580 (dev_priv->map_mode == vmw_dma_alloc_coherent)) 582 581 return -EINVAL; 583 582

-2

drivers/gpu/drm/vmwgfx/vmwgfx_surface.c

reviewed

··· 336 336 { 337 337 338 338 struct vmw_private *dev_priv = res->dev_priv; 339 339 - struct vmw_surface *srf; 340 339 void *cmd; 341 340 342 341 if (res->func->destroy == vmw_gb_surface_destroy) { ··· 359 360 */ 360 361 361 362 mutex_lock(&dev_priv->cmdbuf_mutex); 362 362 - srf = vmw_res_to_srf(res); 363 363 dev_priv->used_memory_size -= res->backup_size; 364 364 mutex_unlock(&dev_priv->cmdbuf_mutex); 365 365 }

+1 -1

include/drm/ttm/ttm_page_alloc.h

reviewed

··· 74 74 */ 75 75 int ttm_page_alloc_debugfs(struct seq_file *m, void *data); 76 76 77 77 - #if defined(CONFIG_SWIOTLB) || defined(CONFIG_INTEL_IOMMU) 77 77 + #if defined(CONFIG_DRM_TTM_DMA_PAGE_POOL) 78 78 /** 79 79 * Initialize pool allocator. 80 80 */