From patchwork Thu Sep 29 16:31:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12994434 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 6D9DEC433FE for ; Thu, 29 Sep 2022 16:40:38 +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=wpbaWoCQIWABv8LSqk7npl5lL/TpILqZkV1GaermabQ=; b=SWYouTlRsQkKcn Dbg+z9eioC+2yZAx+fSsRblElXd+hghK5ClQ9Uu7UTeAU2xlOy6QvA3adrDLq++GrOKwxatfBwuNn uEQAn/x4eismJf7F4xvk9QHV9dfoTVGHTs9rQ9fEIANnSbkHtB4seQXa5ieiRVjDHfnVCjzO56gIy R4WTOOKD/EEc2m3Smb8gR9PmtySuWVbrIZdGZzNlLkKMnIbrdAGF0f4dAvKcYWiZCYStRfcnC29ju ztMjIGuKE7LHA5DZ9hkpqfCZdBZgfNnkryNnyQgx9+ND2KA7RFvaRI6i3wSozxj7p34bHSmGoBuQK tRsef4xIGVsNcdYp0jZA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1odwZJ-004Fjx-3o; Thu, 29 Sep 2022 16:39:26 +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 1odwRm-004BxN-A7 for linux-arm-kernel@lists.infradead.org; Thu, 29 Sep 2022 16:31:40 +0000 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailnew.nyi.internal (Postfix) with ESMTP id 9504C580800; Thu, 29 Sep 2022 12:31:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 29 Sep 2022 12:31:37 -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=1664469097; x= 1664476297; bh=wt2eTyIJwjxbZ/8tKEZiOXM8cMr/LAhIXsv9D0HeKWs=; b=1 +TgCqSPejbAfkPQh/2VClweEeU/fwWEe/XePjv2CyjdJZJoqual2Hcnw0/jO65dW chpVDafy16ko/CNUxvh41GPLSebWm64YY5/R/KNh4mNrJ0P8KA8jqbSfdbiTf7BO 3HmsnxnFfoTnhQXMNa18xEPCjzmQW8tNtPrzYnZ4h4mkQLk2qJbebj0j3xBrEHvj L+Jd5H5ZnnXMGi3oAlv+C2pBU+f/OPkFUtZLpFGa4hwZNNNGBjEQtgEfkP3zN5ju ba2HanD+GEK8/cgDvWsxgPBC3Zp86ULK9jFst7X/hzgO3n24RR/lwVyCNvk5Hnmr /A/noyISwfXRtEewNfoLA== 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=1664469097; x= 1664476297; bh=wt2eTyIJwjxbZ/8tKEZiOXM8cMr/LAhIXsv9D0HeKWs=; b=p wIfPeE5Uig5/dUO/WSGw53A2vOHlOwM1fBn/Jlwv/9xmIIg5zUCffwYD7g9Z5hhi 3vcyk6fT6OPNZuneGtQvxhRZr6bw42Zsrb2bVpYM1uKmYiIkFpJlT7F34RkJ85WH CZVhs2ACwTejOcZ8LeZVOPG8kF5Ra0/jv1cL8MgSKxttoHgqAXnzbVKOkYXarTWH GUU/UoVuNDWHvEnUaQHywp+YYE90EgQih3VJeaFk+1MNBI67DRuRBwAMequcWMMb OyR3jf95nd1amoCiorPrn6UAcS74aJECL/Qjcpk09Ewq26v/22EfIgqpvSKrHfpm OI95RN8f2Wu9rFIam4DRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeehtddguddtfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhfffugggtgffkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeduudduhfevjeetfeegvdffvdevvdejudegudekjeehtdelhfffveet hfejledtveenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 29 Sep 2022 12:31:36 -0400 (EDT) From: Maxime Ripard Date: Thu, 29 Sep 2022 18:31:06 +0200 Subject: [PATCH v4 12/30] drm/modes: Only consider bpp and refresh before options MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v4-12-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=1709; i=maxime@cerno.tech; h=from:subject:message-id; bh=gD4ygdBGZNKIWb6y+2+6F5I7HQgHtgaK+RNW5UnuoHw=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmmJ9wzmdIf2E3KXahdepRrjdvmzUmGVuv+th86mhmrufh7 TcijjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzkaTnD/1IPv9t79bdVHHt471vTC6 tPN3t4Hph1b6hvz+jiOFoXcoThn+439Zj3Tay3XLb/KMqSOm/6sUhA8MSK/ZHb7y17OEdMgx0A 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_093138_483648_D7A638D9 X-CRM114-Status: GOOD ( 13.81 ) 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 --- drivers/gpu/drm/drm_modes.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 7cf2fe98d7d2..99809ea09ce3 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;