drm/modes: parse_cmdline: Add support for named modes containing dashes

It is fairly common for named video modes to contain dashes (e.g.
"tt-mid" on Atari, "dblntsc-ff" on Amiga).  Currently such mode names
are not recognized, as the dash is considered to be a separator between
mode name and bpp.

Fix this by skipping any dashes that are not followed immediately by a
digit when looking for the separator.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220728-rpi-analog-tv-properties-v4-13-60d38873f782@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index e022118..5d4ac79 100644 (file)
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1810,6 +1810,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
 
        /* Try to locate the bpp and refresh specifiers, if any */
        bpp_ptr = strnchr(name, options_off, '-');
+       while (bpp_ptr && !isdigit(bpp_ptr[1]))
+               bpp_ptr = strnchr(bpp_ptr + 1, options_off, '-');
        if (bpp_ptr)
                bpp_off = bpp_ptr - name;