Am 16.10.19 um 14:18 schrieb Christian König:
> Am 16.10.19 um 13:51 schrieb Gerd Hoffmann:
>> Factor out ttm vma setup to a new function.
>> Reduces code duplication a bit.
>>
>> v2: don't change vm_flags (moved to separate patch).
>> v4: make ttm_bo_mmap_vma_setup static.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@xxxxxxxxxx>
>
> Reviewed-by: Christian König <christian.koenig@xxxxxxx> for this one
> and #7 in the series.
Any objections that I add these two to my drm-ttm-next pull request or
did you wanted to merge that through some other tree?
Thanks,
Christian.
>
>> ---
>> 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..53345c0854d5 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;
>> }
>> +static void ttm_bo_mmap_vma_setup(struct ttm_buffer_object *bo,
>> struct vm_area_struct *vma)
>> +{
>> + 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);
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
