iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: remove amdgpu_ttm_late_init and amdgpu_bo_late_init

Browse Source 
No longer used.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher
2020-12-04 11:56:46 -05:00
parent 5f6fab247c
commit 64f2c15892
9 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
View File

@ -1074,23 +1074,6 @@ int amdgpu_bo_init(struct amdgpu_device *adev)
return amdgpu_ttm_init(adev); return amdgpu_ttm_init(adev);
} }
/**
* amdgpu_bo_late_init - late init
* @adev: amdgpu device object
*
* Calls amdgpu_ttm_late_init() to free resources used earlier during
* initialization.
*
* Returns:
* 0 for success or a negative error code on failure.
*/
int amdgpu_bo_late_init(struct amdgpu_device *adev)
{
amdgpu_ttm_late_init(adev);
return 0;
}
/** /**
* amdgpu_bo_fini - tear down memory manager * amdgpu_bo_fini - tear down memory manager
* @adev: amdgpu device object * @adev: amdgpu device object

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

@ -269,7 +269,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
void amdgpu_bo_unpin(struct amdgpu_bo *bo); void amdgpu_bo_unpin(struct amdgpu_bo *bo);
int amdgpu_bo_evict_vram(struct amdgpu_device *adev); int amdgpu_bo_evict_vram(struct amdgpu_device *adev);
int amdgpu_bo_init(struct amdgpu_device *adev); int amdgpu_bo_init(struct amdgpu_device *adev);
int amdgpu_bo_late_init(struct amdgpu_device *adev);
void amdgpu_bo_fini(struct amdgpu_device *adev); void amdgpu_bo_fini(struct amdgpu_device *adev);
int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo, int amdgpu_bo_fbdev_mmap(struct amdgpu_bo *bo,
struct vm_area_struct *vma); struct vm_area_struct *vma);

7
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@ -2021,13 +2021,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
return 0; return 0;
} }
/*
* amdgpu_ttm_late_init - Handle any late initialization for amdgpu_ttm
*/
void amdgpu_ttm_late_init(struct amdgpu_device *adev)
{
}
/* /*
* amdgpu_ttm_fini - De-initialize the TTM memory pools * amdgpu_ttm_fini - De-initialize the TTM memory pools
*/ */

1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
View File

@ -131,7 +131,6 @@ int amdgpu_vram_mgr_query_page_status(struct ttm_resource_manager *man,
uint64_t start); uint64_t start);
int amdgpu_ttm_init(struct amdgpu_device *adev); int amdgpu_ttm_init(struct amdgpu_device *adev);
void amdgpu_ttm_late_init(struct amdgpu_device *adev);
void amdgpu_ttm_fini(struct amdgpu_device *adev); void amdgpu_ttm_fini(struct amdgpu_device *adev);
void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev,
bool enable); bool enable);

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

@ -717,8 +717,6 @@ static int gmc_v10_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r; int r;
amdgpu_bo_late_init(adev);
r = amdgpu_gmc_allocate_vm_inv_eng(adev); r = amdgpu_gmc_allocate_vm_inv_eng(adev);
if (r) if (r)
return r; return r;

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

@ -791,8 +791,6 @@ static int gmc_v6_0_late_init(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
amdgpu_bo_late_init(adev);
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS) if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0); return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
else else

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

@ -961,8 +961,6 @@ static int gmc_v7_0_late_init(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
amdgpu_bo_late_init(adev);
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS) if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0); return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
else else

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

@ -1062,8 +1062,6 @@ static int gmc_v8_0_late_init(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
amdgpu_bo_late_init(adev);
if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS) if (amdgpu_vm_fault_stop != AMDGPU_VM_FAULT_STOP_ALWAYS)
return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0); return amdgpu_irq_get(adev, &adev->gmc.vm_fault, 0);
else else

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

@ -1177,8 +1177,6 @@ static int gmc_v9_0_late_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r; int r;
amdgpu_bo_late_init(adev);
r = amdgpu_gmc_allocate_vm_inv_eng(adev); r = amdgpu_gmc_allocate_vm_inv_eng(adev);
if (r) if (r)
return r; return r;