Commit 37bff654 authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/ttm: move unbind into the tt destroy. 



This moves unbind into the driver side on destroy paths.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200917043040.146575-4-airlied@gmail.com
parent 7626168f

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

+1 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,7 @@ static void amdgpu_ttm_backend_destroy(struct ttm_bo_device *bdev, 
{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;



	amdgpu_ttm_backend_unbind(bdev, ttm);

	ttm_tt_destroy_common(bdev, ttm);

	if (gtt->usertask)

		put_task_struct(gtt->usertask);

drivers/gpu/drm/nouveau/nouveau_bo.c

+1 −0
Original line number Diff line number Diff line
@@ -1372,6 +1372,7 @@ nouveau_ttm_tt_destroy(struct ttm_bo_device *bdev, 
#if IS_ENABLED(CONFIG_AGP)

	struct nouveau_drm *drm = nouveau_bdev(bdev);

	if (drm->agp.bridge) {

		ttm_agp_unbind(ttm);

		ttm_tt_destroy_common(bdev, ttm);

		ttm_agp_destroy(ttm);

		return;

drivers/gpu/drm/nouveau/nouveau_sgdma.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ nouveau_sgdma_destroy(struct ttm_bo_device *bdev, struct ttm_tt *ttm) 
	struct nouveau_sgdma_be *nvbe = (struct nouveau_sgdma_be *)ttm;



	if (ttm) {

		nouveau_sgdma_unbind(bdev, ttm);

		ttm_tt_destroy_common(bdev, ttm);

		ttm_dma_tt_fini(&nvbe->ttm);

		kfree(nvbe);

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −0
Original line number Diff line number Diff line
@@ -576,6 +576,7 @@ static void radeon_ttm_backend_destroy(struct ttm_bo_device *bdev, struct ttm_tt 
{

	struct radeon_ttm_tt *gtt = (void *)ttm;



	radeon_ttm_backend_unbind(bdev, ttm);

	ttm_tt_destroy_common(bdev, ttm);



	ttm_dma_tt_fini(&gtt->ttm);
@@ -757,6 +758,7 @@ static void radeon_ttm_tt_destroy(struct ttm_bo_device *bdev, 
	struct radeon_device *rdev = radeon_get_rdev(bdev);



	if (rdev->flags & RADEON_IS_AGP) {

		ttm_agp_unbind(ttm);

		ttm_tt_destroy_common(bdev, ttm);

		ttm_agp_destroy(ttm);

		return;

drivers/gpu/drm/ttm/ttm_bo.c

+0 −1
Original line number Diff line number Diff line
@@ -1619,7 +1619,6 @@ void ttm_bo_tt_destroy(struct ttm_buffer_object *bo) 
	if (bo->ttm == NULL)

		return;



	ttm_bo_tt_unbind(bo);

	ttm_tt_destroy(bo->bdev, bo->ttm);

	bo->ttm = NULL;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE