drm/amdgpu: track the number of vce rings

Rather than using a hardcoded value.  This allows
different versions to expose more or less rings.

No functional change.

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

4 files changed, 45 insertions, 52 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 849451432a3f..0cd1c9316974 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1686,6 +1686,7 @@ struct amdgpu_vce {
         unsigned                harvest_config;
         struct amd_sched_entity entity;
         uint32_t                srbm_soft_reset;
+        unsigned                num_rings;
 };
 
 /*
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index b78e74048f3d..f1b9e0f2869f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -296,7 +296,7 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                         break;
                 case AMDGPU_HW_IP_VCE:
                         type = AMD_IP_BLOCK_TYPE_VCE;
-                        for (i = 0; i < AMDGPU_MAX_VCE_RINGS; i++)
+                        for (i = 0; i < adev->vce.num_rings; i++)
                                 ring_mask |= ((adev->vce.ring[i].ready ? 1 : 0) << i);
                         ib_start_alignment = AMDGPU_GPU_PAGE_SIZE;
                         ib_size_alignment = 1;
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
index 5fa55b52c00e..3fcc33f9ae70 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v2_0.c
@@ -193,6 +193,8 @@ static int vce_v2_0_early_init(void *handle)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+        adev->vce.num_rings = 2;
+
         vce_v2_0_set_ring_funcs(adev);
         vce_v2_0_set_irq_funcs(adev);
 
@@ -202,7 +204,7 @@ static int vce_v2_0_early_init(void *handle)
 static int vce_v2_0_sw_init(void *handle)
 {
         struct amdgpu_ring *ring;
-        int r;
+        int r, i;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
         /* VCE */
@@ -219,19 +221,14 @@ static int vce_v2_0_sw_init(void *handle)
         if (r)
                 return r;
 
-        ring = &adev->vce.ring[0];
-        sprintf(ring->name, "vce0");
-        r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
-                             &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
-        if (r)
-                return r;
-
-        ring = &adev->vce.ring[1];
-        sprintf(ring->name, "vce1");
-        r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
-                             &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
-        if (r)
-                return r;
+        for (i = 0; i < adev->vce.num_rings; i++) {
+                ring = &adev->vce.ring[i];
+                sprintf(ring->name, "vce%d", i);
+                r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
+                                     &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
+                if (r)
+                        return r;
+        }
 
         return r;
 }
@@ -254,29 +251,23 @@ static int vce_v2_0_sw_fini(void *handle)
 
 static int vce_v2_0_hw_init(void *handle)
 {
-        struct amdgpu_ring *ring;
-        int r;
+        int r, i;
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
         r = vce_v2_0_start(adev);
+        /* this error mean vcpu not in running state, so just skip ring test, not stop driver initialize */
         if (r)
-/* this error mean vcpu not in running state, so just skip ring test, not stop driver initialize */
                 return 0;
 
-        ring = &adev->vce.ring[0];
-        ring->ready = true;
-        r = amdgpu_ring_test_ring(ring);
-        if (r) {
-                ring->ready = false;
-                return r;
-        }
+        for (i = 0; i < adev->vce.num_rings; i++)
+                adev->vce.ring[i].ready = false;
 
-        ring = &adev->vce.ring[1];
-        ring->ready = true;
-        r = amdgpu_ring_test_ring(ring);
-        if (r) {
-                ring->ready = false;
-                return r;
+        for (i = 0; i < adev->vce.num_rings; i++) {
+                r = amdgpu_ring_test_ring(&adev->vce.ring[i]);
+                if (r)
+                        return r;
+                else
+                        adev->vce.ring[i].ready = true;
         }
 
         DRM_INFO("VCE initialized successfully.\n");
@@ -618,8 +609,10 @@ static const struct amdgpu_ring_funcs vce_v2_0_ring_funcs = {
 
 static void vce_v2_0_set_ring_funcs(struct amdgpu_device *adev)
 {
-        adev->vce.ring[0].funcs = &vce_v2_0_ring_funcs;
-        adev->vce.ring[1].funcs = &vce_v2_0_ring_funcs;
+        int i;
+
+        for (i = 0; i < adev->vce.num_rings; i++)
+                adev->vce.ring[i].funcs = &vce_v2_0_ring_funcs;
 }
 
 static const struct amdgpu_irq_src_funcs vce_v2_0_irq_funcs = {
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 615b8b16ad04..27acd2862d8a 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -345,6 +345,8 @@ static int vce_v3_0_early_init(void *handle)
             (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1))
                 return -ENOENT;
 
+        adev->vce.num_rings = 2;
+
         vce_v3_0_set_ring_funcs(adev);
         vce_v3_0_set_irq_funcs(adev);
 
@@ -355,7 +357,7 @@ static int vce_v3_0_sw_init(void *handle)
 {
         struct amdgpu_device *adev = (struct amdgpu_device *)handle;
         struct amdgpu_ring *ring;
-        int r;
+        int r, i;
 
         /* VCE */
         r = amdgpu_irq_add_id(adev, 167, &adev->vce.irq);
@@ -371,19 +373,14 @@ static int vce_v3_0_sw_init(void *handle)
         if (r)
                 return r;
 
-        ring = &adev->vce.ring[0];
-        sprintf(ring->name, "vce0");
-        r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
-                             &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
-        if (r)
-                return r;
-
-        ring = &adev->vce.ring[1];
-        sprintf(ring->name, "vce1");
-        r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
-                             &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
-        if (r)
-                return r;
+        for (i = 0; i < adev->vce.num_rings; i++) {
+                ring = &adev->vce.ring[i];
+                sprintf(ring->name, "vce%d", i);
+                r = amdgpu_ring_init(adev, ring, 512, VCE_CMD_NO_OP, 0xf,
+                                     &adev->vce.irq, 0, AMDGPU_RING_TYPE_VCE);
+                if (r)
+                        return r;
+        }
 
         return r;
 }
@@ -413,10 +410,10 @@ static int vce_v3_0_hw_init(void *handle)
         if (r)
                 return r;
 
-        adev->vce.ring[0].ready = false;
-        adev->vce.ring[1].ready = false;
+        for (i = 0; i < adev->vce.num_rings; i++)
+                adev->vce.ring[i].ready = false;
 
-        for (i = 0; i < 2; i++) {
+        for (i = 0; i < adev->vce.num_rings; i++) {
                 r = amdgpu_ring_test_ring(&adev->vce.ring[i]);
                 if (r)
                         return r;
@@ -800,8 +797,10 @@ static const struct amdgpu_ring_funcs vce_v3_0_ring_funcs = {
 
 static void vce_v3_0_set_ring_funcs(struct amdgpu_device *adev)
 {
-        adev->vce.ring[0].funcs = &vce_v3_0_ring_funcs;
-        adev->vce.ring[1].funcs = &vce_v3_0_ring_funcs;
+        int i;
+
+        for (i = 0; i < adev->vce.num_rings; i++)
+                adev->vce.ring[i].funcs = &vce_v3_0_ring_funcs;
 }
 
 static const struct amdgpu_irq_src_funcs vce_v3_0_irq_funcs = {