diff options
author | Christian König <christian.koenig@amd.com> | 2017-01-30 04:24:13 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-02-02 13:50:14 -0500 |
commit | d7d29553d6a8a18dc3a5038ef8d8f346c6b6dc94 (patch) | |
tree | 9f94cdf93928dfaf5cd70ac42d3ba7c629c651c4 /drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |
parent | 2ffdaafb5d5f37bf66da1b775333a7abc2b69563 (diff) |
drm/amdgpu: stop reserving a shared fence for VA updates
We don't add any fences do the buffer, but just use it's address.
Additional to that we don't need a duplicates list here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 4acb9c5e8b64..ec7037a48b6e 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | |||
@@ -547,7 +547,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
547 | struct amdgpu_bo_list_entry vm_pd; | 547 | struct amdgpu_bo_list_entry vm_pd; |
548 | struct ttm_validate_buffer tv; | 548 | struct ttm_validate_buffer tv; |
549 | struct ww_acquire_ctx ticket; | 549 | struct ww_acquire_ctx ticket; |
550 | struct list_head list, duplicates; | 550 | struct list_head list; |
551 | uint32_t invalid_flags, va_flags = 0; | 551 | uint32_t invalid_flags, va_flags = 0; |
552 | int r = 0; | 552 | int r = 0; |
553 | 553 | ||
@@ -585,14 +585,13 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, | |||
585 | return -ENOENT; | 585 | return -ENOENT; |
586 | abo = gem_to_amdgpu_bo(gobj); | 586 | abo = gem_to_amdgpu_bo(gobj); |
587 | INIT_LIST_HEAD(&list); | 587 | INIT_LIST_HEAD(&list); |
588 | INIT_LIST_HEAD(&duplicates); | ||
589 | tv.bo = &abo->tbo; | 588 | tv.bo = &abo->tbo; |
590 | tv.shared = true; | 589 | tv.shared = false; |
591 | list_add(&tv.head, &list); | 590 | list_add(&tv.head, &list); |
592 | 591 | ||
593 | amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd); | 592 | amdgpu_vm_get_pd_bo(&fpriv->vm, &list, &vm_pd); |
594 | 593 | ||
595 | r = ttm_eu_reserve_buffers(&ticket, &list, true, &duplicates); | 594 | r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL); |
596 | if (r) { | 595 | if (r) { |
597 | drm_gem_object_unreference_unlocked(gobj); | 596 | drm_gem_object_unreference_unlocked(gobj); |
598 | return r; | 597 | return r; |