diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:10:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:10:45 -0800 |
| commit | 3e66848a3249105fe4973b0550b5b6cd42240168 (patch) | |
| tree | 3ff7bbcf2a476291f5536ea09b256c541c4456f3 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | 2cda64cf6998a1d10961f69e2ac79c69b6d37795 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-3e66848a3249105fe4973b0550b5b6cd42240168.tar.gz linux-3e66848a3249105fe4973b0550b5b6cd42240168.tar.bz2 linux-3e66848a3249105fe4973b0550b5b6cd42240168.zip | |
Merge 4.5-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 3 |
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); |