OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e954d2c
)
drm/amdgpu: fix drm-next merge fallout
author
Christian König
<christian.koenig@amd.com>
Tue, 3 May 2022 06:36:13 +0000
(08:36 +0200)
committer
Dave Airlie
<airlied@redhat.com>
Tue, 3 May 2022 18:20:53 +0000
(
04:20
+1000)
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
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
index
7761a3e
..
88de9f0
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);
}