Hi
Am 22.10.26 um 19:55 schrieb Sasha Levin:
Commit 08abfa5a161e ("drivers: Replace __MODULE_STRING() with
__stringify()") converted the drm_fbdev_overalloc parameter description
in drm_fb_helper.c ahead of the removal of __MODULE_STRING().
Commit 6b5a66fd9f21 ("drm/fbdev: Move fbdev module parameters next to
module init") moved that parameter into drm_kms_helper_common.c while it
still used __MODULE_STRING(), so the conversion never reached the moved
code. drm_kms_helper_common.c is now the last user of the macro, and
removing the macro breaks the build with CONFIG_DRM_FBDEV_EMULATION=y:
drivers/gpu/drm/drm_kms_helper_common.c:46:18: error: expected ')' before
'__MODULE_STRING'
Use __stringify() instead. The parameter description is unchanged.
Signed-off-by: Sasha Levin <[email protected]>
Reviewed-by: Thomas Zimmermann <[email protected]>
---
This depends on 6b5a66fd9f21 in drm-next and 08abfa5a161e in
modules-next, both queued for 7.4. Petr plans to remove
__MODULE_STRING() once his conversions are in mainline, so this needs to
land first, either through drm-misc after 7.4-rc1 or together with the
removal patch.
Dave, could we put this patch directly into drm-next? It seems like this
fixes a broken merge commit.
Best regards
Thomas
Build-tested on next-20261022 (x86_64, gcc) with __MODULE_STRING()
removed from module.h. The parameter description in modinfo is
unchanged.
drivers/gpu/drm/drm_kms_helper_common.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_kms_helper_common.c
b/drivers/gpu/drm/drm_kms_helper_common.c
index 1e55ecac46989..346f6c4c0b234 100644
--- a/drivers/gpu/drm/drm_kms_helper_common.c
+++ b/drivers/gpu/drm/drm_kms_helper_common.c
@@ -28,6 +28,7 @@
#include <linux/export.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
+#include <linux/stringify.h>
#include "drm_crtc_helper_internal.h"
#include "drm_panic_internal.h"
@@ -43,7 +44,7 @@ EXPORT_SYMBOL(drm_fbdev_overalloc);
module_param(drm_fbdev_overalloc, int, 0444);
MODULE_PARM_DESC(drm_fbdev_overalloc,
"Overallocation of the fbdev buffer (%) [default="
- __MODULE_STRING(CONFIG_DRM_FBDEV_OVERALLOC) "]");
+ __stringify(CONFIG_DRM_FBDEV_OVERALLOC) "]");
/*
* In order to keep user-space compatibility, we want in certain use-cases
--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Stefan Gaiser, Jochen Jaser, Abhinav Puri, (HRB 36809, AG Nürnberg)
