diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 1ecdf6c01368..3e128c52bb87 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
@@ -161,7 +161,7 @@ void amdgpu_gem_object_close(struct drm_gem_object *obj, | |||
161 | 161 | ||
162 | amdgpu_vm_get_pd_bo(vm, &list, &vm_pd); | 162 | amdgpu_vm_get_pd_bo(vm, &list, &vm_pd); |
163 | 163 | ||
164 | r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates); | 164 | r = ttm_eu_reserve_buffers(&ticket, &list, false, &duplicates); |
165 | if (r) { | 165 | if (r) { |
166 | dev_err(adev->dev, "leaking bo va because " | 166 | dev_err(adev->dev, "leaking bo va because " |
167 | "we fail to reserve bo (%d)\n", r); | 167 | "we fail to reserve bo (%d)\n", r); |
@@ -258,12 +258,10 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, | |||
258 | AMDGPU_GEM_USERPTR_REGISTER)) | 258 | AMDGPU_GEM_USERPTR_REGISTER)) |
259 | return -EINVAL; | 259 | return -EINVAL; |
260 | 260 | ||
261 | if (!(args->flags & AMDGPU_GEM_USERPTR_READONLY) && ( | 261 | if (!(args->flags & AMDGPU_GEM_USERPTR_READONLY) && |
262 | !(args->flags & AMDGPU_GEM_USERPTR_ANONONLY) || | 262 | !(args->flags & AMDGPU_GEM_USERPTR_REGISTER)) { |
263 | !(args->flags & AMDGPU_GEM_USERPTR_REGISTER))) { | ||
264 | 263 | ||
265 | /* if we want to write to it we must require anonymous | 264 | /* if we want to write to it we must install a MMU notifier */ |
266 | memory and install a MMU notifier */ | ||
267 | return -EACCES; | 265 | return -EACCES; |
268 | } | 266 | } |
269 | 267 | ||