From: Christian König <ckoenig.leichtzumerken@gmail.com>
Date: Wed, 20 Dec 2017 13:21:25 +0000 (+0100)
Subject: drm/amdgpu: fix test for shadow page tables
X-Git-Tag: android-x86-8.1-r1~1677^2~23^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4f4b94ee616500f326650f5b25439f1f7d606ea7;p=android-x86%2Fkernel.git

drm/amdgpu: fix test for shadow page tables

They don't work 100% correctly at the moment.

Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 4feee9927bce..5c4c3e0d527b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -42,7 +42,11 @@ static bool amdgpu_need_backup(struct amdgpu_device *adev)
 	if (adev->flags & AMD_IS_APU)
 		return false;
 
-	return amdgpu_gpu_recovery;
+	if (amdgpu_gpu_recovery == 0 ||
+	    (amdgpu_gpu_recovery == -1  && !amdgpu_sriov_vf(adev)))
+		return false;
+
+	return true;
 }
 
 static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)