[PATCH v1 09/35] drm/modes: Move named modes parsing to a separate function

[Maxime Ripard]

The current construction of the named mode parsing doesn't allow to extend
it easily. Let's move it to a separate function so we can add more
parameters and modes.

Signed-off-by: Maxime Ripard <max...@cerno.tech>

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 06a006e0b2e3..e85099df0326 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1773,6 +1773,28 @@ static const char * const drm_named_modes_whitelist[] = {
        "PAL",
 };
 
+static bool drm_mode_parse_cmdline_named_mode(const char *name,
+                                             unsigned int name_end,
+                                             struct drm_cmdline_mode 
*cmdline_mode)
+{
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) {
+               int ret;
+
+               ret = str_has_prefix(name, drm_named_modes_whitelist[i]);
+               if (ret != name_end)
+                       continue;
+
+               strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]);
+               cmdline_mode->specified = true;
+
+               return true;
+       }
+
+       return false;
+}
+
 /**
  * drm_mode_parse_command_line_for_connector - parse command line modeline for 
connector
  * @mode_option: optional per connector mode option
@@ -1809,7 +1831,7 @@ bool drm_mode_parse_command_line_for_connector(const char 
*mode_option,
        const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
        const char *options_ptr = NULL;
        char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
-       int i, len, ret;
+       int len, ret;
 
        memset(mode, 0, sizeof(*mode));
        mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
@@ -1848,18 +1870,14 @@ bool drm_mode_parse_command_line_for_connector(const 
char *mode_option,
                parse_extras = true;
        }
 
-       /* First check for a named mode */
-       for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) {
-               ret = str_has_prefix(name, drm_named_modes_whitelist[i]);
-               if (ret == mode_end) {
-                       if (refresh_ptr)
-                               return false; /* named + refresh is invalid */
+       /*
+        * Having a mode that starts by a letter (and thus is named) and
+        * an at-sign (used to specify a refresh rate) is disallowed.
+        */
+       if (!isdigit(name[0]) && refresh_ptr)
+               return false;
 
-                       strcpy(mode->name, drm_named_modes_whitelist[i]);
-                       mode->specified = true;
-                       break;
-               }
-       }
+       drm_mode_parse_cmdline_named_mode(name, mode_end, mode);
 
        /* No named mode? Check for a normal mode argument, e.g. 1024x768 */
        if (!mode->specified && isdigit(name[0])) {

-- 
b4 0.10.0-dev-49460