aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-02-19 10:03:03 +0100
committerAlex Deucher <alexander.deucher@amd.com>2016-02-24 12:46:06 -0500
commit6378076bcfdcd1d4f8d726d08d3fa044736873eb (patch)
tree83af18461a8591c198fa8659407e1e0e24332ca3
parentamdgpu: fix NULL pointer dereference at tonga_check_states_equal (diff)
downloadlinux-dev-6378076bcfdcd1d4f8d726d08d3fa044736873eb.tar.xz
linux-dev-6378076bcfdcd1d4f8d726d08d3fa044736873eb.zip
drm/amdgpu: disable direct VM updates when vm_debug is set
That should make user space bugs more obvious. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
index 7380f782cd14..d20c2a8929cb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -596,7 +596,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data,
break;
}
ttm_eu_backoff_reservation(&ticket, &list);
- if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE))
+ if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE) &&
+ !amdgpu_vm_debug)
amdgpu_gem_va_update_vm(adev, bo_va, args->operation);
drm_gem_object_unreference_unlocked(gobj);