diff options
| author |   Christian König <christian.koenig@amd.com> | 2022-05-03 08:36:13 +0200 |
|---|---|---|
| committer |   Dave Airlie <airlied@redhat.com> | 2022-05-04 04:20:53 +1000 |
| commit | 8d62a974ac5fa1609e57a54622eef71e87bace78 (patch) | |
| tree | d6c17eb3cfa91646a3702052babe951e0714b929 | |
| parent | Backmerge tag 'v5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next (diff) | |
| download | linux-dev-8d62a974ac5fa1609e57a54622eef71e87bace78.tar.xz linux-dev-8d62a974ac5fa1609e57a54622eef71e87bace78.zip | |
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 <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220503063613.46925-1-christian.koenig@amd.com
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); } |