From: Alex Deucher <alexander.deucher@amd.com>
Date: Thu, 13 Jul 2017 15:37:11 -0400
Subject: drm/amdgpu: remove VM shadow WARN_ONs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Git-commit: 6927798572a930a4a56f66eb36916d861ff56ad6
Patch-mainline: v4.14-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
Printing a warning into the logs that we will certainly run into a BUG() is
completely nonsense, the BUG() is more than noisy enough.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1044,8 +1044,7 @@ static int amdgpu_vm_update_level(struct
params.adev = adev;
shadow = parent->bo->shadow;
- WARN_ON(vm->use_cpu_for_update && shadow);
- if (vm->use_cpu_for_update && !shadow) {
+ if (vm->use_cpu_for_update) {
r = amdgpu_bo_kmap(parent->bo, (void **)&pd_addr);
if (r)
return r;
@@ -1310,9 +1309,6 @@ static int amdgpu_vm_update_ptes(struct
r = amdgpu_bo_kmap(pt, (void *)&pe_start);
if (r)
return r;
-
- WARN_ONCE(pt->shadow,
- "CPU VM update doesn't support shadow pages");
} else {
if (pt->shadow) {
pe_start = amdgpu_bo_gpu_offset(pt->shadow);