Commit 12067e0e authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

drm/ttm: rename ttm_fbdev_mmap 



Rename ttm_fbdev_mmap to ttm_bo_mmap_obj.  Move the vm_pgoff sanity
check to amdgpu_bo_fbdev_mmap (only ttm_fbdev_mmap user in tree).

The ttm_bo_mmap_obj function can now be used to map any buffer object.
This allows to implement &drm_gem_object_funcs.mmap in gem ttm helpers.

v3: patch added to series

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20191016115203.20095-8-kraxel@redhat.com
parent 24e25ea6

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+4 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,10 @@ void amdgpu_bo_fini(struct amdgpu_device *adev) 
int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,

			     struct vm_area_struct *vma)

{

	return ttm_fbdev_mmap(vma, &bo->tbo);

	if (vma->vm_pgoff != 0)

		return -EACCES;



	return ttm_bo_mmap_obj(vma, &bo->tbo);

}



/**

drivers/gpu/drm/ttm/ttm_bo_vm.c

+2 −6
Original line number Diff line number Diff line
@@ -479,14 +479,10 @@ out_unref: 
}

EXPORT_SYMBOL(ttm_bo_mmap);



int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo)

int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *bo)

{

	if (vma->vm_pgoff != 0)

		return -EACCES;



	ttm_bo_get(bo);



	ttm_bo_mmap_vma_setup(bo, vma);

	return 0;

}

EXPORT_SYMBOL(ttm_fbdev_mmap);
 
EXPORT_SYMBOL(ttm_bo_mmap_obj);

include/drm/ttm/ttm_bo_api.h

+4 −6
Original line number Diff line number Diff line
@@ -710,16 +710,14 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo, unsigned long start_page, 
void ttm_bo_kunmap(struct ttm_bo_kmap_obj *map);



/**

 * ttm_fbdev_mmap - mmap fbdev memory backed by a ttm buffer object.

 * ttm_bo_mmap_obj - mmap memory backed by a ttm buffer object.

 *

 * @vma:       vma as input from the fbdev mmap method.

 * @bo:        The bo backing the address space. The address space will

 * have the same size as the bo, and start at offset 0.

 * @bo:        The bo backing the address space.

 *

 * This function is intended to be called by the fbdev mmap method

 * if the fbdev address space is to be backed by a bo.

 * Maps a buffer object.

 */

int ttm_fbdev_mmap(struct vm_area_struct *vma, struct ttm_buffer_object *bo);

int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *bo);



/**

 * ttm_bo_mmap - mmap out of the ttm device address space.

CRA Git | Maintained and supported by SUSTech CRA and CCSE