diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:42:34 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-13 19:46:02 -0400 |
| commit | 9b61c0fcdf0cfd20a85d9856d46142e7f297de0a (patch) | |
| tree | d4abe6aa3f4e1e088f9da1d0597e078b1fe58912 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
| parent | 550e3b23a53c88adfa46e64f9d442743e65d47da (diff) | |
| parent | 125234dc8b1cc862f52d8bd5b37c36cc59b2cb86 (diff) | |
Merge drm-fixes into drm-next.
Nouveau wanted this to avoid some worse conflicts when I merge that.
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 2e26a517f2d6..7a47c45b2131 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
| @@ -606,7 +606,8 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
| 606 | break; | 606 | break; |
| 607 | } | 607 | } |
| 608 | ttm_eu_backoff_reservation(&ticket, &list); | 608 | ttm_eu_backoff_reservation(&ticket, &list); |
| 609 | if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE)) | 609 | if (!r && !(args->flags & AMDGPU_VM_DELAY_UPDATE) && |
| 610 | !amdgpu_vm_debug) | ||
| 610 | amdgpu_gem_va_update_vm(adev, bo_va, args->operation); | 611 | amdgpu_gem_va_update_vm(adev, bo_va, args->operation); |
| 611 | 612 | ||
| 612 | drm_gem_object_unreference_unlocked(gobj); | 613 | drm_gem_object_unreference_unlocked(gobj); |