Skip to content

Commit bc701a2

Browse files
zackrThomas Zimmermann
authored andcommitted
drm/vmwgfx: Remove explicit transparent hugepages support
Old versions of the svga device used to export virtual vram, handling of which was optimized on top of transparent hugepages support. Only very old devices (OpenGL 2.1 support and earlier) used this code and at this point performance differences are negligible. Because the code requires very old hardware versions to run it has been largely untested and unused for a long time. Furthermore removal of the ttm hugepages support in: commit 0d97950 ("drm/ttm: remove ttm_bo_vm_insert_huge()") broke the coherency mode in vmwgfx when running with hugepages. Fixes: 0d97950 ("drm/ttm: remove ttm_bo_vm_insert_huge()") Signed-off-by: Zack Rusin <[email protected]> Cc: Jason Gunthorpe <[email protected]> Cc: Thomas Hellström <[email protected]> Cc: Christian König <[email protected]> Cc: Daniel Vetter <[email protected]> Reviewed-by: Martin Krastev <[email protected]> Reviewed-by: Maaz Mombasawala <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 49d535d) Signed-off-by: Thomas Zimmermann <[email protected]>
1 parent 4e07d71 commit bc701a2

File tree

4 files changed

+0
-198
lines changed

4 files changed

+0
-198
lines changed

drivers/gpu/drm/vmwgfx/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,5 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_hashtab.o vmwgfx_kms.o vmwgfx_d
1313
vmwgfx_gem.o
1414

1515
vmwgfx-$(CONFIG_DRM_FBDEV_EMULATION) += vmwgfx_fb.o
16-
vmwgfx-$(CONFIG_TRANSPARENT_HUGEPAGE) += vmwgfx_thp.o
1716

1817
obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -701,23 +701,15 @@ static int vmw_dma_masks(struct vmw_private *dev_priv)
701701
static int vmw_vram_manager_init(struct vmw_private *dev_priv)
702702
{
703703
int ret;
704-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
705-
ret = vmw_thp_init(dev_priv);
706-
#else
707704
ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false,
708705
dev_priv->vram_size >> PAGE_SHIFT);
709-
#endif
710706
ttm_resource_manager_set_used(ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM), false);
711707
return ret;
712708
}
713709

714710
static void vmw_vram_manager_fini(struct vmw_private *dev_priv)
715711
{
716-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
717-
vmw_thp_fini(dev_priv);
718-
#else
719712
ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);
720-
#endif
721713
}
722714

723715
static int vmw_setup_pci_resources(struct vmw_private *dev,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,11 +1564,6 @@ void vmw_bo_dirty_unmap(struct vmw_buffer_object *vbo,
15641564
vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf);
15651565
vm_fault_t vmw_bo_vm_mkwrite(struct vm_fault *vmf);
15661566

1567-
/* Transparent hugepage support - vmwgfx_thp.c */
1568-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
1569-
extern int vmw_thp_init(struct vmw_private *dev_priv);
1570-
void vmw_thp_fini(struct vmw_private *dev_priv);
1571-
#endif
15721567

15731568
/**
15741569
* VMW_DEBUG_KMS - Debug output for kernel mode-setting

drivers/gpu/drm/vmwgfx/vmwgfx_thp.c

Lines changed: 0 additions & 184 deletions
This file was deleted.

0 commit comments

Comments
 (0)