diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2022-05-11 16:27:06 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-05-11 16:27:06 +0200 |
| commit | 47319846a9e2ab1c4d22108e891818d003615bd8 (patch) | |
| tree | 919dbed5c01d3ad4db009bd38bb12cfd3d038246 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | perf/amd/ibs: Use interrupt regs ip for stack unwinding (diff) | |
| parent | Linux 5.18-rc5 (diff) | |
| download | wireguard-linux-47319846a9e2ab1c4d22108e891818d003615bd8.tar.xz wireguard-linux-47319846a9e2ab1c4d22108e891818d003615bd8.zip | |
Merge branch 'v5.18-rc5'
Obtain the new INTEL_FAM6 stuff required.
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 25731719c627..940752488330 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1284,6 +1284,7 @@ void amdgpu_bo_get_memory(struct amdgpu_bo *bo, uint64_t *vram_mem, */ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) { + struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev); struct dma_fence *fence = NULL; struct amdgpu_bo *abo; int r; @@ -1303,7 +1304,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) amdgpu_amdkfd_remove_fence_on_pt_pd_bos(abo); if (bo->resource->mem_type != TTM_PL_VRAM || - !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) + !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE) || + adev->in_suspend || adev->shutdown) return; if (WARN_ON_ONCE(!dma_resv_trylock(bo->base.resv))) |