From: Alex Deucher <alexander.deucher@xxxxxxx> 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@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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 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; Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are queue-6.11/drm-radeon-evergreen_cs-fix-int-overflow-errors-in-c.patch queue-6.11/drm-amdgpu-fix-selfring-initialization-sequence-on-soc24.patch queue-6.11/drm-amdgpu-display-fix-a-mistake-in-revert-commit.patch queue-6.11/drm-amdgpu-fix-pte-copy-corruption-for-sdma-7.patch queue-6.11/drm-amd-display-skip-recompute-dsc-params-if-no-stream-on-link.patch queue-6.11/drm-amd-display-add-hdmi-dsc-native-ycbcr422-support.patch queue-6.11/drm-amdkfd-add-sdma-queue-quantum-support-for-gfx12.patch queue-6.11/drm-amd-display-improve-fam-control-for-dcn401.patch queue-6.11/drm-amdgpu-mes12-set-enable_level_process_quantum_check.patch queue-6.11/drm-amd-display-reset-vrr-config-during-resume.patch queue-6.11/drm-amd-display-add-dsc-debug-log.patch queue-6.11/drm-amd-pm-update-workload-mask-after-the-setting.patch queue-6.11/drm-amd-display-fix-synaptics-cascaded-panamera-dsc-determination.patch queue-6.11/drm-amdgpu-fix-invalid-fence-handling-in-amdgpu_vm_t.patch queue-6.11/drm-amd-display-check-link_res-hpo_dp_link_enc-befor.patch queue-6.11/drm-amd-display-free-bo-used-for-dmub-bounding-box.patch queue-6.11/drm-radeon-properly-handle-vbios-fake-edid-sizing.patch queue-6.11/drm-amd-amdgpu-properly-tune-the-size-of-struct.patch queue-6.11/drm-amdgpu-properly-handle-vbios-fake-edid-sizing.patch queue-6.11/drm-amdgpu-vcn-enable-av1-on-both-instances.patch queue-6.11/drm-amdgpu-update-golden-regs-for-gfx12.patch queue-6.11/drm-amdgpu-mes11-reduce-timeout.patch queue-6.11/drm-amdgpu-bump-driver-version-for-cleared-vram.patch queue-6.11/drm-amd-display-check-link_res-hpo_dp_link_enc-before-using-it.patch queue-6.11/drm-amdgpu-mes12-switch-set_shader_debugger-pkt-to-mes-schq-pipe.patch queue-6.11/drm-amdgpu-mes12-reduce-timeout.patch queue-6.11/drm-amd-display-add-null-check-for-set_output_gamma-.patch
