Commit 358e6c38 authored by James Zhu's avatar James Zhu Committed by Alex Deucher

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: default avatarJames Zhu <James.Zhu@amd.com>
Reviewed-by: default avatarSonny Jiang <sonny.jiang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d3e53452
...@@ -110,7 +110,7 @@ static int jpeg_v4_0_3_sw_init(void *handle) ...@@ -110,7 +110,7 @@ static int jpeg_v4_0_3_sw_init(void *handle)
ring->doorbell_index = ring->doorbell_index =
(adev->doorbell_index.vcn.vcn_ring0_1 << 1) + (adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
1 + j + 9 * jpeg_inst; 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, r = amdgpu_ring_init(adev, ring, 512, &adev->jpeg.inst->irq, 0,
AMDGPU_RING_PRIO_DEFAULT, NULL); AMDGPU_RING_PRIO_DEFAULT, NULL);
if (r) if (r)
......
...@@ -112,7 +112,7 @@ static int vcn_v4_0_3_sw_init(void *handle) ...@@ -112,7 +112,7 @@ static int vcn_v4_0_3_sw_init(void *handle)
(adev->doorbell_index.vcn.vcn_ring0_1 << 1) + (adev->doorbell_index.vcn.vcn_ring0_1 << 1) +
9 * vcn_inst; 9 * vcn_inst;
ring->vm_hub = AMDGPU_MMHUB0(adev->vcn.inst[i].aid_id); 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, r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.inst->irq, 0,
AMDGPU_RING_PRIO_DEFAULT, AMDGPU_RING_PRIO_DEFAULT,
&adev->vcn.inst[i].sched_score); &adev->vcn.inst[i].sched_score);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment