drm/amdgpu/mes11: reduce timeout

commit 856265caa94a3c78feaa23ec1acd799fe1989201 upstream.

The firmware timeout is 2s.  Reduce the driver timeout to
2.1 seconds to avoid back pressure on queue submissions.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3627
Fixes: f7c161a4c250 ("drm/amdgpu: increase mes submission timeout")
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index 8aded0a67037b40ba143f2eaf89560cdecb6e8ef..18a0b0441457a9af554845f2457e2fb39d665629 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -160,7 +160,7 @@ static int mes_v11_0_submit_pkt_and_poll_completion(struct amdgpu_mes *mes,
                                                    int api_status_off)
 {
        union MESAPI__QUERY_MES_STATUS mes_status_pkt;
-       signed long timeout = 3000000; /* 3000 ms */
+       signed long timeout = 2100000; /* 2100 ms */
        struct amdgpu_device *adev = mes->adev;
        struct amdgpu_ring *ring = &mes->ring[0];
        struct MES_API_STATUS *api_status;