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

Commit 687c1c2e authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amdgpu: drop compute ring timeout setting for non-sriov only (v2) 



Sriov still wants these error messags on timeout. So, for sriov
use case, the timeout setting on compute rings is kept.

-v2: clean the code

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1af27e34

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

+9 −3
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ int amdgpu_fence_driver_start_ring(struct amdgpu_ring *ring, 
int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,

				  unsigned num_hw_submission)

{

	long timeout;

	int r;



	/* Check that num_hw_submission is a power of two */
@@ -433,11 +434,16 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, 


	/* No need to setup the GPU scheduler for KIQ ring */

	if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) {

		/* for non-sriov case, no timeout enforce on compute ring */

		if ((ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE)

				&& !amdgpu_sriov_vf(ring->adev))

			timeout = MAX_SCHEDULE_TIMEOUT;

		else

			timeout = msecs_to_jiffies(amdgpu_lockup_timeout);



		r = drm_sched_init(&ring->sched, &amdgpu_sched_ops,

				   num_hw_submission, amdgpu_job_hang_limit,

				   (ring->funcs->type == AMDGPU_RING_TYPE_COMPUTE) ?

				   MAX_SCHEDULE_TIMEOUT : msecs_to_jiffies(amdgpu_lockup_timeout),

				   ring->name);

				   timeout, ring->name);

		if (r) {

			DRM_ERROR("Failed to create scheduler on ring %s.\n",

				  ring->name);