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

drm/amdgpu: further ring test cleanups 



Move all error messages from IP specific code into the common helper.
This way we now uses the ring name in the messages instead of the index
and note which device is affected as well.

Also cleanup error handling in the IP specific code and consequently use
ETIMEDOUT when the ring test timed out.

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

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

+7 −1
Original line number Diff line number Diff line
@@ -512,11 +512,17 @@ static void amdgpu_debugfs_ring_fini(struct amdgpu_ring *ring) 
 */

int amdgpu_ring_test_helper(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	int r;



	r = amdgpu_ring_test_ring(ring);

	if (r)

		DRM_DEV_ERROR(adev->dev, "ring %s test failed (%d)\n",

			      ring->name, r);

	else

		DRM_DEV_DEBUG(adev->dev, "ring test on %s succeeded\n",

			      ring->name);



	ring->sched.ready = !r;



	return r;

}

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

+3 −11
Original line number Diff line number Diff line
@@ -1079,11 +1079,9 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
		return 0;



	r = amdgpu_ring_alloc(ring, 16);

	if (r) {

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

			  ring->idx, r);

	if (r)

		return r;

	}



	amdgpu_ring_write(ring, VCE_CMD_END);

	amdgpu_ring_commit(ring);
@@ -1093,14 +1091,8 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
		DRM_UDELAY(1);

	}



	if (i < timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",

			 ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed\n",

			  ring->idx);

	if (i >= timeout)

		r = -ETIMEDOUT;

	}



	return r;

}

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

+11 −35
Original line number Diff line number Diff line
@@ -425,11 +425,9 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) 


	WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9), 0xCAFEDEAD);

	r = amdgpu_ring_alloc(ring, 3);

	if (r) {

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

			  ring->idx, r);

	if (r)

		return r;

	}



	amdgpu_ring_write(ring,

		PACKET0(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9), 0));

	amdgpu_ring_write(ring, 0xDEADBEEF);
@@ -441,14 +439,9 @@ int amdgpu_vcn_dec_ring_test_ring(struct amdgpu_ring *ring) 
		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",

			 ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",

			  ring->idx, tmp);

		r = -EINVAL;

	}

	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



	return r;

}
@@ -606,11 +599,9 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) 
	int r;



	r = amdgpu_ring_alloc(ring, 16);

	if (r) {

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

			  ring->idx, r);

	if (r)

		return r;

	}



	amdgpu_ring_write(ring, VCN_ENC_CMD_END);

	amdgpu_ring_commit(ring);
@@ -620,14 +611,8 @@ int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring) 
		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",

			 ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed\n",

			  ring->idx);

	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;

	}



	return r;

}
@@ -778,11 +763,8 @@ int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring) 
	WREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9), 0xCAFEDEAD);

	r = amdgpu_ring_alloc(ring, 3);



	if (r) {

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

				  ring->idx, r);

	if (r)

		return r;

	}



	amdgpu_ring_write(ring,

		PACKETJ(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9), 0, 0, 0));
@@ -796,14 +778,8 @@ int amdgpu_vcn_jpeg_ring_test_ring(struct amdgpu_ring *ring) 
		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n",

				  ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",

				  ring->idx, tmp);

		r = -EINVAL;

	}

	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



	return r;

}

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

+8 −16
Original line number Diff line number Diff line
@@ -616,21 +616,17 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) 
	u64 gpu_addr;



	r = amdgpu_device_wb_get(adev, &index);

	if (r) {

		dev_err(adev->dev, "(%d) failed to allocate wb slot\n", r);

	if (r)

		return r;

	}



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

	tmp = 0xCAFEDEAD;

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



	r = amdgpu_ring_alloc(ring, 5);

	if (r) {

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

		amdgpu_device_wb_free(adev, index);

		return r;

	}

	if (r)

		goto error_free_wb;



	amdgpu_ring_write(ring, SDMA_PACKET(SDMA_OPCODE_WRITE, SDMA_WRITE_SUB_OPCODE_LINEAR, 0));

	amdgpu_ring_write(ring, lower_32_bits(gpu_addr));

	amdgpu_ring_write(ring, upper_32_bits(gpu_addr));
@@ -645,15 +641,11 @@ static int cik_sdma_ring_test_ring(struct amdgpu_ring *ring) 
		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed (0x%08X)\n",

			  ring->idx, tmp);

		r = -EINVAL;

	}

	amdgpu_device_wb_free(adev, index);

	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



error_free_wb:

	amdgpu_device_wb_free(adev, index);

	return r;

}

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

+10 −15
Original line number Diff line number Diff line
@@ -1775,18 +1775,15 @@ static int gfx_v6_0_ring_test_ring(struct amdgpu_ring *ring) 
	int r;



	r = amdgpu_gfx_scratch_get(adev, &scratch);

	if (r) {

		DRM_ERROR("amdgpu: cp failed to get scratch reg (%d).\n", r);

	if (r)

		return r;

	}



	WREG32(scratch, 0xCAFEDEAD);



	r = amdgpu_ring_alloc(ring, 3);

	if (r) {

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

		amdgpu_gfx_scratch_free(adev, scratch);

		return r;

	}

	if (r)

		goto error_free_scratch;



	amdgpu_ring_write(ring, PACKET3(PACKET3_SET_CONFIG_REG, 1));

	amdgpu_ring_write(ring, (scratch - PACKET3_SET_CONFIG_REG_START));

	amdgpu_ring_write(ring, 0xDEADBEEF);
@@ -1798,13 +1795,11 @@ static int gfx_v6_0_ring_test_ring(struct amdgpu_ring *ring) 
			break;

		DRM_UDELAY(1);

	}

	if (i < adev->usec_timeout) {

		DRM_DEBUG("ring test on %d succeeded in %d usecs\n", ring->idx, i);

	} else {

		DRM_ERROR("amdgpu: ring %d test failed (scratch(0x%04X)=0x%08X)\n",

			  ring->idx, scratch, tmp);

		r = -EINVAL;

	}



	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



error_free_scratch:

	amdgpu_gfx_scratch_free(adev, scratch);

	return r;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE