drm/amdgpu/sdma: remove manual instance setting

Handled by IP discovery now.

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 3219dca3e44f05fee0692e08723c34d2ae5eebe6..cb74f8c35d0ae5806e161ba1b79a5cc1589a8930 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -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");

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
index 2ab670c58520a370fdcb29066f138d1d73c9c7b0..d3b01d2977c00e2f5863d5d159b07d0080ac6bfa 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -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);

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
index b38d0caabdf76228ed0497bdfd1c848c3c3374d0..3d89e7280a04dac65915322b2929e9d8a4bca1e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
@@ -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);