Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a8f0b48 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove adev and fence from amdgpu_sync_free 



Just leftovers from the semaphores.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cc325d19

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −2
Original line number Diff line number Diff line
@@ -644,8 +644,7 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, 
		     void *owner);

struct fence *amdgpu_sync_get_fence(struct amdgpu_sync *sync);

int amdgpu_sync_wait(struct amdgpu_sync *sync);

void amdgpu_sync_free(struct amdgpu_device *adev, struct amdgpu_sync *sync,

		      struct fence *fence);

void amdgpu_sync_free(struct amdgpu_sync *sync);



/*

 * GART structures, functions & helpers

drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int amdgpu_ib_get(struct amdgpu_ring *ring, struct amdgpu_vm *vm, 
 */

void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib)

{

	amdgpu_sync_free(adev, &ib->sync, &ib->fence->base);

	amdgpu_sync_free(&ib->sync);

	amdgpu_sa_bo_free(adev, &ib->sa_bo, &ib->fence->base);

	if (ib->fence)

		fence_put(&ib->fence->base);

drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c

+1 −5
Original line number Diff line number Diff line
@@ -240,15 +240,11 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync) 
/**

 * amdgpu_sync_free - free the sync object

 *

 * @adev: amdgpu_device pointer

 * @sync: sync object to use

 * @fence: fence to use for the free

 *

 * Free the sync object.

 */

void amdgpu_sync_free(struct amdgpu_device *adev,

		      struct amdgpu_sync *sync,

		      struct fence *fence)

void amdgpu_sync_free(struct amdgpu_sync *sync)

{

	struct amdgpu_sync_entry *e;

	struct hlist_node *tmp;