Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34b58355 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/ttm: Wait for a BO to become idle before unbinding it from GTT 



Fixes hangs under memory pressure, e.g. running the piglit test
tex3d-maxsize concurrently with other tests.

Fixes: 17d33bc9 ("drm/ttm: drop waiting for idle in ttm_bo_evict.")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a5a5e308

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

+2 −2
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		goto out_cleanup;

	}

	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);

	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem);

out_cleanup:

	ttm_bo_mem_put(bo, &tmp_mem);

	return r;
@@ -368,7 +368,7 @@ static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		return r;

	}

	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);

	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem);

	if (unlikely(r)) {

		goto out_cleanup;

	}

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		goto out;



	ret = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);

	ret = ttm_bo_move_ttm(bo, true, intr, no_wait_gpu, new_mem);

out:

	ttm_bo_mem_put(bo, &tmp_mem);

	return ret;
@@ -1179,7 +1179,7 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr, 
	if (ret)

		return ret;



	ret = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);

	ret = ttm_bo_move_ttm(bo, true, intr, no_wait_gpu, &tmp_mem);

	if (ret)

		goto out;

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		goto out_cleanup;

	}

	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, new_mem);

	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, new_mem);

out_cleanup:

	ttm_bo_mem_put(bo, &tmp_mem);

	return r;
@@ -379,7 +379,7 @@ static int radeon_move_ram_vram(struct ttm_buffer_object *bo, 
	if (unlikely(r)) {

		return r;

	}

	r = ttm_bo_move_ttm(bo, true, no_wait_gpu, &tmp_mem);

	r = ttm_bo_move_ttm(bo, true, interruptible, no_wait_gpu, &tmp_mem);

	if (unlikely(r)) {

		goto out_cleanup;

	}

drivers/gpu/drm/ttm/ttm_bo.c

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


	if (!(old_man->flags & TTM_MEMTYPE_FLAG_FIXED) &&

	    !(new_man->flags & TTM_MEMTYPE_FLAG_FIXED))

		ret = ttm_bo_move_ttm(bo, evict, no_wait_gpu, mem);

		ret = ttm_bo_move_ttm(bo, evict, interruptible, no_wait_gpu,

				      mem);

	else if (bdev->driver->move)

		ret = bdev->driver->move(bo, evict, interruptible,

					 no_wait_gpu, mem);

drivers/gpu/drm/ttm/ttm_bo_util.c

+9 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void ttm_bo_free_old_node(struct ttm_buffer_object *bo) 
}



int ttm_bo_move_ttm(struct ttm_buffer_object *bo,

		    bool evict,

		    bool evict, bool interruptible,

		    bool no_wait_gpu, struct ttm_mem_reg *new_mem)

{

	struct ttm_tt *ttm = bo->ttm;
@@ -53,6 +53,14 @@ int ttm_bo_move_ttm(struct ttm_buffer_object *bo, 
	int ret;



	if (old_mem->mem_type != TTM_PL_SYSTEM) {

		ret = ttm_bo_wait(bo, interruptible, no_wait_gpu);



		if (unlikely(ret != 0)) {

			if (ret != -ERESTARTSYS)

				pr_err("Failed to expire sync object before unbinding TTM\n");

			return ret;

		}



		ttm_tt_unbind(ttm);

		ttm_bo_free_old_node(bo);

		ttm_flag_masked(&old_mem->placement, TTM_PL_FLAG_SYSTEM,