Commit 8173cab3 authored by Bas Nieuwenhuizen's avatar Bas Nieuwenhuizen Committed by Alex Deucher
Browse files

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: 366468ff ("drm/amdgpu: Allow GfxOff on Vangogh as default")
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2545


Signed-off-by: default avatarBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: default avatarGuilherme G. Piccoli <gpiccoli@igalia.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent d5aa4178

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

+7 −1
Original line number Diff line number Diff line
@@ -8152,8 +8152,14 @@ static int gfx_v10_0_set_powergating_state(void *handle, 
	case IP_VERSION(10, 3, 3):

	case IP_VERSION(10, 3, 6):

	case IP_VERSION(10, 3, 7):

		if (!enable)

			amdgpu_gfx_off_ctrl(adev, false);



		gfx_v10_cntl_pg(adev, enable);

		amdgpu_gfx_off_ctrl(adev, enable);



		if (enable)

			amdgpu_gfx_off_ctrl(adev, true);



		break;

	default:

		break;