Skip to content

Commit

Permalink
drm/amdgpu/sdma: remove manual instance setting
Browse files Browse the repository at this point in the history
Handled by IP discovery now.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Alex Deucher committed Oct 4, 2021
1 parent 5c3720b commit fe323f0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 36 deletions.
17 changes: 0 additions & 17 deletions drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
17 changes: 0 additions & 17 deletions drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit fe323f0

Please sign in to comment.