drm/amdgpu: drop the amdgpu_device argument from amdgpu_ib_free

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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 8b512dc..d751995 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -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);
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
index a21c510..77d3ca8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
@@ -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)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
index ce33141..ab3fe7b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
@@ -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,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
index 36fc957..dee5a1b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
@@ -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);

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
index 10df731..39070b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
@@ -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;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 65387f6..b9060bc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -503,7 +503,7 @@ static int amdgpu_vce_get_create_msg(struct amdgpu_ring *ring, uint32_t handle,
                ib->ptr[i] = 0x0;
 
        r = amdgpu_job_submit_direct(job, ring, &f);
-       amdgpu_ib_free(ring->adev, &ib_msg, f);
+       amdgpu_ib_free(&ib_msg, f);
        if (r)
                goto err;
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index 96da27b..83faf6e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -586,7 +586,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
        if (r)
                goto err_free;
 
-       amdgpu_ib_free(adev, ib_msg, f);
+       amdgpu_ib_free(ib_msg, f);
 
        if (fence)
                *fence = dma_fence_get(f);
@@ -597,7 +597,7 @@ static int amdgpu_vcn_dec_send_msg(struct amdgpu_ring *ring,
 err_free:
        amdgpu_job_free(job);
 err:
-       amdgpu_ib_free(adev, ib_msg, f);
+       amdgpu_ib_free(ib_msg, f);
        return r;
 }
 
@@ -779,7 +779,7 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
        if (r)
                goto err_free;
 
-       amdgpu_ib_free(adev, ib_msg, f);
+       amdgpu_ib_free(ib_msg, f);
 
        if (fence)
                *fence = dma_fence_get(f);
@@ -790,7 +790,7 @@ static int amdgpu_vcn_dec_sw_send_msg(struct amdgpu_ring *ring,
 err_free:
        amdgpu_job_free(job);
 err:
-       amdgpu_ib_free(adev, ib_msg, f);
+       amdgpu_ib_free(ib_msg, f);
        return r;
 }
 
@@ -1020,7 +1020,7 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = 0;
 
 error:
-       amdgpu_ib_free(adev, &ib, fence);
+       amdgpu_ib_free(&ib, fence);
        dma_fence_put(fence);
 
        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
index 2c12840..121ee17 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
@@ -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;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index a5cd950..d9bd8f3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@ -698,7 +698,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index c4e1541..9484f3b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -4036,7 +4036,7 @@ static int gfx_v10_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        else
                r = -EINVAL;
 err2:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 37c552e..fe5d7cd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -615,7 +615,7 @@ static int gfx_v11_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 err2:
        if (!ring->is_mes_queue)
-               amdgpu_ib_free(adev, &ib, NULL);
+               amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
index 50dca04..6ca9d04 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
@@ -513,7 +513,7 @@ static int gfx_v12_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 err2:
        if (!ring->is_mes_queue)
-               amdgpu_ib_free(adev, &ib, NULL);
+               amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
index 1b4c0dc..f26e2cd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
@@ -1910,7 +1910,7 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 error:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
        return r;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
index 17a07e1..84745b2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
@@ -2330,7 +2330,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 error:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
        return r;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index 576d218..af73f85 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -914,7 +914,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err2:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        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]);
 
 fail:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 
        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
index 30d9b6d..4b5006d 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -1243,7 +1243,7 @@ static int gfx_v9_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err2:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        amdgpu_device_wb_free(adev, index);
@@ -4788,7 +4788,7 @@ static int gfx_v9_0_do_edc_gpr_workarounds(struct amdgpu_device *adev)
        }
 
 fail:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 
        return r;

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
index 3f4fd2f..d81449f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
@@ -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);
        if (r) {
                dev_err(adev->dev, "ib submit failed (%d).\n", r);
-               amdgpu_ib_free(adev, ib, NULL);
+               amdgpu_ib_free(ib, NULL);
        }
        return r;
 }
@@ -611,16 +611,16 @@ static int gfx_v9_4_2_do_sgprs_init(struct amdgpu_device *adev)
        }
 
 disp2_failed:
-       amdgpu_ib_free(adev, &disp_ibs[2], NULL);
+       amdgpu_ib_free(&disp_ibs[2], NULL);
        dma_fence_put(fences[2]);
 disp1_failed:
-       amdgpu_ib_free(adev, &disp_ibs[1], NULL);
+       amdgpu_ib_free(&disp_ibs[1], NULL);
        dma_fence_put(fences[1]);
 disp0_failed:
-       amdgpu_ib_free(adev, &disp_ibs[0], NULL);
+       amdgpu_ib_free(&disp_ibs[0], NULL);
        dma_fence_put(fences[0]);
 pro_end:
-       amdgpu_ib_free(adev, &wb_ib, NULL);
+       amdgpu_ib_free(&wb_ib, NULL);
 
        if (r)
                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:
-       amdgpu_ib_free(adev, &disp_ib, NULL);
+       amdgpu_ib_free(&disp_ib, NULL);
        dma_fence_put(fence);
 pro_end:
-       amdgpu_ib_free(adev, &wb_ib, NULL);
+       amdgpu_ib_free(&wb_ib, NULL);
 
        if (r)
                dev_info(adev->dev, "Init VGPRS Failed\n");

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
index cc038f3..a5bdcaf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
@@ -503,7 +503,7 @@ static int gfx_v9_4_3_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err2:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err1:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 269bf1e..135c509 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -633,7 +633,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index c9ad9ec..c611328 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -906,7 +906,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
        else
                r = -EINVAL;
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index defabd1..b48d9c0 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1565,7 +1565,7 @@ static int sdma_v4_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
index 5e1cb1c..4c8308b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
@@ -1130,7 +1130,7 @@ static int sdma_v4_4_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 23599a5..b764550 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1194,7 +1194,7 @@ static int sdma_v5_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index 10352cf..b1818e8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -1050,7 +1050,7 @@ static int sdma_v5_2_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
index b14b6d3..1a023b4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
@@ -1063,7 +1063,7 @@ static int sdma_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
index dc1a592..9c17df2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
@@ -1108,7 +1108,7 @@ static int sdma_v7_0_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        if (!ring->is_mes_queue)

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
index 9f62b2b..dbd78d5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
@@ -286,7 +286,7 @@ static int si_dma_ring_test_ib(struct amdgpu_ring *ring, long timeout)
                r = -EINVAL;
 
 err1:
-       amdgpu_ib_free(adev, &ib, NULL);
+       amdgpu_ib_free(&ib, NULL);
        dma_fence_put(f);
 err0:
        amdgpu_device_wb_free(adev, index);