Commit ea93ac2f authored by Jack Xiao's avatar Jack Xiao Committed by Alex Deucher
Browse files

drm/amdgpu/sdma5: add mes support for sdma ring test 



Add MES support for sdma ring test.

Signed-off-by: default avatarJack Xiao <Jack.Xiao@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 76411afd

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

+26 −11
Original line number Diff line number Diff line
@@ -1021,7 +1021,18 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring) 
	int r;

	u32 tmp;

	u64 gpu_addr;

	volatile uint32_t *cpu_ptr = NULL;



	tmp = 0xCAFEDEAD;



	if (ring->is_mes_queue) {

		uint32_t offset = 0;

		offset = amdgpu_mes_ctx_get_offs(ring,

					 AMDGPU_MES_CTX_PADDING_OFFS);

		gpu_addr = amdgpu_mes_ctx_get_offs_gpu_addr(ring, offset);

		cpu_ptr = amdgpu_mes_ctx_get_offs_cpu_addr(ring, offset);

		*cpu_ptr = tmp;

	} else {

		r = amdgpu_device_wb_get(adev, &index);

		if (r) {

			dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);
@@ -1029,10 +1040,10 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring) 
		}



		gpu_addr = adev->wb.gpu_addr + (index * 4);

	tmp = 0xCAFEDEAD;

		adev->wb.wb[index] = cpu_to_le32(tmp);

	}



	r = amdgpu_ring_alloc(ring, 5);

	r = amdgpu_ring_alloc(ring, 20);

	if (r) {

		DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);

		amdgpu_device_wb_free(adev, index);
@@ -1048,6 +1059,9 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring) 
	amdgpu_ring_commit(ring);



	for (i = 0; i < adev->usec_timeout; i++) {

		if (ring->is_mes_queue)

			tmp = le32_to_cpu(*cpu_ptr);

		else

			tmp = le32_to_cpu(adev->wb.wb[index]);

		if (tmp == 0xDEADBEEF)

			break;
@@ -1060,6 +1074,7 @@ static int sdma_v5_0_ring_test_ring(struct amdgpu_ring *ring) 
	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



	if (!ring->is_mes_queue)

		amdgpu_device_wb_free(adev, index);



	return r;