Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drm/amdgpu: add a fence timeout for the IB tests v2 



10ms should be enough for now.

v2: fix some typos in CIK code

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChunming Zhou <david1.zhou@amd.com>
Reviewed-by: default avatarEdward O'Callaghan <funfunctor@folklore1984.net>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8de190c9

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ struct amdgpu_ring_funcs { 
				uint32_t oa_base, uint32_t oa_size);

	/* testing functions */

	int (*test_ring)(struct amdgpu_ring *ring);

	int (*test_ib)(struct amdgpu_ring *ring);

	int (*test_ib)(struct amdgpu_ring *ring, long timeout);

	/* insert NOP packets */

	void (*insert_nop)(struct amdgpu_ring *ring, uint32_t count);

	/* pad the indirect buffer to the necessary number of dw */
@@ -2245,7 +2245,7 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))

#define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib)))

#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))

#define amdgpu_ring_test_ib(r) (r)->funcs->test_ib((r))

#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))

#define amdgpu_ring_get_rptr(r) (r)->funcs->get_rptr((r))

#define amdgpu_ring_get_wptr(r) (r)->funcs->get_wptr((r))

#define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))

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

+3 −1
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include "amdgpu.h"

#include "atom.h"



#define AMDGPU_IB_TEST_TIMEOUT	msecs_to_jiffies(10)



/*

 * IB

 * IBs (Indirect Buffers) and areas of GPU accessible memory where
@@ -286,7 +288,7 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
		if (!ring || !ring->ready)

			continue;



		r = amdgpu_ring_test_ib(ring);

		r = amdgpu_ring_test_ib(ring, AMDGPU_IB_TEST_TIMEOUT);

		if (r) {

			ring->ready = false;

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

+15 −10
Original line number Diff line number Diff line
@@ -1135,29 +1135,34 @@ void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring) 
 *

 * Test if we can successfully execute an IB

 */

int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring)

int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout)

{

	struct fence *fence = NULL;

	int r;

	struct fence *fence;

	long r;



	r = amdgpu_uvd_get_create_msg(ring, 1, NULL);

	if (r) {

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

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

		goto error;

	}



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

	if (r) {

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

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

		goto error;

	}



	r = fence_wait(fence, false);

	if (r) {

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

		goto error;

	}

	r = fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

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

		r = -ETIMEDOUT;

	} else if (r < 0) {

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

	} else {

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

		r = 0;

	}



error:

	fence_put(fence);

	return r;

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

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ void amdgpu_uvd_free_handles(struct amdgpu_device *adev, 
int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx);

void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring);

void amdgpu_uvd_ring_end_use(struct amdgpu_ring *ring);

int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring);

int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout);



#endif

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

+11 −7
Original line number Diff line number Diff line
@@ -844,10 +844,10 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring) 
 * @ring: the engine to test on

 *

 */

int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring)

int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)

{

	struct fence *fence = NULL;

	int r;

	long r;



	/* skip vce ring1 ib test for now, since it's not reliable */

	if (ring == &ring->adev->vce.ring[1])
@@ -855,21 +855,25 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring) 


	r = amdgpu_vce_get_create_msg(ring, 1, NULL);

	if (r) {

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

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

		goto error;

	}



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

	if (r) {

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

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

		goto error;

	}



	r = fence_wait(fence, false);

	if (r) {

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

	r = fence_wait_timeout(fence, false, timeout);

	if (r == 0) {

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

		r = -ETIMEDOUT;

	} else if (r < 0) {

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

	} else {

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

		r = 0;

	}

error:

	fence_put(fence);