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: Christian König <[email protected]>
Acked-by: Alex Deucher <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
index 7761a3ea172e297e38d8afd00b9ebca4ec08ec31..88de9f0d4728ac10ff64166622318faeccbc7c1a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
@@ -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);
 }