Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp786831imw; Fri, 8 Jul 2022 11:41:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vWxe3I+Z563fpgaEj3JU1PGCCanFiVjIUgtNdQLQ+26fNPoV4IV33/84EhkZ7sCDXNEgVF X-Received: by 2002:a17:903:24e:b0:16b:a02d:41fc with SMTP id j14-20020a170903024e00b0016ba02d41fcmr5240959plh.121.1657305710256; Fri, 08 Jul 2022 11:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657305710; cv=none; d=google.com; s=arc-20160816; b=EonEXj9pZJ8ACK8NAB21SMXhNksGYlL8/gj4voTNC/tZuAs71LmeFh3VnfRNaKtoAR 8rSV16vFLVeHwNxuTgdM7d28G34lT+sBfsdoNDyqLfrh0e62JESLlA31YJH6tuZfRtgO dX3Cr2EDe0a09m6sKR/57OsIA09OQA6UcX5/DzHuz2hwmy5/hl4jL72YF1FxSHo4A5hW PUk1txhJTFt2M3QmjFsDdwWlfGqDjBsEMnnuXHrw6vq0nd05VHqHQ0sh0XauQ4CBhJGB lJQYLKvV/iA8/Zznn4HKpES04DIlxs+t3NZQvu7gAlMq1FgOmDlF8RxtveGvvo5XSXiD x9Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Acj24E3JnPIHpGG9E85Xw+mNuGXYglhzcEFlgFt0U+g=; b=b7LvW5j2X49s7SXVTuGP18YsGP9RjvPq7abq2Z6gMFqkKx61uzdtSeNdtox1IlNpqS r4bkI3Fpu+1/pu+6cTts//f/JgyG/9VQpOUIfxRl/vK66PiueIVD2Wh/otWOeIEvYm2I VtnH6e8nVYIzrBETz2b3sfO8OpxPKFBuJynn4Q/VGLOlMggTSltxBBH1fDH8lSijhZ5v +jsE7vL++8mPSVfIv6vIkqOM2Wmtw+yakP2MeM/1E8fmo7kT/Yl6whlgdB8XWNtFiI9p KSZACnlXzNl2L+5wz+9D9BcjbIsLOxyKOLfoFhglZRn5C8DSeuujt4/SVcbxSd5rrTxK 4xdQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bx21-20020a056a00429500b005289628be08si14354767pfb.336.2022.07.08.11.41.38; Fri, 08 Jul 2022 11:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239535AbiGHSW6 (ORCPT + 99 others); Fri, 8 Jul 2022 14:22:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238719AbiGHSVu (ORCPT ); Fri, 8 Jul 2022 14:21:50 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A095683F2D for ; Fri, 8 Jul 2022 11:21:40 -0700 (PDT) Received: from ramsan.of.borg ([84.195.186.194]) by michel.telenet-ops.be with bizsmtp id siMf2700o4C55Sk06iMfjY; Fri, 08 Jul 2022 20:21:40 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1o9sbg-002fKq-Tg; Fri, 08 Jul 2022 20:21:36 +0200 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1o9sbg-00BtQ5-AW; Fri, 08 Jul 2022 20:21:36 +0200 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Hans de Goede Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 5/5] drm/modes: parse_cmdline: Add support for named modes containing dashes Date: Fri, 8 Jul 2022 20:21:29 +0200 Message-Id: <4788a9c346d6b650964402e0e26c33e739f02c7c.1657301107.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/gpu/drm/drm_modes.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 7a00eb6df502e991..52e852518c6ad8e9 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1828,6 +1828,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 = strchr(name, '-'); + while (bpp_ptr && !isdigit(bpp_ptr[1])) + bpp_ptr = strchr(bpp_ptr + 1, '-'); if (bpp_ptr) bpp_off = bpp_ptr - name; -- 2.25.1