From: Thomas Zimmermann Subject: Re: [PATCH v3 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup Date: Thu, 19 Sep 2019 13:23:30 +0200 Message-ID: <884df31e-7c53-bf64-80b3-08bcb2e99540@suse.de> References: <20190919100223.13309-1-kraxel@redhat.com> <20190919100223.13309-7-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uQk2DwosS2wZUX0QjolrnVXilHe4z3Tid" Return-path: In-Reply-To: <20190919100223.13309-7-kraxel@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: Gerd Hoffmann , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , open list List-Id: dri-devel@lists.freedesktop.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --uQk2DwosS2wZUX0QjolrnVXilHe4z3Tid Content-Type: multipart/mixed; boundary="Grr8gef2mKDnC4KQjIw0yMOpTY4I0J5YX"; protected-headers="v1" From: Thomas Zimmermann To: Gerd Hoffmann , dri-devel@lists.freedesktop.org Cc: Daniel Vetter , Christian Koenig , Huang Rui , David Airlie , Daniel Vetter , open list Message-ID: <884df31e-7c53-bf64-80b3-08bcb2e99540@suse.de> Subject: Re: [PATCH v3 06/11] drm/ttm: factor out ttm_bo_mmap_vma_setup References: <20190919100223.13309-1-kraxel@redhat.com> <20190919100223.13309-7-kraxel@redhat.com> In-Reply-To: <20190919100223.13309-7-kraxel@redhat.com> --Grr8gef2mKDnC4KQjIw0yMOpTY4I0J5YX Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Gerd Hoffmann > --- > drivers/gpu/drm/ttm/ttm_bo_vm.c | 46 +++++++++++++++++----------------= > 1 file changed, 24 insertions(+), 22 deletions(-) >=20 > 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; > } > =20 > +void ttm_bo_mmap_vma_setup(struct ttm_buffer_object *bo, struct vm_are= a_struct *vma) Internal helper, therefore 'static'. Best regards Thomas > +{ > + vma->vm_ops =3D &ttm_bo_vm_ops; > + > + /* > + * Note: We're transferring the bo reference to > + * vma->vm_private_data here. > + */ > + > + vma->vm_private_data =3D bo; > + > + /* > + * We'd like to use VM_PFNMAP on shared mappings, where > + * (vma->vm_flags & VM_SHARED) !=3D 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 |=3D VM_MIXEDMAP; > + vma->vm_flags |=3D 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 !=3D 0)) > goto out_unref; > =20 > - vma->vm_ops =3D &ttm_bo_vm_ops; > - > - /* > - * Note: We're transferring the bo reference to > - * vma->vm_private_data here. > - */ > - > - vma->vm_private_data =3D bo; > - > - /* > - * We'd like to use VM_PFNMAP on shared mappings, where > - * (vma->vm_flags & VM_SHARED) !=3D 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 |=3D VM_MIXEDMAP; > - vma->vm_flags |=3D 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, str= uct ttm_buffer_object *bo) > =20 > ttm_bo_get(bo); > =20 > - vma->vm_ops =3D &ttm_bo_vm_ops; > - vma->vm_private_data =3D bo; > - vma->vm_flags |=3D VM_MIXEDMAP; > - vma->vm_flags |=3D VM_IO | VM_DONTEXPAND; > + ttm_bo_mmap_vma_setup(bo, vma); > return 0; > } > EXPORT_SYMBOL(ttm_fbdev_mmap); >=20 --=20 Thomas Zimmermann Graphics Driver Developer SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany GF: Felix Imend=C3=B6rffer, Mary Higgins, Sri Rasiah HRB 21284 (AG N=C3=BCrnberg) --Grr8gef2mKDnC4KQjIw0yMOpTY4I0J5YX-- --uQk2DwosS2wZUX0QjolrnVXilHe4z3Tid Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAl2DZTUACgkQaA3BHVML eiO2WAf/XcLbdOQw1iqyQGrloWaI1L+qgEa2p8Ub3/12XdLmXqFCjbLW3664EPQK NZlyHgu8TGIlbu+f0ujHdb6en1N0BygnCCgCKWZxDQd4FlE70f0yn7wwNI0UkSC4 h9aDTvXz28KlhbTfV2na7DaX/z9RTh5M/t/QfK30noo2n7CC/pSQSnDB8j5BE6Ja Red9zy2Na2unDNjiWF8+vuprept8vHemVkAS9Vslov/hZ9xTvQKKqJhaBO2yc9uM d08EwwQ/3SwtjnJOy0riGWm9MrMjgtIpmkpg/iNyXPcQZJju9NuBkWzh5d4U+CZv sU8ADfZSu0hwKRsz1xHHEiRZlpfa1g== =T7cB -----END PGP SIGNATURE----- --uQk2DwosS2wZUX0QjolrnVXilHe4z3Tid--