openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu: drop the remaining uses of ring idx in messages 

Consistently use the ring name instead.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König 2018-10-30 13:16:28 +01:00 committed by Alex Deucher
parent b7ff853f15
commit 6e82c6e066
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
View File

@ -398,8 +398,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring,
ring->fence_drv.irq_type = irq_type; ring->fence_drv.irq_type = irq_type;
ring->fence_drv.initialized = true; ring->fence_drv.initialized = true;
dev_dbg(adev->dev, "fence driver on ring %d use gpu addr 0x%016llx, " DRM_DEV_DEBUG(adev->dev, "fence driver on ring %s use gpu addr "
"cpu addr 0x%p\n", ring->idx, "0x%016llx, cpu addr 0x%p\n", ring->name,
ring->fence_drv.gpu_addr, ring->fence_drv.cpu_addr); ring->fence_drv.gpu_addr, ring->fence_drv.cpu_addr);
return 0; return 0;
} }

4
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
View File

@ -1620,8 +1620,8 @@ static int gfx_v9_0_ngg_en(struct amdgpu_device *adev)
/* Clear GDS reserved memory */ /* Clear GDS reserved memory */
r = amdgpu_ring_alloc(ring, 17); r = amdgpu_ring_alloc(ring, 17);
if (r) { if (r) {
DRM_ERROR("amdgpu: NGG failed to lock ring %d (%d).\n", DRM_ERROR("amdgpu: NGG failed to lock ring %s (%d).\n",
ring->idx, r); ring->name, r);
return r; return r;
} }

5
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
View File

@ -739,9 +739,8 @@ static int gmc_v9_0_late_init(void *handle)
unsigned vmhub = ring->funcs->vmhub; unsigned vmhub = ring->funcs->vmhub;
ring->vm_inv_eng = vm_inv_eng[vmhub]++; ring->vm_inv_eng = vm_inv_eng[vmhub]++;
dev_info(adev->dev, "ring %u(%s) uses VM inv eng %u on hub %u\n", dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",
ring->idx, ring->name, ring->vm_inv_eng, ring->name, ring->vm_inv_eng, ring->funcs->vmhub);
ring->funcs->vmhub);
} }
/* Engine 16 is used for KFD and 17 for GART flushes */ /* Engine 16 is used for KFD and 17 for GART flushes */