drm/amdgpu: use physical AID index for ring name

Use physical AID index for VCN/JPEG ring name instead of
logical AID index.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Sonny Jiang <sonny.jiang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
index c0e90e2..ea9cb09 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c
@@ -110,7 +110,7 @@ static int jpeg_v4_0_3_sw_init(void *handle)
                        ring->doorbell_index =
                                (adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
                                1 + j + 9 * jpeg_inst;
-                       sprintf(ring->name, "jpeg_dec_%d.%d", i, j);
+                       sprintf(ring->name, "jpeg_dec_%d.%d", adev->jpeg.inst[i].aid_id, j);
                        r = amdgpu_ring_init(adev, ring, 512, &adev->jpeg.inst->irq, 0,
                                                AMDGPU_RING_PRIO_DEFAULT, NULL);
                        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
index 759f64a..b0e28d6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c
@@ -112,7 +112,7 @@ static int vcn_v4_0_3_sw_init(void *handle)
                        (adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
                        9 * vcn_inst;
                ring->vm_hub = AMDGPU_MMHUB0(adev->vcn.inst[i].aid_id);
-               sprintf(ring->name, "vcn_unified_%d", i);
+               sprintf(ring->name, "vcn_unified_%d", adev->vcn.inst[i].aid_id);
                r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.inst->irq, 0,
                                     AMDGPU_RING_PRIO_DEFAULT,
                                     &adev->vcn.inst[i].sched_score);