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

Commit 4947b2f2 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: stop pipelining VM PDs/PTs moves 



We are going to need this for recoverable page fault handling and it
makes shadow handling during GPU reset much more easier.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3e14bedc

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

+1 −1
Original line number Diff line number Diff line
@@ -1366,7 +1366,7 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo) 
{

	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_SYSTEM);

	WARN_ON_ONCE(!ww_mutex_is_locked(&bo->tbo.resv->lock) &&

		     !bo->pin_count);

		     !bo->pin_count && bo->tbo.type != ttm_bo_type_kernel);

	WARN_ON_ONCE(bo->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET);

	WARN_ON_ONCE(bo->tbo.mem.mem_type == TTM_PL_VRAM &&

		     !(bo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS));

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

+5 −1
Original line number Diff line number Diff line
@@ -532,6 +532,10 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, 
	if (r)

		goto error;



	/* Always block for VM page tables before committing the new location */

	if (bo->type == ttm_bo_type_kernel)

		r = ttm_bo_move_accel_cleanup(bo, fence, true, new_mem);

	else

		r = ttm_bo_pipeline_move(bo, fence, evict, new_mem);

	dma_fence_put(fence);

	return r;