Skip to contentSkip to conversation

drm/selftests: reduce stack usage

PATCH Applied Arnd Bergmann 2 participants 2 messages Jun 28, 2019 – Jul 1, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/selftests: reduce stack usage

Putting a large drm_connector object on the stack can lead to warnings in some configuration, such as:

drivers/gpu/drm/selftests/test-drm_cmdline_parser.c:18:12: error: stack frame size of 1040 bytes in function 'drm_cmdline_test_res' [-Werror,-Wframe-larger-than=] static int drm_cmdline_test_res(void *ignored)

Since the object is never modified, just declare it as 'static const' and allow this to be passed down.

Fixes b7ced38916a9 ("drm/selftests: Add command line parser selftests")
---
 drivers/gpu/drm/drm_modes.c                   |   8 +-
 .../drm/selftests/test-drm_cmdline_parser.c   | 136 +++++++-----------
 include/drm/drm_modes.h                       |   2 +-
 3 files changed, 53 insertions(+), 93 deletions(-)
drivers/gpu/drm/drm_modes.c +4 -4
index 57e6408288c8..910561d4f071 100644
@@ -1448,7 +1448,7 @@ static int drm_mode_parse_cmdline_refresh(const char *str, char **end_ptr,
 }
 
 static int drm_mode_parse_cmdline_extra(const char *str, int length,
-					struct drm_connector *connector,
+					const struct drm_connector *connector,
 					struct drm_cmdline_mode *mode)
 {
 	int i;
@@ -1493,7 +1493,7 @@ static int drm_mode_parse_cmdline_extra(const char *str, int length,
 
 static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length,
 					   bool extras,
-					   struct drm_connector *connector,
+					   const struct drm_connector *connector,
 					   struct drm_cmdline_mode *mode)
 {
 	const char *str_start = str;
@@ -1555,7 +1555,7 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length,
 }
 
 static int drm_mode_parse_cmdline_options(char *str, size_t len,
-					  struct drm_connector *connector,
+					  const struct drm_connector *connector,
 					  struct drm_cmdline_mode *mode)
 {
 	unsigned int rotation = 0;
@@ -1689,7 +1689,7 @@ static int drm_mode_parse_cmdline_options(char *str, size_t len,
  * True if a valid modeline has been parsed, false otherwise.
  */
 bool drm_mode_parse_command_line_for_connector(const char *mode_option,
-					       struct drm_connector *connector,
+					       const struct drm_connector *connector,
 					       struct drm_cmdline_mode *mode)
 {
 	const char *name;
drivers/gpu/drm/selftests/test-drm_cmdline_parser.c +48 -88

533 lines not on this page · raw message

include/drm/drm_modes.h +1 -1
index 083f16747369..e946e20c61d8 100644
@@ -537,7 +537,7 @@ void drm_connector_list_update(struct drm_connector *connector);
 /* parsing cmdline modes */
 bool
 drm_mode_parse_command_line_for_connector(const char *mode_option,
-					  struct drm_connector *connector,
+					  const struct drm_connector *connector,
 					  struct drm_cmdline_mode *mode);
 struct drm_display_mode *
 drm_mode_create_from_cmdline_mode(struct drm_device *dev,
Signature · 1 line
2.20.0
#1 lore raw
Quoted 11 lines · Arnd Bergmann

Putting a large drm_connector object on the stack can lead to warnings in some configuration, such as:

drivers/gpu/drm/selftests/test-drm_cmdline_parser.c:18:12: error: stack frame size of 1040 bytes in function 'drm_cmdline_test_res' [-Werror,-Wframe-larger-than=] static int drm_cmdline_test_res(void *ignored)

Since the object is never modified, just declare it as 'static const' and allow this to be passed down.

Fixes b7ced38916a9 ("drm/selftests: Add command line parser selftests")

Applied, thanks!
Maxime

--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel