[PATCH] drm/amdgpu: fix drm-next merge fallout

[Alex Deucher]

On Tue, May 3, 2022 at 2:36 AM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> That hunk somehow got missing while solving the conflict between the TTM
> and AMDGPU changes for drm-next.
>
> Signed-off-by: Christian König <christian.koenig at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
> index 7761a3ea172e..88de9f0d4728 100644
> --- 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);
>  }
>
> --
> 2.25.1
>