Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Pierre-Eric Pelloux-Prayer and committed by
Alex Deucher
0014952b 2ae520cb

+40 -45
+2 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
··· 89 89 /** 90 90 * amdgpu_ib_free - free an IB (Indirect Buffer) 91 91 * 92 - * @adev: amdgpu_device pointer 93 92 * @ib: IB object to free 94 93 * @f: the fence SA bo need wait on for the ib alloation 95 94 * 96 95 * Free an IB (all asics). 97 96 */ 98 - void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, 99 - struct dma_fence *f) 97 + void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f) 100 98 { 101 - amdgpu_sa_bo_free(adev, &ib->sa_bo, f); 99 + amdgpu_sa_bo_free(&ib->sa_bo, f); 102 100 } 103 101 104 102 /**
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
··· 267 267 f = NULL; 268 268 269 269 for (i = 0; i < job->num_ibs; ++i) 270 - amdgpu_ib_free(NULL, &job->ibs[i], f); 270 + amdgpu_ib_free(&job->ibs[i], f); 271 271 } 272 272 273 273 static void amdgpu_job_free_cb(struct drm_sched_job *s_job)
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
··· 342 342 int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, 343 343 struct drm_suballoc **sa_bo, 344 344 unsigned int size); 345 - void amdgpu_sa_bo_free(struct amdgpu_device *adev, 346 - struct drm_suballoc **sa_bo, 345 + void amdgpu_sa_bo_free(struct drm_suballoc **sa_bo, 347 346 struct dma_fence *fence); 348 347 #if defined(CONFIG_DEBUG_FS) 349 348 void amdgpu_sa_bo_dump_debug_info(struct amdgpu_sa_manager *sa_manager,
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h
··· 462 462 unsigned size, 463 463 enum amdgpu_ib_pool_type pool, 464 464 struct amdgpu_ib *ib); 465 - void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib, 466 - struct dma_fence *f); 465 + void amdgpu_ib_free(struct amdgpu_ib *ib, struct dma_fence *f); 467 466 int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 468 467 struct amdgpu_ib *ibs, struct amdgpu_job *job, 469 468 struct dma_fence **f);
+1 -2
drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c
··· 93 93 return 0; 94 94 } 95 95 96 - void amdgpu_sa_bo_free(struct amdgpu_device *adev, struct drm_suballoc **sa_bo, 97 - struct dma_fence *fence) 96 + void amdgpu_sa_bo_free(struct drm_suballoc **sa_bo, struct dma_fence *fence) 98 97 { 99 98 if (sa_bo == NULL || *sa_bo == NULL) { 100 99 return;
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
··· 503 503 ib->ptr[i] = 0x0; 504 504 505 505 r = amdgpu_job_submit_direct(job, ring, &f); 506 - amdgpu_ib_free(ring->adev, &ib_msg, f); 506 + amdgpu_ib_free(&ib_msg, f); 507 507 if (r) 508 508 goto err; 509 509
+5 -5
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
··· 586 586 if (r) 587 587 goto err_free; 588 588 589 - amdgpu_ib_free(adev, ib_msg, f); 589 + amdgpu_ib_free(ib_msg, f); 590 590 591 591 if (fence) 592 592 *fence = dma_fence_get(f); ··· 597 597 err_free: 598 598 amdgpu_job_free(job); 599 599 err: 600 - amdgpu_ib_free(adev, ib_msg, f); 600 + amdgpu_ib_free(ib_msg, f); 601 601 return r; 602 602 } 603 603 ··· 779 779 if (r) 780 780 goto err_free; 781 781 782 - amdgpu_ib_free(adev, ib_msg, f); 782 + amdgpu_ib_free(ib_msg, f); 783 783 784 784 if (fence) 785 785 *fence = dma_fence_get(f); ··· 790 790 err_free: 791 791 amdgpu_job_free(job); 792 792 err: 793 - amdgpu_ib_free(adev, ib_msg, f); 793 + amdgpu_ib_free(ib_msg, f); 794 794 return r; 795 795 } 796 796 ··· 1020 1020 r = 0; 1021 1021 1022 1022 error: 1023 - amdgpu_ib_free(adev, &ib, fence); 1023 + amdgpu_ib_free(&ib, fence); 1024 1024 dma_fence_put(fence); 1025 1025 1026 1026 return r;
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c
··· 834 834 ret = (le32_to_cpu(adev->wb.wb[index]) == test_pattern) ? 0 : -EINVAL; 835 835 836 836 err1: 837 - amdgpu_ib_free(adev, &ib, NULL); 837 + amdgpu_ib_free(&ib, NULL); 838 838 dma_fence_put(f); 839 839 err0: 840 840 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
··· 698 698 r = -EINVAL; 699 699 700 700 err1: 701 - amdgpu_ib_free(adev, &ib, NULL); 701 + amdgpu_ib_free(&ib, NULL); 702 702 dma_fence_put(f); 703 703 err0: 704 704 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
··· 4036 4036 else 4037 4037 r = -EINVAL; 4038 4038 err2: 4039 - amdgpu_ib_free(adev, &ib, NULL); 4039 + amdgpu_ib_free(&ib, NULL); 4040 4040 dma_fence_put(f); 4041 4041 err1: 4042 4042 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
··· 615 615 r = -EINVAL; 616 616 err2: 617 617 if (!ring->is_mes_queue) 618 - amdgpu_ib_free(adev, &ib, NULL); 618 + amdgpu_ib_free(&ib, NULL); 619 619 dma_fence_put(f); 620 620 err1: 621 621 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
··· 513 513 r = -EINVAL; 514 514 err2: 515 515 if (!ring->is_mes_queue) 516 - amdgpu_ib_free(adev, &ib, NULL); 516 + amdgpu_ib_free(&ib, NULL); 517 517 dma_fence_put(f); 518 518 err1: 519 519 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
··· 1910 1910 r = -EINVAL; 1911 1911 1912 1912 error: 1913 - amdgpu_ib_free(adev, &ib, NULL); 1913 + amdgpu_ib_free(&ib, NULL); 1914 1914 dma_fence_put(f); 1915 1915 return r; 1916 1916 }
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
··· 2330 2330 r = -EINVAL; 2331 2331 2332 2332 error: 2333 - amdgpu_ib_free(adev, &ib, NULL); 2333 + amdgpu_ib_free(&ib, NULL); 2334 2334 dma_fence_put(f); 2335 2335 return r; 2336 2336 }
+2 -2
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
··· 914 914 r = -EINVAL; 915 915 916 916 err2: 917 - amdgpu_ib_free(adev, &ib, NULL); 917 + amdgpu_ib_free(&ib, NULL); 918 918 dma_fence_put(f); 919 919 err1: 920 920 amdgpu_device_wb_free(adev, index); ··· 1656 1656 RREG32(sec_ded_counter_registers[i]); 1657 1657 1658 1658 fail: 1659 - amdgpu_ib_free(adev, &ib, NULL); 1659 + amdgpu_ib_free(&ib, NULL); 1660 1660 dma_fence_put(f); 1661 1661 1662 1662 return r;
+2 -2
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
··· 1243 1243 r = -EINVAL; 1244 1244 1245 1245 err2: 1246 - amdgpu_ib_free(adev, &ib, NULL); 1246 + amdgpu_ib_free(&ib, NULL); 1247 1247 dma_fence_put(f); 1248 1248 err1: 1249 1249 amdgpu_device_wb_free(adev, index); ··· 4788 4788 } 4789 4789 4790 4790 fail: 4791 - amdgpu_ib_free(adev, &ib, NULL); 4791 + amdgpu_ib_free(&ib, NULL); 4792 4792 dma_fence_put(f); 4793 4793 4794 4794 return r;
+7 -7
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
··· 412 412 r = amdgpu_ib_schedule(ring, 1, ib, NULL, fence_ptr); 413 413 if (r) { 414 414 dev_err(adev->dev, "ib submit failed (%d).\n", r); 415 - amdgpu_ib_free(adev, ib, NULL); 415 + amdgpu_ib_free(ib, NULL); 416 416 } 417 417 return r; 418 418 } ··· 611 611 } 612 612 613 613 disp2_failed: 614 - amdgpu_ib_free(adev, &disp_ibs[2], NULL); 614 + amdgpu_ib_free(&disp_ibs[2], NULL); 615 615 dma_fence_put(fences[2]); 616 616 disp1_failed: 617 - amdgpu_ib_free(adev, &disp_ibs[1], NULL); 617 + amdgpu_ib_free(&disp_ibs[1], NULL); 618 618 dma_fence_put(fences[1]); 619 619 disp0_failed: 620 - amdgpu_ib_free(adev, &disp_ibs[0], NULL); 620 + amdgpu_ib_free(&disp_ibs[0], NULL); 621 621 dma_fence_put(fences[0]); 622 622 pro_end: 623 - amdgpu_ib_free(adev, &wb_ib, NULL); 623 + amdgpu_ib_free(&wb_ib, NULL); 624 624 625 625 if (r) 626 626 dev_info(adev->dev, "Init SGPRS Failed\n"); ··· 687 687 } 688 688 689 689 disp_failed: 690 - amdgpu_ib_free(adev, &disp_ib, NULL); 690 + amdgpu_ib_free(&disp_ib, NULL); 691 691 dma_fence_put(fence); 692 692 pro_end: 693 - amdgpu_ib_free(adev, &wb_ib, NULL); 693 + amdgpu_ib_free(&wb_ib, NULL); 694 694 695 695 if (r) 696 696 dev_info(adev->dev, "Init VGPRS Failed\n");
+1 -1
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c
··· 503 503 r = -EINVAL; 504 504 505 505 err2: 506 - amdgpu_ib_free(adev, &ib, NULL); 506 + amdgpu_ib_free(&ib, NULL); 507 507 dma_fence_put(f); 508 508 err1: 509 509 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
··· 633 633 r = -EINVAL; 634 634 635 635 err1: 636 - amdgpu_ib_free(adev, &ib, NULL); 636 + amdgpu_ib_free(&ib, NULL); 637 637 dma_fence_put(f); 638 638 err0: 639 639 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
··· 906 906 else 907 907 r = -EINVAL; 908 908 err1: 909 - amdgpu_ib_free(adev, &ib, NULL); 909 + amdgpu_ib_free(&ib, NULL); 910 910 dma_fence_put(f); 911 911 err0: 912 912 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
··· 1565 1565 r = -EINVAL; 1566 1566 1567 1567 err1: 1568 - amdgpu_ib_free(adev, &ib, NULL); 1568 + amdgpu_ib_free(&ib, NULL); 1569 1569 dma_fence_put(f); 1570 1570 err0: 1571 1571 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c
··· 1130 1130 r = -EINVAL; 1131 1131 1132 1132 err1: 1133 - amdgpu_ib_free(adev, &ib, NULL); 1133 + amdgpu_ib_free(&ib, NULL); 1134 1134 dma_fence_put(f); 1135 1135 err0: 1136 1136 amdgpu_device_wb_free(adev, index);
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
··· 1194 1194 r = -EINVAL; 1195 1195 1196 1196 err1: 1197 - amdgpu_ib_free(adev, &ib, NULL); 1197 + amdgpu_ib_free(&ib, NULL); 1198 1198 dma_fence_put(f); 1199 1199 err0: 1200 1200 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
··· 1050 1050 r = -EINVAL; 1051 1051 1052 1052 err1: 1053 - amdgpu_ib_free(adev, &ib, NULL); 1053 + amdgpu_ib_free(&ib, NULL); 1054 1054 dma_fence_put(f); 1055 1055 err0: 1056 1056 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
··· 1063 1063 r = -EINVAL; 1064 1064 1065 1065 err1: 1066 - amdgpu_ib_free(adev, &ib, NULL); 1066 + amdgpu_ib_free(&ib, NULL); 1067 1067 dma_fence_put(f); 1068 1068 err0: 1069 1069 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
··· 1108 1108 r = -EINVAL; 1109 1109 1110 1110 err1: 1111 - amdgpu_ib_free(adev, &ib, NULL); 1111 + amdgpu_ib_free(&ib, NULL); 1112 1112 dma_fence_put(f); 1113 1113 err0: 1114 1114 if (!ring->is_mes_queue)
+1 -1
drivers/gpu/drm/amd/amdgpu/si_dma.c
··· 286 286 r = -EINVAL; 287 287 288 288 err1: 289 - amdgpu_ib_free(adev, &ib, NULL); 289 + amdgpu_ib_free(&ib, NULL); 290 290 dma_fence_put(f); 291 291 err0: 292 292 amdgpu_device_wb_free(adev, index);