drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n
Subsystems (3)
PATCH 1/1 drm/amd/display: Fix build breakage with CONFIG_DEBUG_FS=n
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.
---
I have sent this to Linus in case he wants to take this directly since this is a pretty obvious fix, as opposed to going through the regular channels.
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
@@ -8310,8 +8310,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 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)
base-commit: 9c9155a3509a2ebdb06d77c7a621e9685c802eac
Signature · 1 line
2.38.0
Linus Torvalds
AppliedQuoted 4 lines · Nathan Chancellor
After commit
8799c0be89eb("drm/amd/display: Fix vblank refcount in vrr transition"), a build withCONFIG_DEBUG_FS=nis broken due to a misplaced brace, along the lines of:
Thanks, applied.
Linus