torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

drm/amdgpu: drop the amdgpu_device argument from amdgpu_ib_free

Browse Source 
It's unused.

Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-12-06 13:16:14 +01:00 committed by Alex Deucher
parent 2ae520cb12
commit 0014952b17
27 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
View File

@ -89,16 +89,14 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
/** /**
* amdgpu_ib_free - free an IB (Indirect Buffer) * amdgpu_ib_free - free an IB (Indirect Buffer)
* *
* @adev: amdgpu_device pointer
* @ib: IB object to free * @ib: IB object to free
* @f: the fence SA bo need wait on for the ib alloation * @f: the fence SA bo need wait on for the ib alloation
* *
* Free an IB (all asics). * Free an IB (all asics).
*/ */
void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f)
struct dma_fence *f)
{ {
amdgpu_sa_bo_free(adev, &ib->sa_bo, f); amdgpu_sa_bo_free(&ib->sa_bo, f);
} }
/** /**

2
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
View File

@ -267,7 +267,7 @@ void amdgpu_job_free_resources(struct amdgpu_job *job)
f = NULL; f = NULL;
for (i = 0; i < job->num_ibs; ++i) 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) static void amdgpu_job_free_cb(struct drm_sched_job *s_job)

3
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
View File

@ -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, int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
struct drm_suballoc **sa_bo, struct drm_suballoc **sa_bo,
unsigned int size); unsigned int size);
void amdgpu_sa_bo_free(struct amdgpu_device *adev, void amdgpu_sa_bo_free(struct drm_suballoc **sa_bo,
struct drm_suballoc **sa_bo,
struct dma_fence *fence); struct dma_fence *fence);
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager, void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,

3
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
View File

@ -462,8 +462,7 @@ int amdgpu_ib_get(struct amdgpu_device *adev, struct amdgpu_vm *vm,
unsigned size, unsigned size,
enum amdgpu_ib_pool_type pool, enum amdgpu_ib_pool_type pool,
struct amdgpu_ib *ib); struct amdgpu_ib *ib);
void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f);
struct dma_fence *f);
int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
struct amdgpu_ib *ibs, struct amdgpu_job *job, struct amdgpu_ib *ibs, struct amdgpu_job *job,
struct dma_fence **f); struct dma_fence **f);

3
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
View File

@ -93,8 +93,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
return 0; return 0;
} }
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)
struct dma_fence *fence)
{ {
if (sa_bo == NULL || *sa_bo == NULL) { if (sa_bo == NULL || *sa_bo == NULL) {
return; return;

2
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
View File

@ -503,7 +503,7 @@ static int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,
ib->ptr[i] = 0x0; ib->ptr[i] = 0x0;
r = amdgpu_job_submit_direct(job, ring, &f); r = amdgpu_job_submit_direct(job, ring, &f);
amdgpu_ib_free(ring->adev, &ib_msg, f); amdgpu_ib_free(&ib_msg, f);
if (r) if (r)
goto err; goto err;

10
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
View File

@ -586,7 +586,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
if (r) if (r)
goto err_free; goto err_free;
amdgpu_ib_free(adev, ib_msg, f); amdgpu_ib_free(ib_msg, f);
if (fence) if (fence)
*fence = dma_fence_get(f); *fence = dma_fence_get(f);
@ -597,7 +597,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
err_free: err_free:
amdgpu_job_free(job); amdgpu_job_free(job);
err: err:
amdgpu_ib_free(adev, ib_msg, f); amdgpu_ib_free(ib_msg, f);
return r; return r;
} }
@ -779,7 +779,7 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
if (r) if (r)
goto err_free; goto err_free;
amdgpu_ib_free(adev, ib_msg, f); amdgpu_ib_free(ib_msg, f);
if (fence) if (fence)
*fence = dma_fence_get(f); *fence = dma_fence_get(f);
@ -790,7 +790,7 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
err_free: err_free:
amdgpu_job_free(job); amdgpu_job_free(job);
err: err:
amdgpu_ib_free(adev, ib_msg, f); amdgpu_ib_free(ib_msg, f);
return r; return r;
} }
@ -1020,7 +1020,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = 0; r = 0;
error: error:
amdgpu_ib_free(adev, &ib, fence); amdgpu_ib_free(&ib, fence);
dma_fence_put(fence); dma_fence_put(fence);
return r; return r;

2
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
View File

@ -834,7 +834,7 @@ static int vpe_ring_test_ib(struct amdgpu_ring *ring, long timeout)
ret = (le32_to_cpu(adev->wb.wb[index]) == test_pattern) ? 0 : -EINVAL; ret = (le32_to_cpu(adev->wb.wb[index]) == test_pattern) ? 0 : -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
View File

@ -698,7 +698,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
View File

@ -4036,7 +4036,7 @@ static int gfx_v10_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
else else
r = -EINVAL; r = -EINVAL;
err2: err2:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
View File

@ -615,7 +615,7 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err2: err2:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
View File

@ -513,7 +513,7 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err2: err2:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
View File

@ -1910,7 +1910,7 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
error: error:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
return r; return r;
} }

2
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
View File

@ -2330,7 +2330,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
error: error:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
return r; return r;
} }

4
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
View File

@ -914,7 +914,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err2: err2:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);
@ -1656,7 +1656,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
RREG32(sec_ded_counter_registers[i]); RREG32(sec_ded_counter_registers[i]);
fail: fail:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
return r; return r;

4
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
View File

@ -1243,7 +1243,7 @@ static int gfx_v9_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err2: err2:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);
@ -4788,7 +4788,7 @@ static int gfx_v9_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
} }
fail: fail:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
return r; return r;

14
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
View File

@ -412,7 +412,7 @@ static int gfx_v9_4_2_run_shader(struct amdgpu_device *adev,
r = amdgpu_ib_schedule(ring, 1, ib, NULL, fence_ptr); r = amdgpu_ib_schedule(ring, 1, ib, NULL, fence_ptr);
if (r) { if (r) {
dev_err(adev->dev, "ib submit failed (%d).\n", r); dev_err(adev->dev, "ib submit failed (%d).\n", r);
amdgpu_ib_free(adev, ib, NULL); amdgpu_ib_free(ib, NULL);
} }
return r; return r;
} }
@ -611,16 +611,16 @@ static int gfx_v9_4_2_do_sgprs_init(struct amdgpu_device *adev)
} }
disp2_failed: disp2_failed:
amdgpu_ib_free(adev, &disp_ibs[2], NULL); amdgpu_ib_free(&disp_ibs[2], NULL);
dma_fence_put(fences[2]); dma_fence_put(fences[2]);
disp1_failed: disp1_failed:
amdgpu_ib_free(adev, &disp_ibs[1], NULL); amdgpu_ib_free(&disp_ibs[1], NULL);
dma_fence_put(fences[1]); dma_fence_put(fences[1]);
disp0_failed: disp0_failed:
amdgpu_ib_free(adev, &disp_ibs[0], NULL); amdgpu_ib_free(&disp_ibs[0], NULL);
dma_fence_put(fences[0]); dma_fence_put(fences[0]);
pro_end: pro_end:
amdgpu_ib_free(adev, &wb_ib, NULL); amdgpu_ib_free(&wb_ib, NULL);
if (r) if (r)
dev_info(adev->dev, "Init SGPRS Failed\n"); dev_info(adev->dev, "Init SGPRS Failed\n");
@ -687,10 +687,10 @@ static int gfx_v9_4_2_do_vgprs_init(struct amdgpu_device *adev)
} }
disp_failed: disp_failed:
amdgpu_ib_free(adev, &disp_ib, NULL); amdgpu_ib_free(&disp_ib, NULL);
dma_fence_put(fence); dma_fence_put(fence);
pro_end: pro_end:
amdgpu_ib_free(adev, &wb_ib, NULL); amdgpu_ib_free(&wb_ib, NULL);
if (r) if (r)
dev_info(adev->dev, "Init VGPRS Failed\n"); dev_info(adev->dev, "Init VGPRS Failed\n");

2
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
View File

@ -503,7 +503,7 @@ static int gfx_v9_4_3_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err2: err2:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err1: err1:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
View File

@ -633,7 +633,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
View File

@ -906,7 +906,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
else else
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
View File

@ -1565,7 +1565,7 @@ static int sdma_v4_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
View File

@ -1130,7 +1130,7 @@ static int sdma_v4_4_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);

2
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
View File

@ -1194,7 +1194,7 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
View File

@ -1050,7 +1050,7 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
View File

@ -1063,7 +1063,7 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
View File

@ -1108,7 +1108,7 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
if (!ring->is_mes_queue) if (!ring->is_mes_queue)

2
drivers/gpu/drm/amd/amdgpu/si_dma.c
View File

@ -286,7 +286,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
r = -EINVAL; r = -EINVAL;
err1: err1:
amdgpu_ib_free(adev, &ib, NULL); amdgpu_ib_free(&ib, NULL);
dma_fence_put(f); dma_fence_put(f);
err0: err0:
amdgpu_device_wb_free(adev, index); amdgpu_device_wb_free(adev, index);