Commit d5f45d1e authored by Christian König's avatar Christian König Committed by Christian König
Browse files

drm/ttm: remove ttm_tt_destroy_common v2 



Move the functionality into ttm_tt_fini and ttm_bo_tt_destroy instead.

We don't need this any more since we removed the unbind from the destroy
code paths in the drivers.

Also add a warning to ttm_tt_fini() if we try to fini a still populated TT
object.

v2: instead of reverting the patch move the functionality to different
places.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210728130552.2074-5-christian.koenig@amd.com
parent b131d499

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

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

	struct amdgpu_ttm_tt *gtt = (void *)ttm;



	ttm_tt_destroy_common(bdev, ttm);

	if (gtt->usertask)

		put_task_struct(gtt->usertask);

drivers/gpu/drm/drm_gem_vram_helper.c

+0 −1
Original line number Diff line number Diff line
@@ -846,7 +846,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { 


static void bo_driver_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt)

{

	ttm_tt_destroy_common(bdev, tt);

	ttm_tt_fini(tt);

	kfree(tt);

}

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ static void i915_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *ttm) 
{

	struct i915_ttm_tt *i915_tt = container_of(ttm, typeof(*i915_tt), ttm);



	ttm_tt_destroy_common(bdev, ttm);

	kfree(i915_tt);

}

drivers/gpu/drm/nouveau/nouveau_bo.c

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

	struct nouveau_drm *drm = nouveau_bdev(bdev);

	if (drm->agp.bridge) {

		ttm_tt_destroy_common(bdev, ttm);

		ttm_agp_destroy(ttm);

		return;

	}

drivers/gpu/drm/nouveau/nouveau_sgdma.c

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



	if (ttm) {

		ttm_tt_destroy_common(bdev, ttm);

		ttm_tt_fini(&nvbe->ttm);

		kfree(nvbe);

	}