Even when GPU recovery is disabled we could run into a manually triggered recovery.
Signed-off-by: Christian König <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index a7e39c9dd14b..7db0040ca145 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -38,31 +38,6 @@ #include "amdgpu_trace.h" #include "amdgpu_amdkfd.h" -/** - * DOC: amdgpu_object - * - * This defines the interfaces to operate on an &amdgpu_bo buffer object which - * represents memory used by driver (VRAM, system memory, etc.). The driver - * provides DRM/GEM APIs to userspace. DRM/GEM APIs then use these interfaces - * to create/destroy/set buffer object which are then managed by the kernel TTM - * memory manager. - * The interfaces are also used internally by kernel clients, including gfx, - * uvd, etc. for kernel managed allocations used by the GPU. - * - */ - -static bool amdgpu_bo_need_backup(struct amdgpu_device *adev) -{ - if (adev->flags & AMD_IS_APU) - return false; - - if (amdgpu_gpu_recovery == 0 || - (amdgpu_gpu_recovery == -1 && !amdgpu_sriov_vf(adev))) - return false; - - return true; -} - /** * amdgpu_bo_subtract_pin_size - Remove BO from pin_size accounting * @@ -596,7 +571,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev, if (r) return r; - if ((flags & AMDGPU_GEM_CREATE_SHADOW) && amdgpu_bo_need_backup(adev)) { + if ((flags & AMDGPU_GEM_CREATE_SHADOW) && !(adev->flags & AMD_IS_APU)) { if (!bp->resv) WARN_ON(reservation_object_lock((*bo_ptr)->tbo.resv, NULL)); -- 2.14.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
