Commit 8d62a974 authored by Christian König's avatar Christian König Committed by Dave Airlie
Browse files

drm/amdgpu: fix drm-next merge fallout 



That hunk somehow got missing while solving the conflict between the TTM
and AMDGPU changes for drm-next.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220503063613.46925-1-christian.koenig@amd.com
parent e954d2c9

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

+5 −1
Original line number Diff line number Diff line
@@ -631,9 +631,13 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base *entry) 
	if (!entry->bo)

		return;

	shadow = amdgpu_bo_shadowed(entry->bo);

	if (shadow) {

		ttm_bo_set_bulk_move(&shadow->tbo, NULL);

		amdgpu_bo_unref(&shadow);

	}

	ttm_bo_set_bulk_move(&entry->bo->tbo, NULL);

	entry->bo->vm_bo = NULL;

	list_del(&entry->vm_status);

	amdgpu_bo_unref(&shadow);

	amdgpu_bo_unref(&entry->bo);

}