From patchwork Thu Sep 29 16:31:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12994437 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F2B4C433F5 for ; Thu, 29 Sep 2022 16:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UUasCuFc0SylXTBtUYokmqCVpv0MSzIOCEk41ZK3ITA=; b=I6XDAuPxnTlpeR 67PHpIb3rMnIS5WLEQlTjTvuABCjiYjpnuaZT1tEDIwUA0wpAw+WBL/jxklrcCV1swmN3UGRQ7vVl gqrUzCGzTXYewREPXyUBiJJLXBwmR+iB7HcO5/4EcdGuFDX02Iz55jMfil49qsQi9gaw/H2s+wNLA IBckm2fmk7cVFJBwNPyG2uFyBhBD9c81ZZxjf+72fifM8C12zHkUTUPOkGWhacT5mPjdr0JCNGXad Yt5iC5g9yPd23fZVxG9m85d+z61P0U+Qgyd/yMmCyel5xSVqJp6aB7TwsFrGLEBja2uHJC5Y4GL/i U1urC8CsyFhJJ+5LeaQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1odwb5-004Gbk-Il; Thu, 29 Sep 2022 16:41:17 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1odwRo-004Byi-Qa for linux-arm-kernel@lists.infradead.org; Thu, 29 Sep 2022 16:31:42 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 2D57F580801; Thu, 29 Sep 2022 12:31:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 29 Sep 2022 12:31:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1664469100; x= 1664476300; bh=1I5s/1zpCjSGpoFmO3Rk6tuMvkKjJTg9c9dj+mVtszw=; b=D TN9qyudxRjVdDCM2ip7Ln4OzbPyKtbq9MmHWpKYh89Kk8jTPj6NlfyTvoayROdY2 uFNwX4Lomh8xELTYqggB6mZV6IRR28zhHnDkPRO4wCW2aZWRg3yduMtiw36+9MAI 3RCBwoHubSlkvmF0vAdB8V1tEpz20zqEJ+vqxnyMfck72iJeXDZvW1khtzBs7mJP BreRrreuPyP36lv9hShYofKI8fl24FyGG7bOpd1gxBBMfePzusywCD8e8bcuWLLv tmKn7MYNiza9RlnzxWzec6hfvapq+5Co+U/++Gb94QUx7T9yyqtLSQ205dAmiIaY bY7UR0WF584+GT6lHcrJA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1664469100; x= 1664476300; bh=1I5s/1zpCjSGpoFmO3Rk6tuMvkKjJTg9c9dj+mVtszw=; b=s OIQFu7l13VybJ+x9sj4W2J8R01cSZjaGISCoXltQUhzd/lWRG2cDNHoBt/bBX50q Ay40RTGdjA2ozz33UHgiLI1O39PcgrujhVO+TT38Wg60D5iL13p+jOVD+arORkVI U1WfRDZk6p760GxoYKM275mIHQYMH86hGW/gLnieJ6Ymc8IrtBcRNTC8METNn4pN OLh07kskesE1UdDTus8rSlv9qGwbK/hooABQLzMQ4RL+LoJzQVCJOiavpUJIyhpM BsgvAPsavyxDTjq/+hvcdhMwjyANp07N+T5v5OvUCMoSZ/AALPv/YI1lVPKE8xkO D9zwTWnyFuR1aqzQHEJ+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeehtddguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeduudduhfevjeetfeegvdffvdevvdejudegudekjeehtdelhfffveet hfejledtveenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Sep 2022 12:31:38 -0400 (EDT) From: Maxime Ripard Date: Thu, 29 Sep 2022 18:31:07 +0200 Subject: [PATCH v4 13/30] drm/modes: parse_cmdline: Add support for named modes containing dashes MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v4-13-60d38873f782@cerno.tech> References: <20220728-rpi-analog-tv-properties-v4-0-60d38873f782@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v4-0-60d38873f782@cerno.tech> To: Jernej Skrabec , Chen-Yu Tsai , Karol Herbst , Samuel Holland , Lyude Paul , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Emma Anholt , Joonas Lahtinen , Ben Skeggs , David Airlie , Rodrigo Vivi , Tvrtko Ursulin , Maarten Lankhorst , Maxime Ripard Cc: =?unknown-8bit?q?linux-arm-kernel=40lists=2Einfradead=2Eorg=2C_Maxime_Ri?= =?unknown-8bit?q?pard_=3Cmaxime=40cerno=2Etech=3E=2C_dri-devel=40lists=2Efr?= =?unknown-8bit?q?eedesktop=2Eorg=2C?= =?unknown-8bit?q?_Geert_Uytterhoeven_=3Cgeert=40linux-m68k=2Eorg=3E=2C_intel?= =?unknown-8bit?q?-gfx=40lists=2Efreedesktop=2Eorg=2C_linux-sunxi=40lists=2E?= =?unknown-8bit?q?linux=2Edev=2C?= =?unknown-8bit?q?_Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_nouveau=40l?= =?unknown-8bit?q?ists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes_=3Cnoralf?= =?unknown-8bit?q?=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom?= =?unknown-8bit?q?=3E=2C?= =?unknown-8bit?q?_linux-kernel=40vger=2Ekernel=2Eorg=2C_Dom_Cobley_=3Cdom=40?= =?unknown-8bit?q?raspberrypi=2Ecom=3E=2C_Phil_Elwell_=3Cphil=40raspberrypi?= =?unknown-8bit?q?=2Ecom=3E?= X-Mailer: b4 0.11.0-dev-7da52 X-Developer-Signature: v=1; a=openpgp-sha256; l=1145; i=maxime@cerno.tech; h=from:subject:message-id; bh=JqGOlPvL+KASIYkApYp15NnwUkb64P4yDvkjl3bgitE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmmJ9wvnIsVdrOc9bHjlvXjRJboCxz3DPo6zqY+cOsJFrVX Pvuwo5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABPpW8PI0DH30XneVRzNrDNYf/z4Oq W0cr2jJC9LqoXBq7mRTRZ8jUAVl39p8bYu15HvEH1S3GMjHh1bIvr8g03qqacbi2XnCTICAA== X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220929_093140_996230_C4DD7D40 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Geert Uytterhoeven 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 Reviewed-by: Hans de Goede Signed-off-by: Maxime Ripard --- 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 99809ea09ce3..c0dceff51cac 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2284,6 +2284,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;