drm/amdgpu: rework sdma structures

Rework the sdma structures in the driver to
consolidate all of the sdma info into a single
structure and allow for asics that may have
different numbers of sdma instances.

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

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 6647fb26ef25..afc984806c4c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1708,7 +1708,7 @@ struct amdgpu_vce {
 /*
  * SDMA
  */
-struct amdgpu_sdma {
+struct amdgpu_sdma_instance {
         /* SDMA firmware */
         const struct firmware   *fw;
         uint32_t                fw_version;
@@ -1718,6 +1718,13 @@ struct amdgpu_sdma {
         bool                    burst_nop;
 };
 
+struct amdgpu_sdma {
+        struct amdgpu_sdma_instance instance[AMDGPU_MAX_SDMA_INSTANCES];
+        struct amdgpu_irq_src   trap_irq;
+        struct amdgpu_irq_src   illegal_inst_irq;
+        int                     num_instances;
+};
+
 /*
  * Firmware
  */
@@ -2064,9 +2071,7 @@ struct amdgpu_device {
         struct amdgpu_gfx               gfx;
 
         /* sdma */
-        struct amdgpu_sdma              sdma[AMDGPU_MAX_SDMA_INSTANCES];
-        struct amdgpu_irq_src           sdma_trap_irq;
-        struct amdgpu_irq_src           sdma_illegal_inst_irq;
+        struct amdgpu_sdma              sdma;
 
         /* uvd */
         bool                            has_uvd;
@@ -2203,17 +2208,18 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v)
         ring->ring_free_dw--;
 }
 
-static inline struct amdgpu_sdma * amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
+static inline struct amdgpu_sdma_instance *
+amdgpu_get_sdma_instance(struct amdgpu_ring *ring)
 {
         struct amdgpu_device *adev = ring->adev;
         int i;
 
-        for (i = 0; i < AMDGPU_MAX_SDMA_INSTANCES; i++)
-                if (&adev->sdma[i].ring == ring)
+        for (i = 0; i < adev->sdma.num_instances; i++)
+                if (&adev->sdma.instance[i].ring == ring)
                         break;
 
         if (i < AMDGPU_MAX_SDMA_INSTANCES)
-                return &adev->sdma[i];
+                return &adev->sdma.instance[i];
         else
                 return NULL;
 }