diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index a783c684b49b..6eb5550a6f16 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -644,8 +644,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, | |||
644 | void *owner); | 644 | void *owner); |
645 | struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync); | 645 | struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync); |
646 | int amdgpu_sync_wait(struct amdgpu_sync *sync); | 646 | int amdgpu_sync_wait(struct amdgpu_sync *sync); |
647 | void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync, | 647 | void amdgpu_sync_free(struct amdgpu_sync *sync); |
648 | struct fence *fence); | ||
649 | 648 | ||
650 | /* | 649 | /* |
651 | * GART structures, functions & helpers | 650 | * GART structures, functions & helpers |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 40c9779993c8..d7cd408f7b66 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -93,7 +93,7 @@ int amdgpu_ib_get(struct amdgpu_ring *ring, struct amdgpu_vm *vm, | |||
93 | */ | 93 | */ |
94 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) | 94 | void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib) |
95 | { | 95 | { |
96 | amdgpu_sync_free(adev, &ib->sync, &ib->fence->base); | 96 | amdgpu_sync_free(&ib->sync); |
97 | amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base); | 97 | amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base); |
98 | if (ib->fence) | 98 | if (ib->fence) |
99 | fence_put(&ib->fence->base); | 99 | fence_put(&ib->fence->base); |
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 1d348f8ae126..c15be00de904 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | |||
@@ -240,15 +240,11 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync) | |||
240 | /** | 240 | /** |
241 | * amdgpu_sync_free - free the sync object | 241 | * amdgpu_sync_free - free the sync object |
242 | * | 242 | * |
243 | * @adev: amdgpu_device pointer | ||
244 | * @sync: sync object to use | 243 | * @sync: sync object to use |
245 | * @fence: fence to use for the free | ||
246 | * | 244 | * |
247 | * Free the sync object. | 245 | * Free the sync object. |
248 | */ | 246 | */ |
249 | void amdgpu_sync_free(struct amdgpu_device *adev, | 247 | void amdgpu_sync_free(struct amdgpu_sync *sync) |
250 | struct amdgpu_sync *sync, | ||
251 | struct fence *fence) | ||
252 | { | 248 | { |
253 | struct amdgpu_sync_entry *e; | 249 | struct amdgpu_sync_entry *e; |
254 | struct hlist_node *tmp; | 250 | struct hlist_node *tmp; |