diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-13 13:20:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-13 13:20:52 +0000 |
| commit | 83c05c97a325abdd8b4209b9c7165f1701081ba1 (patch) | |
| tree | 50a3e0cd65c8453ef43299faf3bd07cc7e2ab0c4 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | 054a0da568b94f6b69ccf34b80f7c41a6623eb11 (diff) | |
| parent | eeac8ede17557680855031c6f305ece2378af326 (diff) | |
Merge tag 'v6.3-rc2' into regmap-6.4 to fix clock related boot issues
Linux 6.3-rc2
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index e3e1ed4314dd..6c7d672412b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1315,7 +1315,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) if (!bo->resource || bo->resource->mem_type != TTM_PL_VRAM || !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE) || - adev->in_suspend || adev->shutdown) + adev->in_suspend || drm_dev_is_unplugged(adev_to_drm(adev))) return; if (WARN_ON_ONCE(!dma_resv_trylock(bo->base.resv))) |