Commit ebdf5651 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: add multihop infrastrucutre (v3) 



Currently drivers get called to move a buffer, but if they have to
move it temporarily through another space (SYSTEM->VRAM via TT)
then they can end up with a lot of ttm->driver->ttm call stacks,
if the temprorary space moves requires eviction.

Instead of letting the driver do all the placement/space for the
temporary, allow it to report back (-EMULTIHOP) and a placement (hop)
to the move code, which will then do the temporary move, and the
correct placement move afterwards.

This removes a lot of code from drivers, at the expense of
adding some midlayering. I've some further ideas on how to turn
it inside out, but I think this is a good solution to the call
stack problems.

v2: separate out the driver patches, add WARN for getting
MULTHOP in paths we shouldn't (Daniel)
v3: use memset (Christian)

Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarhristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201109005432.861936-2-airlied@gmail.com
parent 2dcab875

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

+2 −1
Original line number Diff line number Diff line
@@ -656,7 +656,8 @@ static bool amdgpu_mem_visible(struct amdgpu_device *adev, 
 */

static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,

			  struct ttm_operation_ctx *ctx,

			  struct ttm_resource *new_mem)

			  struct ttm_resource *new_mem,

			  struct ttm_place *hop)

{

	struct amdgpu_device *adev;

	struct amdgpu_bo *abo;

drivers/gpu/drm/drm_gem_vram_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -955,7 +955,8 @@ static void bo_driver_delete_mem_notify(struct ttm_buffer_object *bo) 
static int bo_driver_move(struct ttm_buffer_object *bo,

			  bool evict,

			  struct ttm_operation_ctx *ctx,

			  struct ttm_resource *new_mem)

			  struct ttm_resource *new_mem,

			  struct ttm_place *hop)

{

	struct drm_gem_vram_object *gbo;

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,8 @@ nouveau_bo_vm_cleanup(struct ttm_buffer_object *bo, 
static int

nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,

		struct ttm_operation_ctx *ctx,

		struct ttm_resource *new_reg)

		struct ttm_resource *new_reg,

		struct ttm_place *hop)

{

	struct nouveau_drm *drm = nouveau_bdev(bo->bdev);

	struct nouveau_bo *nvbo = nouveau_bo(bo);

drivers/gpu/drm/qxl/qxl_ttm.c

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ static void qxl_bo_move_notify(struct ttm_buffer_object *bo, 


static int qxl_bo_move(struct ttm_buffer_object *bo, bool evict,

		       struct ttm_operation_ctx *ctx,

		       struct ttm_resource *new_mem)

		       struct ttm_resource *new_mem,

		       struct ttm_place *hop)

{

	struct ttm_resource *old_mem = &bo->mem;

	int ret;

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −1
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ out_cleanup: 


static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,

			  struct ttm_operation_ctx *ctx,

			  struct ttm_resource *new_mem)

			  struct ttm_resource *new_mem,

			  struct ttm_place *hop)

{

	struct radeon_device *rdev;

	struct radeon_bo *rbo;

CRA Git | Maintained and supported by SUSTech CRA and CCSE