Commit 6b0d8129 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Disable MES LR compute W/A 



A workaround was introduced in commit 1fb71079 ("drm/amdgpu: Enable
MES lr_compute_wa by default") to help with some hangs observed in gfx1151.

This WA didn't fully fix the issue.  It was actually fixed by adjusting
the VGPR size to the correct value that matched the hardware in commit
b42f3bf9 ("drm/amdkfd: bump minimum vgpr size for gfx1151").

There are reports of instability on other products with newer GC microcode
versions, and I believe they're caused by this workaround. As we don't
need the workaround any more, remove it.

Fixes: b42f3bf9 ("drm/amdkfd: bump minimum vgpr size for gfx1151")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 9973e64b)
Cc: stable@vger.kernel.org
parent b57c4ec9

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

+0 −5
Original line number Diff line number Diff line
@@ -720,11 +720,6 @@ static int mes_v11_0_set_hw_resources(struct amdgpu_mes *mes) 
	mes_set_hw_res_pkt.enable_reg_active_poll = 1;

	mes_set_hw_res_pkt.enable_level_process_quantum_check = 1;

	mes_set_hw_res_pkt.oversubscription_timer = 50;

	if ((mes->adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x7f)

		mes_set_hw_res_pkt.enable_lr_compute_wa = 1;

	else

		dev_info_once(mes->adev->dev,

			      "MES FW version must be >= 0x7f to enable LR compute workaround.\n");



	if (amdgpu_mes_log_enable) {

		mes_set_hw_res_pkt.enable_mes_event_int_logging = 1;

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

+0 −5
Original line number Diff line number Diff line
@@ -779,11 +779,6 @@ static int mes_v12_0_set_hw_resources(struct amdgpu_mes *mes, int pipe) 
	mes_set_hw_res_pkt.use_different_vmid_compute = 1;

	mes_set_hw_res_pkt.enable_reg_active_poll = 1;

	mes_set_hw_res_pkt.enable_level_process_quantum_check = 1;

	if ((mes->adev->mes.sched_version & AMDGPU_MES_VERSION_MASK) >= 0x82)

		mes_set_hw_res_pkt.enable_lr_compute_wa = 1;

	else

		dev_info_once(adev->dev,

			      "MES FW version must be >= 0x82 to enable LR compute workaround.\n");



	/*

	 * Keep oversubscribe timer for sdma . When we have unmapped doorbell