Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Christian König and committed by
Dave Airlie
8d62a974 e954d2c9

+5 -1
+5 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c
··· 631 631 if (!entry->bo) 632 632 return; 633 633 shadow = amdgpu_bo_shadowed(entry->bo); 634 + if (shadow) { 635 + ttm_bo_set_bulk_move(&shadow->tbo, NULL); 636 + amdgpu_bo_unref(&shadow); 637 + } 638 + ttm_bo_set_bulk_move(&entry->bo->tbo, NULL); 634 639 entry->bo->vm_bo = NULL; 635 640 list_del(&entry->vm_status); 636 - amdgpu_bo_unref(&shadow); 637 641 amdgpu_bo_unref(&entry->bo); 638 642 } 639 643