lkml.org 
[lkml]   [2020]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 9/9] drm/vmwgfx: Hook up the helpers to align buffer objects
    Date
    From: Thomas Hellstrom <thellstrom@vmware.com>

    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: Thomas Hellstrom <thellstrom@vmware.com>
    Reviewed-by: Roland Scheidegger <sroland@vmware.com>
    Acked-by: Christian König <christian.koenig@amd.com>
    ---
    drivers/gpu/drm/drm_file.c | 1 +
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 +++++++++++++
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 +
    drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +-
    4 files changed, 16 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
    index 77e691202b52..b29a72b68068 100644
    --- a/drivers/gpu/drm/drm_file.c
    +++ b/drivers/gpu/drm/drm_file.c
    @@ -935,4 +935,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 */
    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    index 827458f49112..77d85bc54ef0 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    @@ -1223,6 +1223,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)
    {
    @@ -1394,6 +1406,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 = {
    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
    index fe5b7293b8d1..4853bd95bf54 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
    @@ -929,6 +929,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
    */
    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
    index d8ea3dd10af0..34c721ab3ff3 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
    @@ -754,7 +754,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;
    --
    2.21.1
    \
     
     \ /
      Last update: 2020-03-04 11:28    [W:4.046 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site