Commit 9431042d authored by Thomas Hellstrom (VMware)'s avatar Thomas Hellstrom (VMware)
Browse files

drm/vmwgfx: Hook up the helpers to align buffer objects 



Start using the helpers that align buffer object user-space addresses and
buffer object vram addresses to huge page boundaries.
This is to improve the chances of allowing huge page-table entries.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Ralph Campbell <rcampbell@nvidia.com>
Cc: "Jérôme Glisse" <jglisse@redhat.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarThomas Hellstrom (VMware) <thomas_os@shipmail.org>
Reviewed-by: default avatarRoland Scheidegger <sroland@vmware.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
parent 7546f7ff

drivers/gpu/drm/drm_file.c

+1 −0
Original line number Diff line number Diff line
@@ -1011,4 +1011,5 @@ unsigned long drm_get_unmapped_area(struct file *file, 
	return current->mm->get_unmapped_area(file, uaddr, len, pgoff, flags);

}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

EXPORT_SYMBOL_GPL(drm_get_unmapped_area);

#endif /* CONFIG_MMU */

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+13 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,18 @@ static void vmw_remove(struct pci_dev *pdev) 
	pci_disable_device(pdev);

}



static unsigned long

vmw_get_unmapped_area(struct file *file, unsigned long uaddr,

		      unsigned long len, unsigned long pgoff,

		      unsigned long flags)

{

	struct drm_file *file_priv = file->private_data;

	struct vmw_private *dev_priv = vmw_priv(file_priv->minor->dev);



	return drm_get_unmapped_area(file, uaddr, len, pgoff, flags,

				     &dev_priv->vma_manager);

}



static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val,

			      void *ptr)

{
@@ -1401,6 +1413,7 @@ static const struct file_operations vmwgfx_driver_fops = { 
	.compat_ioctl = vmw_compat_ioctl,

#endif

	.llseek = noop_llseek,

	.get_unmapped_area = vmw_get_unmapped_area,

};



static struct drm_driver driver = {

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -915,6 +915,7 @@ extern int vmw_mmap(struct file *filp, struct vm_area_struct *vma); 


extern void vmw_validation_mem_init_ttm(struct vmw_private *dev_priv,

					size_t gran);



/**

 * TTM buffer object driver - vmwgfx_ttm_buffer.c

 */

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -749,7 +749,7 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, 
		break;

	case TTM_PL_VRAM:

		/* "On-card" video ram */

		man->func = &ttm_bo_manager_func;

		man->func = &vmw_thp_func;

		man->gpu_offset = 0;

		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;

		man->available_caching = TTM_PL_FLAG_CACHED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE