aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Zhu <James.Zhu@amd.com>2018-12-18 16:03:22 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-12-20 12:12:34 -0500
commit2bf55d2e6b71c8d79a7960d4f88bebc03f0e9a00 (patch)
tree7ebbb0ddc0cd8557dcb6c2c68b6552ff82638da1
parentc1973a1078dee6e8c9bd77825f40f84c21be142f (diff)
drm/amdgpu/uvd:Change uvd ring name convention
Since umr tool can't handle bracket, change uvd ring name convention. Signed-off-by: James Zhu <James.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
index 089645e78f98..aef924026a28 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c
@@ -435,7 +435,7 @@ static int uvd_v7_0_sw_init(void *handle)
435 continue; 435 continue;
436 if (!amdgpu_sriov_vf(adev)) { 436 if (!amdgpu_sriov_vf(adev)) {
437 ring = &adev->uvd.inst[j].ring; 437 ring = &adev->uvd.inst[j].ring;
438 sprintf(ring->name, "uvd<%d>", j); 438 sprintf(ring->name, "uvd_%d", ring->me);
439 r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst[j].irq, 0); 439 r = amdgpu_ring_init(adev, ring, 512, &adev->uvd.inst[j].irq, 0);
440 if (r) 440 if (r)
441 return r; 441 return r;
@@ -443,7 +443,7 @@ static int uvd_v7_0_sw_init(void *handle)
443 443
444 for (i = 0; i < adev->uvd.num_enc_rings; ++i) { 444 for (i = 0; i < adev->uvd.num_enc_rings; ++i) {
445 ring = &adev->uvd.inst[j].ring_enc[i]; 445 ring = &adev->uvd.inst[j].ring_enc[i];
446 sprintf(ring->name, "uvd_enc%d<%d>", i, j); 446 sprintf(ring->name, "uvd_enc_%d.%d", ring->me, i);
447 if (amdgpu_sriov_vf(adev)) { 447 if (amdgpu_sriov_vf(adev)) {
448 ring->use_doorbell = true; 448 ring->use_doorbell = true;
449 449