Skip to content

Commit 8173cab

Browse files
BNieuwenhuizenalexdeucher
authored andcommitted
drm/amdgpu/gfx10: Disable gfxoff before disabling powergating.
Otherwise we get a full system lock (looks like a FW mess). Copied the order from the GFX9 powergating code. Fixes: 366468f ("drm/amdgpu: Allow GfxOff on Vangogh as default") Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2545 Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com> Cc: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
1 parent d5aa417 commit 8173cab

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8152,8 +8152,14 @@ static int gfx_v10_0_set_powergating_state(void *handle,
81528152
case IP_VERSION(10, 3, 3):
81538153
case IP_VERSION(10, 3, 6):
81548154
case IP_VERSION(10, 3, 7):
8155+
if (!enable)
8156+
amdgpu_gfx_off_ctrl(adev, false);
8157+
81558158
gfx_v10_cntl_pg(adev, enable);
8156-
amdgpu_gfx_off_ctrl(adev, enable);
8159+
8160+
if (enable)
8161+
amdgpu_gfx_off_ctrl(adev, true);
8162+
81578163
break;
81588164
default:
81598165
break;

0 commit comments

Comments
 (0)