[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <884df31e-7c53-bf64-80b3-08bcb2e99540@suse.de>
Date: Thu, 19 Sep 2019 13:23:30 +0200
From: Thomas Zimmermann <tzimmermann@...e.de>
To: Gerd Hoffmann <kraxel@...hat.com>, dri-devel@...ts.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@...ll.ch>,
Christian Koenig <christian.koenig@....com>,
Huang Rui <ray.huang@....com>, David Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel@...ll.ch>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup
Hi
Am 19.09.19 um 12:02 schrieb Gerd Hoffmann:
> Factor out ttm vma setup to a new function.
> Reduces code duplication a bit.
>
> Signed-off-by: Gerd Hoffmann <kraxel@...hat.com>
> ---
> drivers/gpu/drm/ttm/ttm_bo_vm.c | 46 +++++++++++++++++----------------
> 1 file changed, 24 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> index 4aa007edffb0..b5314ef85a3d 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> @@ -426,6 +426,28 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup(struct ttm_bo_device *bdev,
> return bo;
> }
>
> +void ttm_bo_mmap_vma_setup(struct ttm_buffer_object *bo, struct vm_area_struct *vma)
Internal helper, therefore 'static'.
Best regards
Thomas
> +{
> + vma->vm_ops = &ttm_bo_vm_ops;
> +
> + /*
> + * Note: We're transferring the bo reference to
> + * vma->vm_private_data here.
> + */
> +
> + vma->vm_private_data = bo;
> +
> + /*
> + * We'd like to use VM_PFNMAP on shared mappings, where
> + * (vma->vm_flags & VM_SHARED) != 0, for performance reasons,
> + * but for some reason VM_PFNMAP + x86 PAT + write-combine is very
> + * bad for performance. Until that has been sorted out, use
> + * VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719
> + */
> + vma->vm_flags |= VM_MIXEDMAP;
> + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
> +}
> +
> int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
> struct ttm_bo_device *bdev)
> {
> @@ -449,24 +471,7 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
> if (unlikely(ret != 0))
> goto out_unref;
>
> - vma->vm_ops = &ttm_bo_vm_ops;
> -
> - /*
> - * Note: We're transferring the bo reference to
> - * vma->vm_private_data here.
> - */
> -
> - vma->vm_private_data = bo;
> -
> - /*
> - * We'd like to use VM_PFNMAP on shared mappings, where
> - * (vma->vm_flags & VM_SHARED) != 0, for performance reasons,
> - * but for some reason VM_PFNMAP + x86 PAT + write-combine is very
> - * bad for performance. Until that has been sorted out, use
> - * VM_MIXEDMAP on all mappings. See freedesktop.org bug #75719
> - */
> - vma->vm_flags |= VM_MIXEDMAP;
> - vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
> + ttm_bo_mmap_vma_setup(bo, vma);
> return 0;
> out_unref:
> ttm_bo_put(bo);
> @@ -481,10 +486,7 @@ int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)
>
> ttm_bo_get(bo);
>
> - vma->vm_ops = &ttm_bo_vm_ops;
> - vma->vm_private_data = bo;
> - vma->vm_flags |= VM_MIXEDMAP;
> - vma->vm_flags |= VM_IO | VM_DONTEXPAND;
> + ttm_bo_mmap_vma_setup(bo, vma);
> return 0;
> }
> EXPORT_SYMBOL(ttm_fbdev_mmap);
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)
Powered by blists - more mailing lists