Commit 6e82c6e0 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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



Consistently use the ring name instead.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b7ff853f

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

+3 −3
Original line number Diff line number Diff line
@@ -398,8 +398,8 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
	ring->fence_drv.irq_type = irq_type;

	ring->fence_drv.initialized = true;



	dev_dbg(adev->dev, "fence driver on ring %d use gpu addr 0x%016llx, "

		"cpu addr 0x%p\n", ring->idx,

	DRM_DEV_DEBUG(adev->dev, "fence driver on ring %s use gpu addr "

		      "0x%016llx, cpu addr 0x%p\n", ring->name,

		      ring->fence_drv.gpu_addr, ring->fence_drv.cpu_addr);

	return 0;

}

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+2 −2
Original line number Diff line number Diff line
@@ -1620,8 +1620,8 @@ static int gfx_v9_0_ngg_en(struct amdgpu_device *adev) 
	/* Clear GDS reserved memory */

	r = amdgpu_ring_alloc(ring, 17);

	if (r) {

		DRM_ERROR("amdgpu: NGG failed to lock ring %d (%d).\n",

			  ring->idx, r);

		DRM_ERROR("amdgpu: NGG failed to lock ring %s (%d).\n",

			  ring->name, r);

		return r;

	}

drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c

+2 −3
Original line number Diff line number Diff line
@@ -739,9 +739,8 @@ static int gmc_v9_0_late_init(void *handle) 
		unsigned vmhub = ring->funcs->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",

			 ring->idx, ring->name, ring->vm_inv_eng,

			 ring->funcs->vmhub);

		dev_info(adev->dev, "ring %s uses VM inv eng %u on hub %u\n",

			 ring->name, ring->vm_inv_eng, ring->funcs->vmhub);

	}



	/* Engine 16 is used for KFD and 17 for GART flushes */

CRA Git | Maintained and supported by SUSTech CRA and CCSE