Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+1 −13
Original line number Diff line number Diff line
@@ -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

 *
@@ -599,7 +587,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));