--- 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

@@ -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)