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

drm/amdgpu: remove messages from IB tests 



We already print an error message that an IB test failed in the common
code.

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 315fed03

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

+4 −14
Original line number Diff line number Diff line
@@ -1243,30 +1243,20 @@ int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
{

	struct dma_fence *fence;

	long r;

	uint32_t ip_instance = ring->me;



	r = amdgpu_uvd_get_create_msg(ring, 1, NULL);

	if (r) {

		DRM_ERROR("amdgpu: (%d)failed to get create msg (%ld).\n", ip_instance, r);

	if (r)

		goto error;

	}



	r = amdgpu_uvd_get_destroy_msg(ring, 1, true, &fence);

	if (r) {

		DRM_ERROR("amdgpu: (%d)failed to get destroy ib (%ld).\n", ip_instance, r);

	if (r)

		goto error;

	}



	r = dma_fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: (%d)IB test timed out.\n", ip_instance);

	if (r == 0)

		r = -ETIMEDOUT;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: (%d)fence wait failed (%ld).\n", ip_instance, r);

	} else {

		DRM_DEBUG("ib test on (%d)ring %d succeeded\n", ip_instance, ring->idx);

	else if (r > 0)

		r = 0;

	}



	dma_fence_put(fence);

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

+5 −13
Original line number Diff line number Diff line
@@ -1113,27 +1113,19 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
		return 0;



	r = amdgpu_vce_get_create_msg(ring, 1, NULL);

	if (r) {

		DRM_ERROR("amdgpu: failed to get create msg (%ld).\n", r);

	if (r)

		goto error;

	}



	r = amdgpu_vce_get_destroy_msg(ring, 1, true, &fence);

	if (r) {

		DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r);

	if (r)

		goto error;

	}



	r = dma_fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out.\n");

	if (r == 0)

		r = -ETIMEDOUT;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

	} else {

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

	else if (r > 0)

		r = 0;

	}



error:

	dma_fence_put(fence);

	return r;

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

+14 −40
Original line number Diff line number Diff line
@@ -563,30 +563,20 @@ int amdgpu_vcn_dec_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	long r;



	r = amdgpu_vcn_dec_get_create_msg(ring, 1, NULL);

	if (r) {

		DRM_ERROR("amdgpu: failed to get create msg (%ld).\n", r);

	if (r)

		goto error;

	}



	r = amdgpu_vcn_dec_get_destroy_msg(ring, 1, &fence);

	if (r) {

		DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r);

	if (r)

		goto error;

	}



	r = dma_fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out.\n");

	if (r == 0)

		r = -ETIMEDOUT;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

	} else {

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

	else if (r > 0)

		r = 0;

	}



	dma_fence_put(fence);



error:

	return r;

}
@@ -727,27 +717,19 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	long r;



	r = amdgpu_vcn_enc_get_create_msg(ring, 1, NULL);

	if (r) {

		DRM_ERROR("amdgpu: failed to get create msg (%ld).\n", r);

	if (r)

		goto error;

	}



	r = amdgpu_vcn_enc_get_destroy_msg(ring, 1, &fence);

	if (r) {

		DRM_ERROR("amdgpu: failed to get destroy ib (%ld).\n", r);

	if (r)

		goto error;

	}



	r = dma_fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out.\n");

	if (r == 0)

		r = -ETIMEDOUT;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

	} else {

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

	else if (r > 0)

		r = 0;

	}



error:

	dma_fence_put(fence);

	return r;
@@ -832,21 +814,18 @@ int amdgpu_vcn_jpeg_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	long r = 0;



	r = amdgpu_vcn_jpeg_set_reg(ring, 1, &fence);

	if (r) {

		DRM_ERROR("amdgpu: failed to set jpeg register (%ld).\n", r);

	if (r)

		goto error;

	}



	r = dma_fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out.\n");

		r = -ETIMEDOUT;

		goto error;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

		goto error;

	} else

	} else {

		r = 0;

	}



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

		tmp = RREG32(SOC15_REG_OFFSET(UVD, 0, mmUVD_SCRATCH9));
@@ -855,15 +834,10 @@ int amdgpu_vcn_jpeg_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
		DRM_UDELAY(1);

	}



	if (i < adev->usec_timeout)

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

	else {

		DRM_ERROR("ib test failed (0x%08X)\n", tmp);

		r = -EINVAL;

	}

	if (i >= adev->usec_timeout)

		r = -ETIMEDOUT;



	dma_fence_put(fence);



error:

	return r;

}

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

+4 −13
Original line number Diff line number Diff line
@@ -668,20 +668,16 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	long r;



	r = amdgpu_device_wb_get(adev, &index);

	if (r) {

		dev_err(adev->dev, "(%ld) 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);

	memset(&ib, 0, sizeof(ib));

	r = amdgpu_ib_get(adev, NULL, 256, &ib);

	if (r) {

		DRM_ERROR("amdgpu: failed to get ib (%ld).\n", r);

	if (r)

		goto err0;

	}



	ib.ptr[0] = SDMA_PACKET(SDMA_OPCODE_WRITE,

				SDMA_WRITE_SUB_OPCODE_LINEAR, 0);
@@ -696,21 +692,16 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring, long timeout) 


	r = dma_fence_wait_timeout(f, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out\n");

		r = -ETIMEDOUT;

		goto err1;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

		goto err1;

	}

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

	if (tmp == 0xDEADBEEF) {

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

	if (tmp == 0xDEADBEEF)

		r = 0;

	} else {

		DRM_ERROR("amdgpu: ib test failed (0x%08X)\n", tmp);

	else

		r = -EINVAL;

	}



err1:

	amdgpu_ib_free(adev, &ib, NULL);

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

+6 −14
Original line number Diff line number Diff line
@@ -1887,17 +1887,15 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) 
	long r;



	r = amdgpu_gfx_scratch_get(adev, &scratch);

	if (r) {

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

	if (r)

		return r;

	}



	WREG32(scratch, 0xCAFEDEAD);

	memset(&ib, 0, sizeof(ib));

	r = amdgpu_ib_get(adev, NULL, 256, &ib);

	if (r) {

		DRM_ERROR("amdgpu: failed to get ib (%ld).\n", r);

	if (r)

		goto err1;

	}



	ib.ptr[0] = PACKET3(PACKET3_SET_CONFIG_REG, 1);

	ib.ptr[1] = ((scratch - PACKET3_SET_CONFIG_REG_START));

	ib.ptr[2] = 0xDEADBEEF;
@@ -1909,22 +1907,16 @@ static int gfx_v6_0_ring_test_ib(struct amdgpu_ring *ring, long timeout) 


	r = dma_fence_wait_timeout(f, false, timeout);

	if (r == 0) {

		DRM_ERROR("amdgpu: IB test timed out\n");

		r = -ETIMEDOUT;

		goto err2;

	} else if (r < 0) {

		DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);

		goto err2;

	}

	tmp = RREG32(scratch);

	if (tmp == 0xDEADBEEF) {

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

	if (tmp == 0xDEADBEEF)

		r = 0;

	} else {

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

			  scratch, tmp);

	else

		r = -EINVAL;

	}



err2:

	amdgpu_ib_free(adev, &ib, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE