From patchwork Thu Sep 22 14:25:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12985323 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 90E35C6FA82 for ; Thu, 22 Sep 2022 14:36:39 +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=nG6kR5/5mjlHf2OZKmqyZdwE8BdHR9zTFNrhWUgTt78=; b=MT71ESc6mr4RGz Pybz0e028ERZVVh77zw7LPvfU8ijUNU7Bw58DqOjXDkJgl3HhiQwNObm8UwWu7kev56RFldWCq/yW vjk3MAP3ZSXExLZBGMqQ/55/MWoCKoCpM7SnU7FJOkt9tCphnFiUl17apA3vs5SNv7Cx7fS5A59Ek 01ThhgB+EZzEFJ3e7XV3vZ/1iWhpel6er0QMNlLGxqhxfJwfeGOVjVcB1+F9Kn+ioQaZfSi7CBvti cxvqvH1XQGTIWGiZ9IG3XNT2hnuA63QjMfaKNGnv4DHznC2XpxvKqceZLOBZpG0zcHQUysLIJyYU8 D2crghOtT3DYpW9TRS6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNIR-00G4nU-TQ; Thu, 22 Sep 2022 14:35:25 +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 1obNAD-00G0fK-3T for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:26:56 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 7F6242B05B1F; Thu, 22 Sep 2022 10:26:49 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Thu, 22 Sep 2022 10:26:52 -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=1663856809; x= 1663864009; bh=2NnjqCO4NMItXEoc0zbBHgLZ+xECh6BN8zUKWTW55Ys=; b=O Fur9YXofY21mq8/gyq5m9k34T3BnkOm/lebs2fS/9lQTv9OZ7qJtpPiqUG/i5qSW q2UPOYfEr2wAcKPH5kxFHiyvywyaS38jogfrFu/Yzr7fZlwJ/39soTMEVGEsaCd6 6pThEloiLC9+9fTlOK08KvQsqgT68CW0uhJKWue45pkGAnq+HPnBlCZlpj6Z1gDz kTww85DYX9CrT6JnACTDL0d3ExE2QaFHKsnknm2UIXQgL/HamkG9E2nedNBdHbGY fEbtp9vprjVk65lSRw0gWRN0+e0AfEJl+Zu9otf56xlmnzOIaArAKeCY+NXdbAL7 59BrLEON2azateYkI/tNw== 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=1663856809; x= 1663864009; bh=2NnjqCO4NMItXEoc0zbBHgLZ+xECh6BN8zUKWTW55Ys=; b=m q59E+H7i2lBNJMivDIRlLGh3hl9lsuqkFmc2YXlPPNy6wgNkQ3IUC+ijgUOkEfXD SOlC4HnisJ3BE62GnoH021mV8S6k73OsV6Vg2YXxFIJGHfUO0X5stLjJjfVMHzb1 WCjLniWIf2BNdZoPeISf4i0JB3zt4qj+DVgepXHI+iWt+fdiUTw0ZKBKa6Hk67JQ NUY5NCjWsPkKusIY0fLROVbnxwW2ipm8lUd/n00z8tG0bTcm/ZL6HnC7ah11UIaf QvyuoplKNyigAVeqX6hB6Hkp0sIjGYm/2RzGaGmlTsusp3nq7ic5bZl67WIeZiwe QUN0Xnl415RGVmqjRv3Jw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepudduudfhveejteefgedvffdvvedvjedugedukeejhedtlefhffevtefh jeeltdevnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:26:48 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:28 +0200 Subject: [PATCH v2 11/33] drm/modes: Only consider bpp and refresh before options MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-11-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=1592; i=maxime@cerno.tech; h=from:subject:message-id; bh=ehH+i59Vs/OowDE5NFRENhDEDWKHnp2mavFJ4/wcEk8=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BQEdq/PX9K6y2R4w8bddEENn17rOqilr9H5FnZWSzXwW l1TfUcrCIMbFICumyBIjbL4k7tSs151sfPNg5rAygQxh4OIUgIlMa2Jk2HqaR3mjKMvhis2sDY5Ktv HPj959KqvW2PH0yBePOpbgJQz/y1xTmidsqzKZWla2cOPyjNP3Vp+rXOH7TsZEPPXbo+3reQA= 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_072653_311799_EDB1450F X-CRM114-Status: GOOD ( 12.08 ) 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 Some video= options might have a value that contains a dash. However, the command line parsing mode considers all dashes as the separator between the mode and the bpp count. Let's rework the parsing code a bit to only consider a dash as the bpp separator if it before a comma, the options separator. A follow-up patch will add a unit-test for this once such an option is introduced. Reviewed-by: Geert Uytterhoeven Signed-off-by: Maxime Ripard diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 76ab700f56ff..8742ee078fe6 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2275,20 +2275,22 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, name = mode_option; + /* Locate the start of named options */ + options_ptr = strchr(name, ','); + if (options_ptr) + options_off = options_ptr - name; + else + options_off = strlen(name); + /* Try to locate the bpp and refresh specifiers, if any */ - bpp_ptr = strchr(name, '-'); + bpp_ptr = strnchr(name, options_off, '-'); if (bpp_ptr) bpp_off = bpp_ptr - name; - refresh_ptr = strchr(name, '@'); + refresh_ptr = strnchr(name, options_off, '@'); if (refresh_ptr) refresh_off = refresh_ptr - name; - /* Locate the start of named options */ - options_ptr = strchr(name, ','); - if (options_ptr) - options_off = options_ptr - name; - /* Locate the end of the name / resolution, and parse it */ if (bpp_ptr) { mode_end = bpp_off;