From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Jan 2023 07:40:13 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.10.166~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e011afdb351f015fe43a96843350817f2c8cf07b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	drm-amdgpu-complete-gfxoff-allow-signal-during-suspend-without-delay.patch
---

diff --git a/queue-5.15/drm-amdgpu-complete-gfxoff-allow-signal-during-suspend-without-delay.patch b/queue-5.15/drm-amdgpu-complete-gfxoff-allow-signal-during-suspend-without-delay.patch
new file mode 100644
index 00000000000..88780e4532c
--- /dev/null
+++ b/queue-5.15/drm-amdgpu-complete-gfxoff-allow-signal-during-suspend-without-delay.patch
@@ -0,0 +1,42 @@
+From 4b31b92b143f7d209f3d494c56d4c4673e9fc53d Mon Sep 17 00:00:00 2001
+From: Harsh Jain <harsh.jain@amd.com>
+Date: Wed, 2 Nov 2022 15:23:08 +0530
+Subject: drm/amdgpu: complete gfxoff allow signal during suspend without delay
+
+From: Harsh Jain <harsh.jain@amd.com>
+
+commit 4b31b92b143f7d209f3d494c56d4c4673e9fc53d upstream.
+
+change guarantees that gfxoff is allowed before moving further in
+s2idle sequence to add more reliablity about gfxoff in amdgpu IP's
+suspend flow
+
+Signed-off-by: Harsh Jain <harsh.jain@amd.com>
+Reviewed-by: Evan Quan <evan.quan@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: "Limonciello, Mario" <Mario.Limonciello@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+@@ -580,10 +580,14 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_d
+ 		if (adev->gfx.gfx_off_req_count == 0 &&
+ 		    !adev->gfx.gfx_off_state) {
+ 			/* If going to s2idle, no need to wait */
+-			if (adev->in_s0ix)
+-				delay = GFX_OFF_NO_DELAY;
+-			schedule_delayed_work(&adev->gfx.gfx_off_delay_work,
++			if (adev->in_s0ix) {
++				if (!amdgpu_dpm_set_powergating_by_smu(adev,
++						AMD_IP_BLOCK_TYPE_GFX, true))
++					adev->gfx.gfx_off_state = true;
++			} else {
++				schedule_delayed_work(&adev->gfx.gfx_off_delay_work,
+ 					      delay);
++			}
+ 		}
+ 	} else {
+ 		if (adev->gfx.gfx_off_req_count == 0) {
diff --git a/queue-5.15/series b/queue-5.15/series
index cff24bf44ff..21f540d2b37 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -143,3 +143,4 @@ panic-expose-warn_count-to-sysfs.patch
 docs-fix-path-paste-o-for-sys-kernel-warn_count.patch
 exit-use-read_once-for-all-oops-warn-limit-reads.patch
 bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
+drm-amdgpu-complete-gfxoff-allow-signal-during-suspend-without-delay.patch