Commit 49a3f51d authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gem: Use struct dma_buf_map in GEM vmap ops and convert GEM backends 



This patch replaces the vmap/vunmap's use of raw pointers in GEM object
functions with instances of struct dma_buf_map. GEM backends are
converted as well. For most of them, this simply changes the returned type.

TTM-based drivers now return information about the location of the memory,
either system or I/O memory. GEM VRAM helpers and qxl now use ttm_bo_vmap()
et al. Amdgpu, nouveau and radeon use drm_gem_ttm_vmap() et al instead of
implementing their own vmap callbacks.

v7:
	* init QXL cursor to mapped BO buffer (kernel test robot)
v5:
	* update vkms after switch to shmem
v4:
	* use ttm_bo_vmap(), drm_gem_ttm_vmap(), et al. (Daniel, Christian)
	* fix a trailing { in drm_gem_vmap()
	* remove several empty functions instead of converting them (Daniel)
	* comment uses of raw pointers with a TODO (Daniel)
	* TODO list: convert more helpers to use struct dma_buf_map

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Tested-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201103093015.1063-7-tzimmermann@suse.de
parent 43676605

Documentation/gpu/todo.rst

+18 −0
Original line number Diff line number Diff line
@@ -450,6 +450,24 @@ Contact: Ville Syrjälä, Daniel Vetter 


Level: Intermediate



Use struct dma_buf_map throughout codebase

------------------------------------------



Pointers to shared device memory are stored in struct dma_buf_map. Each

instance knows whether it refers to system or I/O memory. Most of the DRM-wide

interface have been converted to use struct dma_buf_map, but implementations

often still use raw pointers.



The task is to use struct dma_buf_map where it makes sense.



* Memory managers should use struct dma_buf_map for dma-buf-imported buffers.

* TTM might benefit from using struct dma_buf_map internally.

* Framebuffer copying and blitting helpers should operate on struct dma_buf_map.



Contact: Thomas Zimmermann <tzimmermann@suse.de>, Christian König, Daniel Vetter



Level: Intermediate





Core refactorings

=================

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ config DRM_RADEON 
	select FW_LOADER

        select DRM_KMS_HELPER

        select DRM_TTM

	select DRM_TTM_HELPER

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE
@@ -252,6 +253,7 @@ config DRM_AMDGPU 
	select DRM_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

	select DRM_TTM_HELPER

	select POWER_SUPPLY

	select HWMON

	select BACKLIGHT_CLASS_DEVICE

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

+0 −36
Original line number Diff line number Diff line
@@ -41,42 +41,6 @@ 
#include <linux/dma-fence-array.h>

#include <linux/pci-p2pdma.h>



/**

 * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation

 * @obj: GEM BO

 *

 * Sets up an in-kernel virtual mapping of the BO's memory.

 *

 * Returns:

 * The virtual address of the mapping or an error pointer.

 */

void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj)

{

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);

	int ret;



	ret = ttm_bo_kmap(&bo->tbo, 0, bo->tbo.num_pages,

			  &bo->dma_buf_vmap);

	if (ret)

		return ERR_PTR(ret);



	return bo->dma_buf_vmap.virtual;

}



/**

 * amdgpu_gem_prime_vunmap - &dma_buf_ops.vunmap implementation

 * @obj: GEM BO

 * @vaddr: Virtual address (unused)

 *

 * Tears down the in-kernel virtual mapping of the BO's memory.

 */

void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)

{

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);



	ttm_bo_kunmap(&bo->dma_buf_vmap);

}



/**

 * amdgpu_gem_prime_mmap - &drm_driver.gem_prime_mmap implementation

 * @obj: GEM BO

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h

+0 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev, 
					    struct dma_buf *dma_buf);

bool amdgpu_dmabuf_is_xgmi_accessible(struct amdgpu_device *adev,

				      struct amdgpu_bo *bo);

void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj);

void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);

int amdgpu_gem_prime_mmap(struct drm_gem_object *obj,

			  struct vm_area_struct *vma);

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

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <drm/amdgpu_drm.h>

#include <drm/drm_debugfs.h>

#include <drm/drm_gem_ttm_helper.h>



#include "amdgpu.h"

#include "amdgpu_display.h"
@@ -220,8 +221,8 @@ static const struct drm_gem_object_funcs amdgpu_gem_object_funcs = { 
	.open = amdgpu_gem_object_open,

	.close = amdgpu_gem_object_close,

	.export = amdgpu_gem_prime_export,

	.vmap = amdgpu_gem_prime_vmap,

	.vunmap = amdgpu_gem_prime_vunmap,

	.vmap = drm_gem_ttm_vmap,

	.vunmap = drm_gem_ttm_vunmap,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE