Commit 16688677 authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: always enable shadow BOs v2

Even when GPU recovery is disabled we could run into a manually
triggered recovery.

v2: keep accidental removed comments
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarEmily Deng <Emily.Deng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4947b2f2
...@@ -51,18 +51,6 @@ ...@@ -51,18 +51,6 @@
* *
*/ */
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 * amdgpu_bo_subtract_pin_size - Remove BO from pin_size accounting
* *
...@@ -599,7 +587,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev, ...@@ -599,7 +587,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
if (r) if (r)
return 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) if (!bp->resv)
WARN_ON(reservation_object_lock((*bo_ptr)->tbo.resv, WARN_ON(reservation_object_lock((*bo_ptr)->tbo.resv,
NULL)); NULL));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment