public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/vmwgfx/ttm: convert vram mm init to new code paths

Browse source 
Split out the vram thp init path vs the range manager init.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200804025632.3868079-21-airlied@gmail.com
This commit is contained in:
Dave Airlie 2020-08-04 12:55:53 +10:00
parent e9172ada44
commit 252f8d7b91
3 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
View file

@ -620,6 +620,23 @@ static int vmw_dma_masks(struct vmw_private *dev_priv)
return ret; return ret;
} }
static int vmw_vram_manager_init(struct vmw_private *dev_priv)
{
int ret;
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
ret = vmw_thp_init(dev_priv);
#else
struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
man->available_caching = TTM_PL_FLAG_CACHED;
man->default_caching = TTM_PL_FLAG_CACHED;
ret = ttm_range_man_init(&dev_priv->bdev, man,
dev_priv->vram_size >> PAGE_SHIFT);
#endif
dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
return ret;
}
static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
{ {
struct vmw_private *dev_priv; struct vmw_private *dev_priv;
@ -866,16 +883,12 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
* Enable VRAM, but initially don't use it until SVGA is enabled and * Enable VRAM, but initially don't use it until SVGA is enabled and
* unhidden. * unhidden.
*/ */
dev_priv->bdev.man[TTM_PL_VRAM].func = &vmw_thp_func;
dev_priv->bdev.man[TTM_PL_VRAM].available_caching = TTM_PL_FLAG_CACHED; ret = vmw_vram_manager_init(dev_priv);
dev_priv->bdev.man[TTM_PL_VRAM].default_caching = TTM_PL_FLAG_CACHED;
ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_VRAM,
(dev_priv->vram_size >> PAGE_SHIFT));
if (unlikely(ret != 0)) { if (unlikely(ret != 0)) {
DRM_ERROR("Failed initializing memory manager for VRAM.\n"); DRM_ERROR("Failed initializing memory manager for VRAM.\n");
goto out_no_vram; goto out_no_vram;
} }
dev_priv->bdev.man[TTM_PL_VRAM].use_type = false;
/* /*
* "Guest Memory Regions" is an aperture like feature with * "Guest Memory Regions" is an aperture like feature with

4
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
View file

@ -1520,9 +1520,7 @@ vm_fault_t vmw_bo_vm_huge_fault(struct vm_fault *vmf,
/* Transparent hugepage support - vmwgfx_thp.c */ /* Transparent hugepage support - vmwgfx_thp.c */
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE
extern const struct ttm_mem_type_manager_func vmw_thp_func; extern int vmw_thp_init(struct vmw_private *dev_priv);
#else
#define vmw_thp_func ttm_bo_manager_func
#endif #endif
/** /**

12
drivers/gpu/drm/vmwgfx/vmwgfx_thp.c
View file

@ -115,18 +115,23 @@ static void vmw_thp_put_node(struct ttm_mem_type_manager *man,
} }
} }
static int vmw_thp_init(struct ttm_mem_type_manager *man, int vmw_thp_init(struct vmw_private *dev_priv)
unsigned long p_size)
{ {
struct ttm_mem_type_manager *man = &dev_priv->bdev.man[TTM_PL_VRAM];
struct vmw_thp_manager *rman; struct vmw_thp_manager *rman;
man->available_caching = TTM_PL_FLAG_CACHED;
man->default_caching = TTM_PL_FLAG_CACHED;
ttm_mem_type_manager_init(&dev_priv->bdev, man,
dev_priv->vram_size >> PAGE_SHIFT);
rman = kzalloc(sizeof(*rman), GFP_KERNEL); rman = kzalloc(sizeof(*rman), GFP_KERNEL);
if (!rman) if (!rman)
return -ENOMEM; return -ENOMEM;
drm_mm_init(&rman->mm, 0, p_size); drm_mm_init(&rman->mm, 0, man->size);
spin_lock_init(&rman->lock); spin_lock_init(&rman->lock);
man->priv = rman; man->priv = rman;
ttm_mem_type_manager_set_used(man, true);
return 0; return 0;
} }
@ -158,7 +163,6 @@ static void vmw_thp_debug(struct ttm_mem_type_manager *man,
} }
const struct ttm_mem_type_manager_func vmw_thp_func = { const struct ttm_mem_type_manager_func vmw_thp_func = {
.init = vmw_thp_init,
.takedown = vmw_thp_takedown, .takedown = vmw_thp_takedown,
.get_node = vmw_thp_get_node, .get_node = vmw_thp_get_node,
.put_node = vmw_thp_put_node, .put_node = vmw_thp_put_node,