Commit 0014952b authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: drop the amdgpu_device argument from amdgpu_ib_free 



It's unused.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2ae520cb

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

+2 −4
Original line number Diff line number Diff line
@@ -89,16 +89,14 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
/**

 * amdgpu_ib_free - free an IB (Indirect Buffer)

 *

 * @adev: amdgpu_device pointer

 * @ib: IB object to free

 * @f: the fence SA bo need wait on for the ib alloation

 *

 * Free an IB (all asics).

 */

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

		    struct dma_fence *f)

void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f)

{

	amdgpu_sa_bo_free(adev, &ib->sa_bo, f);

	amdgpu_sa_bo_free(&ib->sa_bo, f);

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job) 
		f = NULL;



	for (i = 0; i < job->num_ibs; ++i)

		amdgpu_ib_free(NULL, &job->ibs[i], f);

		amdgpu_ib_free(&job->ibs[i], f);

}



static void amdgpu_job_free_cb(struct drm_sched_job *s_job)

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

+1 −2
Original line number Diff line number Diff line
@@ -342,8 +342,7 @@ int amdgpu_sa_bo_manager_start(struct amdgpu_device *adev, 
int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,

		     struct drm_suballoc **sa_bo,

		     unsigned int size);

void amdgpu_sa_bo_free(struct amdgpu_device *adev,

		       struct drm_suballoc **sa_bo,

void amdgpu_sa_bo_free(struct drm_suballoc **sa_bo,

		       struct dma_fence *fence);

#if defined(CONFIG_DEBUG_FS)

void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,

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

+1 −2
Original line number Diff line number Diff line
@@ -462,8 +462,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
		  unsigned size,

		  enum amdgpu_ib_pool_type pool,

		  struct amdgpu_ib *ib);

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

		    struct dma_fence *f);

void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f);

int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,

		       struct amdgpu_ib *ibs, struct amdgpu_job *job,

		       struct dma_fence **f);

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

+1 −2
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, 
	return 0;

}



void amdgpu_sa_bo_free(struct amdgpu_device *adev, struct drm_suballoc **sa_bo,

		       struct dma_fence *fence)

void amdgpu_sa_bo_free(struct drm_suballoc **sa_bo, struct dma_fence *fence)

{

	if (sa_bo == NULL || *sa_bo == NULL) {

		return;