Skip to content

Commit 64f2c15

Browse files
committed
drm/amdgpu: remove amdgpu_ttm_late_init and amdgpu_bo_late_init
No longer used. Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 5f6fab2 commit 64f2c15

File tree

9 files changed

+0
-36
lines changed

9 files changed

+0
-36
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,23 +1074,6 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
10741074
return amdgpu_ttm_init(adev);
10751075
}
10761076

1077-
/**
1078-
* amdgpu_bo_late_init - late init
1079-
* @adev: amdgpu device object
1080-
*
1081-
* Calls amdgpu_ttm_late_init() to free resources used earlier during
1082-
* initialization.
1083-
*
1084-
* Returns:
1085-
* 0 for success or a negative error code on failure.
1086-
*/
1087-
int amdgpu_bo_late_init(struct amdgpu_device *adev)
1088-
{
1089-
amdgpu_ttm_late_init(adev);
1090-
1091-
return 0;
1092-
}
1093-
10941077
/**
10951078
* amdgpu_bo_fini - tear down memory manager
10961079
* @adev: amdgpu device object

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
269269
void amdgpu_bo_unpin(struct amdgpu_bo *bo);
270270
int amdgpu_bo_evict_vram(struct amdgpu_device *adev);
271271
int amdgpu_bo_init(struct amdgpu_device *adev);
272-
int amdgpu_bo_late_init(struct amdgpu_device *adev);
273272
void amdgpu_bo_fini(struct amdgpu_device *adev);
274273
int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,
275274
struct vm_area_struct *vma);

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,13 +2021,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
20212021
return 0;
20222022
}
20232023

2024-
/*
2025-
* amdgpu_ttm_late_init - Handle any late initialization for amdgpu_ttm
2026-
*/
2027-
void amdgpu_ttm_late_init(struct amdgpu_device *adev)
2028-
{
2029-
}
2030-
20312024
/*
20322025
* amdgpu_ttm_fini - De-initialize the TTM memory pools
20332026
*/

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ int amdgpu_vram_mgr_query_page_status(struct ttm_resource_manager *man,
131131
uint64_t start);
132132

133133
int amdgpu_ttm_init(struct amdgpu_device *adev);
134-
void amdgpu_ttm_late_init(struct amdgpu_device *adev);
135134
void amdgpu_ttm_fini(struct amdgpu_device *adev);
136135
void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev,
137136
bool enable);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,8 +717,6 @@ static int gmc_v10_0_late_init(void *handle)
717717
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
718718
int r;
719719

720-
amdgpu_bo_late_init(adev);
721-
722720
r = amdgpu_gmc_allocate_vm_inv_eng(adev);
723721
if (r)
724722
return r;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,8 +791,6 @@ static int gmc_v6_0_late_init(void *handle)
791791
{
792792
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
793793

794-
amdgpu_bo_late_init(adev);
795-
796794
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
797795
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
798796
else

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,6 @@ static int gmc_v7_0_late_init(void *handle)
961961
{
962962
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
963963

964-
amdgpu_bo_late_init(adev);
965-
966964
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
967965
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
968966
else

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,8 +1062,6 @@ static int gmc_v8_0_late_init(void *handle)
10621062
{
10631063
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
10641064

1065-
amdgpu_bo_late_init(adev);
1066-
10671065
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
10681066
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
10691067
else

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,6 @@ static int gmc_v9_0_late_init(void *handle)
11771177
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
11781178
int r;
11791179

1180-
amdgpu_bo_late_init(adev);
1181-
11821180
r = amdgpu_gmc_allocate_vm_inv_eng(adev);
11831181
if (r)
11841182
return r;

0 commit comments

Comments
 (0)