We can use .num_rings for that.

Fixes: 6f0359ff7307 ("vce3: add support for third vce ring")
Cc: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 06b94c1..121bd6e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -210,6 +210,8 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned 
long size)
  */
 int amdgpu_vce_sw_fini(struct amdgpu_device *adev)
 {
+       unsigned i;
+
        if (adev->vce.vcpu_bo == NULL)
                return 0;

@@ -217,8 +219,8 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)

        amdgpu_bo_unref(&adev->vce.vcpu_bo);

-       amdgpu_ring_fini(&adev->vce.ring[0]);
-       amdgpu_ring_fini(&adev->vce.ring[1]);
+       for (i = 0; i < adev->vce.num_rings; i++)
+               amdgpu_ring_fini(&adev->vce.ring[i]);

        release_firmware(adev->vce.fw);
        mutex_destroy(&adev->vce.idle_mutex);
-- 
2.7.4

Reply via email to