github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 18:43:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/amdgpu/sdma: remove manual instance setting

Browse Source 
Handled by IP discovery now.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2021-08-09 12:29:56 -04:00
parent 5c3720be7d
commit fe323f039d
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1856,23 +1856,6 @@ static int sdma_v4_0_early_init(void *handle)
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
switch (adev->ip_versions[SDMA0_HWIP]) {
case IP_VERSION(4, 1, 0):
case IP_VERSION(4, 1, 1):
case IP_VERSION(4, 1, 2):
adev->sdma.num_instances = 1;
break;
case IP_VERSION(4, 2, 2):
adev->sdma.num_instances = 8;
break;
case IP_VERSION(4, 4, 0):
adev->sdma.num_instances = 5;
break;
default:
adev->sdma.num_instances = 2;
break;
}
r = sdma_v4_0_init_microcode(adev);
if (r) {
DRM_ERROR("Failed to load sdma firmware!\n");

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

@ -1295,8 +1295,6 @@ static int sdma_v5_0_early_init(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
adev->sdma.num_instances = 2;
sdma_v5_0_set_ring_funcs(adev);
sdma_v5_0_set_buffer_funcs(adev);
sdma_v5_0_set_vm_pte_funcs(adev);

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

@ -1217,23 +1217,6 @@ static int sdma_v5_2_early_init(void *handle)
{
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
switch (adev->ip_versions[SDMA0_HWIP]) {
case IP_VERSION(5, 2, 0):
adev->sdma.num_instances = 4;
break;
case IP_VERSION(5, 2, 2):
case IP_VERSION(5, 2, 4):
adev->sdma.num_instances = 2;
break;
case IP_VERSION(5, 2, 1):
case IP_VERSION(5, 2, 5):
case IP_VERSION(5, 2, 3):
adev->sdma.num_instances = 1;
break;
default:
break;
}
sdma_v5_2_set_ring_funcs(adev);
sdma_v5_2_set_buffer_funcs(adev);
sdma_v5_2_set_vm_pte_funcs(adev);