[PATCH 1/2] drm/amdgpu/mes11: reduce timeout

[PATCH 1/2] drm/amdgpu/mes11: reduce timeout

[Alex Deucher]

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

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/3627
Fixes: f7c161a4c250 ("drm/amdgpu: increase mes submission timeout")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
index 3c923719e32d3..e2b3f859a1c05 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
@@ -161,7 +161,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;
-- 
2.46.0

[PATCH 2/2] drm/amdgpu/mes12: reduce timeout

[Alex Deucher]

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

Fixes: 94b51a3d01ed ("drm/amdgpu/mes12: increase mes submission timeout")
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
index ef05a41162306..186f778133974 100644
--- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
@@ -146,7 +146,7 @@ static int mes_v12_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[pipe];
 	spinlock_t *ring_lock = &mes->ring_lock[pipe];
-- 
2.46.0

Re: [PATCH 1/2] drm/amdgpu/mes11: reduce timeout

[Christian König]

Am 18.09.24 um 15:39 schrieb Alex Deucher:
> The firmware timeout is 2s.  Reduce the driver timeout to
> 2.1 seconds to avoid back pressure on queue submissions.
>
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/3627
> Fixes: f7c161a4c250 ("drm/amdgpu: increase mes submission timeout")
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Acked-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> index 3c923719e32d3..e2b3f859a1c05 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
> @@ -161,7 +161,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;

Re: [PATCH 2/2] drm/amdgpu/mes12: reduce timeout

[Christian König]

Am 18.09.24 um 15:39 schrieb Alex Deucher:
> The firmware timeout is 2s.  Reduce the driver timeout to
> 2.1 seconds to avoid back pressure on queue submissions.
>
> Fixes: 94b51a3d01ed ("drm/amdgpu/mes12: increase mes submission timeout")
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

We should probably move that to a higher level.

Acked-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> index ef05a41162306..186f778133974 100644
> --- a/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/mes_v12_0.c
> @@ -146,7 +146,7 @@ static int mes_v12_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[pipe];
>   	spinlock_t *ring_lock = &mes->ring_lock[pipe];