summary refs log tree commit diff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorGuilherme G. Piccoli <gpiccoli@igalia.com>2023-05-09 18:49:47 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-24 17:32:51 +0100
commit4e2f9159f9420ff481dc6ae00969d9406aa85e6f (patch)
tree6044a3148b8e97a2cbdffaffeb6dd04e5d09d7d4 /drivers/gpu
parentabfe2ffc004a0e6d23573b52826adf3dafdd9e02 (diff)
downloadlinux-4e2f9159f9420ff481dc6ae00969d9406aa85e6f.tar.gz
drm/amdgpu/gfx11: Adjust gfxoff before powergating on gfx11 as well
commit 11fbdda2ab6bf049e2869139c07016022b4e045b upstream.

(Bas: speculative change to mirror gfx10/gfx9)

Signed-off-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
index 0dd2fe4f071e..9f0ec7bf68e1 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
@@ -5085,8 +5085,14 @@ static int gfx_v11_0_set_powergating_state(void *handle,
 		break;
 	case IP_VERSION(11, 0, 1):
 	case IP_VERSION(11, 0, 4):
+		if (!enable)
+			amdgpu_gfx_off_ctrl(adev, false);
+
 		gfx_v11_cntl_pg(adev, enable);
-		amdgpu_gfx_off_ctrl(adev, enable);
+
+		if (enable)
+			amdgpu_gfx_off_ctrl(adev, true);
+
 		break;
 	default:
 		break;