From patchwork Thu Sep 22 14:25:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12985330 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 48D8FC6FA86 for ; Thu, 22 Sep 2022 14:37:33 +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=C+iBeyz+Scg7a2i/TuqkS7VLSkuT7/dc8evkHdlQX44=; b=cSfCiZZmW6nIDr B+AXRZZfsZ+rmkTQ0qP4zflDxlLrpvODKQvNLfeTwAfwi/5oJ3urlXoDpyd0zwjqPPCAQ+Rpldmoa 9y/wpWLpxsMBtKj8Pej7jnr+ux4SJvWvo/mmoGKRzj2h0ABLlSWP3S2HcGsU+6LjUyzTLVSLBcgB1 GRtIciWyahoV/h7Vqd9fg2l8ciAQdIyejkfC0VJM2Eo0ogGNQQWXLN1xjCPgIDHrvrQM85peATDkd Lm+4uETqS0/FRjKupgl+MzU4nwhjCSLWQ4U3U7U8MVkpTkEWxCJyE9N8mVZRfdHSrJ47X3b+3BisF Ip8mAMTm6yrtBCE9FwiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNJA-00G57t-Cv; Thu, 22 Sep 2022 14:36:08 +0000 Received: from wnew4-smtp.messagingengine.com ([64.147.123.18]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNAK-00G0jl-0f for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:27:02 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailnew.west.internal (Postfix) with ESMTP id C6B0C2B05B1D; Thu, 22 Sep 2022 10:26:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 22 Sep 2022 10:26:59 -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=1663856816; x= 1663864016; bh=jwz+ufkNT4RwFC1qE/qYHHRxmTxaMQhMtKio8e8RCO4=; b=k WthkSxJGwTqg7B8UZr2QYekK9lNpVbE4mlgOABGJ2KwdF9xlPZ0Nn2sdcmqj1Y1J gxzr401RJvXFiyFySZZge17mhnsAc3vdADTj/F1hcQwcxum20fmcuPWsGNeHR++X 800ftB6re853EZw4l1RNFKfq565umhMN2Vxi5DhzRcjJXVyYIax6/cdt4FikybDJ Zp76t6li/eiwvheS68Qh8TfORgTHE6S/oKtTb0vNkC3FP9vUtE6D+f7S7bD7PLqT h0JTQ/lhOONIWD8hnVBhwSyYRl4k5sAkNgKpv3lSprOW8IbQMFKM8zH997mQAmwB b3HmWuRApnr8DIc2gW1VQ== 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=1663856816; x= 1663864016; bh=jwz+ufkNT4RwFC1qE/qYHHRxmTxaMQhMtKio8e8RCO4=; b=H z9aJWg7FxXEUG6ai7wCGhXtcH2Xfenpj8of/aSOzT9uxVt0gJrmGxxNCaqIecfJ4 fd+isDf1c8v+WL9NrcuGGyfzE3RMAUQr9c1Wq5zAlRoW05X+JKIlji6m0FcF0EB9 AxdWk+0fOrpfo7reDffuWCUcAbR0Tkhf/P9HKMmoMO+FJv8T2ZRkBuaLI/Pit365 mlaFG/D+WKcuUsockm1EjqJXpaVbm2yqXtaFhZSH2J3fZkZlzd3+GQgIT1/CnT0P OkZeMGU2xzIjavmvdyhlvbEA7AmsXXG0/QQIR8Zm/z3d7P4gYJ5lYBKKsWuVak6i mdYWptg0BNWzcjsyU410Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepudduudfhveejteefgedvffdvvedvjedugedukeejhedtlefhffevtefh jeeltdevnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:26:55 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:29 +0200 Subject: [PATCH v2 12/33] drm/modes: parse_cmdline: Add support for named modes containing dashes MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-f733a0ed9f90@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-f733a0ed9f90@cerno.tech> To: Jernej Skrabec , Rodrigo Vivi , Ben Skeggs , David Airlie , Maxime Ripard , Joonas Lahtinen , Emma Anholt , Karol Herbst , Samuel Holland , Jani Nikula , Thomas Zimmermann , Daniel Vetter , Lyude Paul , Maarten Lankhorst , Tvrtko Ursulin , Chen-Yu Tsai Cc: =?unknown-8bit?q?Hans_de_Goede_=3Chdegoede=40redhat=2Ecom=3E=2C_nouveau?= =?unknown-8bit?q?=40lists=2Efreedesktop=2Eorg=2C_Geert_Uytterhoeven_=3Cgeer?= =?unknown-8bit?q?t=40linux-m68k=2Eorg=3E=2C?= =?unknown-8bit?q?_Dave_Stevenson_=3Cdave=2Estevenson=40raspberrypi=2Ecom=3E?= =?unknown-8bit?q?=2C_linux-kernel=40vger=2Ekernel=2Eorg=2C_linux-arm-kernel?= =?unknown-8bit?q?=40lists=2Einfradead=2Eorg=2C?= =?unknown-8bit?q?_Phil_Elwell_=3Cphil=40raspberrypi=2Ecom=3E=2C_intel-gfx=40?= =?unknown-8bit?q?lists=2Efreedesktop=2Eorg=2C_Noralf_Tr=C3=B8nnes_=3Cnoralf?= =?unknown-8bit?q?=40tronnes=2Eorg=3E=2C?= =?unknown-8bit?q?_Dom_Cobley_=3Cdom=40raspberrypi=2Ecom=3E=2C_linux-sunxi=40?= =?unknown-8bit?q?lists=2Elinux=2Edev=2C_Maxime_Ripard_=3Cmaxime=40cerno=2Et?= =?unknown-8bit?q?ech=3E=2C?= =?unknown-8bit?q?_Mateusz_Kwiatkowski_=3Ckfyatek+publicgit=40gmail=2Ecom=3E?= =?unknown-8bit?q?=2C_dri-devel=40lists=2Efreedesktop=2Eorg?= X-Mailer: b4 0.10.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1059; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce7gNsshIO6NX55u/tgmO2tT97mlvVnxqv2Q70Rq8gA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BQGR2f6vTLfOce1Tf/c2YcfK1KDF6yLux0os9nn2V3yN W2NkRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACYSm83wV5z//6Yip8nV7kuKeARWyx dpiOeXHrWP3smlt+da1oxPUowMz8z2PunkvRDE0H7h2rdLvJNlP72a8fxHrNJWm4Wff//UYQEA 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-20220922_072700_139974_080AB0DC X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. 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 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 8742ee078fe6..a1964e08c38f 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;