From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Oct 2022 11:38:21 +0000 (+0200)
Subject: 5.15-stable patches
X-Git-Tag: v5.4.219~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eda6c01d5a8480c6fa4da04dbf5acd6a29d1bd2c;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch
---

diff --git a/queue-5.15/drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch b/queue-5.15/drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch
new file mode 100644
index 00000000000..f5d42511132
--- /dev/null
+++ b/queue-5.15/drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch
@@ -0,0 +1,49 @@
+From 2130b87b2273389cafe6765bf09ef564cda01407 Mon Sep 17 00:00:00 2001
+From: Nathan Chancellor <nathan@kernel.org>
+Date: Fri, 14 Oct 2022 08:21:03 -0700
+Subject: drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Nathan Chancellor <nathan@kernel.org>
+
+commit 2130b87b2273389cafe6765bf09ef564cda01407 upstream.
+
+After commit 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr
+transition"), a build with CONFIG_DEBUG_FS=n is broken due to a
+misplaced brace, along the lines of:
+
+  In file included from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_trace.h:39,
+                   from drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:41:
+  drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c: At top level:
+  ./include/drm/drm_atomic.h:864:9: error: expected identifier or ‘(’ before ‘for’
+    864 |         for ((__i) = 0;                                                 \
+        |         ^~~
+  drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:8317:9: note: in expansion of macro ‘for_each_new_crtc_in_state’
+   8317 |         for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)
+        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Move the brace within the #ifdef so that the file can be built with or
+without CONFIG_DEBUG_FS.
+
+Fixes: 8799c0be89eb ("drm/amd/display: Fix vblank refcount in vrr transition")
+Signed-off-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+@@ -9679,8 +9679,8 @@ static void amdgpu_dm_atomic_commit_tail
+ 					crtc, dm_new_crtc_state, cur_crc_src))
+ 					DRM_DEBUG_DRIVER("Failed to configure crc source");
+ 			}
+-#endif
+ 		}
++#endif
+ 	}
+ 
+ 	for_each_new_crtc_in_state(state, crtc, new_crtc_state, j)
diff --git a/queue-5.15/series b/queue-5.15/series
index 601f17d9a0e..ee7bb326172 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -622,3 +622,4 @@ blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
 net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
 revert-net-ieee802154-reject-zero-sized-raw_sendmsg.patch
 net-ieee802154-don-t-warn-zero-sized-raw_sendmsg.patch
+drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch