From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 500E23D65 for ; Mon, 29 Aug 2022 13:13:25 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 1BDC52B06056; Mon, 29 Aug 2022 09:13:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:13:24 -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=fm3; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=X c7Z5RIAZDbcktvpiPovFQfv/Y+JZDt9Or7HaQL73yJS0K4Gs5Og1xFOgCL66llUO AN19C9qauHvTD9elrKkpu6uU27pT+S7+BMmY8zxNEi9Z4eRSvJ7IfXJf95w5SW7B CVhJfNFpKTe0B6nHT1lD8RablUVX4mVkdNpB/yG7wuX3iIEeq+74faTTJ4WdJ3K9 NRLwKnNCuIKPGysxdxJ+RfElAn8MeE63zZMUEu8Dgp4cfXpFLDlfwG2InlkmiXHe Pj4SOefke/2JUw+3akKRVKmqoLNKzBteC5Vp28rCeeqSGIR387lbhtUqOkRI/FbZ 6c5vslviwQEL6X+3/9c4A== 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=fm1; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=M bBgXynKSTeXOi2Bq2ciTxgZr49tswVd1B67bm33Oe+jsfieBOiGE/jghr/rQau7Q jfXnxj108C5/GztijwkGIyt8hYMdZOZhuqYiR5jEICLEN8FsUQiTaB/PMqTwlsDr m5xOhYIudZVeAWMzFDlrUNp6lw61f5HB3bp+MZ4MpyQvCPeOTH6KhjCsPzsPIAHA 7hYNarsPIwcQLMivE+KQpBeAYDF2Ua8cyOUn61E4gzrMp+7N5RLnQQJYVTXwrao+ jjvXGcY8QVG2ldnvaGx+pHaZO87UEnqo2O94itRw0ttGLi50emoVMQf1M7M7OY11 ktMxMF29aSYCZnc3i2XFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:13:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven Subject: [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes Date: Mon, 29 Aug 2022 15:11:26 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce+TyjEkD5ms8VGGkYRw7EWiyTTKy0ScuMQtAi1SOoM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+STGJ7KXdfiCpu8Ly6soUhh28WTTV9uP/32bVpCR9ya VT6nO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjARk2eMDDOtWWM3xD1IOvu6Yy7n9E XnpnI6a4mdEj0moHq09aWj+0lGhmbh6am2ujO65oV/3/+qPFxaidez/2Xpil3L5COOa6z4yg4A X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable From: Geert Uytterhoeven =0D =0D It is fairly common for named video modes to contain dashes (e.g.=0D "tt-mid" on Atari, "dblntsc-ff" on Amiga). Currently such mode names=0D are not recognized, as the dash is considered to be a separator between=0D mode name and bpp.=0D =0D Fix this by skipping any dashes that are not followed immediately by a=0D digit when looking for the separator.=0D =0D Signed-off-by: Geert Uytterhoeven =0D Reviewed-by: Hans de Goede =0D Signed-off-by: Maxime Ripard =0D =0D diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D index b4e1ff56b4d8..99a21e5cd00d 100644=0D --- a/drivers/gpu/drm/drm_modes.c=0D +++ b/drivers/gpu/drm/drm_modes.c=0D @@ -2263,6 +2263,8 @@ bool drm_mode_parse_command_line_for_connector(const = char *mode_option,=0D =0D /* Try to locate the bpp and refresh specifiers, if any */=0D bpp_ptr =3D strnchr(name, options_off, '-');=0D + while (bpp_ptr && !isdigit(bpp_ptr[1]))=0D + bpp_ptr =3D strnchr(bpp_ptr + 1, options_off, '-');=0D if (bpp_ptr)=0D bpp_off =3D bpp_ptr - name;=0D =0D =0D -- =0D b4 0.10.0-dev-65ba7=0D From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 97A72ECAAD2 for ; Mon, 29 Aug 2022 13:14:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33FB210F229; Mon, 29 Aug 2022 13:13:53 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4140D10F214 for ; Mon, 29 Aug 2022 13:13:25 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 1BDC52B06056; Mon, 29 Aug 2022 09:13:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:13:24 -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=fm3; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=X c7Z5RIAZDbcktvpiPovFQfv/Y+JZDt9Or7HaQL73yJS0K4Gs5Og1xFOgCL66llUO AN19C9qauHvTD9elrKkpu6uU27pT+S7+BMmY8zxNEi9Z4eRSvJ7IfXJf95w5SW7B CVhJfNFpKTe0B6nHT1lD8RablUVX4mVkdNpB/yG7wuX3iIEeq+74faTTJ4WdJ3K9 NRLwKnNCuIKPGysxdxJ+RfElAn8MeE63zZMUEu8Dgp4cfXpFLDlfwG2InlkmiXHe Pj4SOefke/2JUw+3akKRVKmqoLNKzBteC5Vp28rCeeqSGIR387lbhtUqOkRI/FbZ 6c5vslviwQEL6X+3/9c4A== 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=fm1; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=M bBgXynKSTeXOi2Bq2ciTxgZr49tswVd1B67bm33Oe+jsfieBOiGE/jghr/rQau7Q jfXnxj108C5/GztijwkGIyt8hYMdZOZhuqYiR5jEICLEN8FsUQiTaB/PMqTwlsDr m5xOhYIudZVeAWMzFDlrUNp6lw61f5HB3bp+MZ4MpyQvCPeOTH6KhjCsPzsPIAHA 7hYNarsPIwcQLMivE+KQpBeAYDF2Ua8cyOUn61E4gzrMp+7N5RLnQQJYVTXwrao+ jjvXGcY8QVG2ldnvaGx+pHaZO87UEnqo2O94itRw0ttGLi50emoVMQf1M7M7OY11 ktMxMF29aSYCZnc3i2XFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:13:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Subject: [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes Date: Mon, 29 Aug 2022 15:11:26 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce+TyjEkD5ms8VGGkYRw7EWiyTTKy0ScuMQtAi1SOoM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+STGJ7KXdfiCpu8Ly6soUhh28WTTV9uP/32bVpCR9ya VT6nO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjARk2eMDDOtWWM3xD1IOvu6Yy7n9E XnpnI6a4mdEj0moHq09aWj+0lGhmbh6am2ujO65oV/3/+qPFxaidez/2Xpil3L5COOa6z4yg4A X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Geert Uytterhoeven =0D =0D It is fairly common for named video modes to contain dashes (e.g.=0D "tt-mid" on Atari, "dblntsc-ff" on Amiga). Currently such mode names=0D are not recognized, as the dash is considered to be a separator between=0D mode name and bpp.=0D =0D Fix this by skipping any dashes that are not followed immediately by a=0D digit when looking for the separator.=0D =0D Signed-off-by: Geert Uytterhoeven =0D Reviewed-by: Hans de Goede =0D Signed-off-by: Maxime Ripard =0D =0D diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D index b4e1ff56b4d8..99a21e5cd00d 100644=0D --- a/drivers/gpu/drm/drm_modes.c=0D +++ b/drivers/gpu/drm/drm_modes.c=0D @@ -2263,6 +2263,8 @@ bool drm_mode_parse_command_line_for_connector(const = char *mode_option,=0D =0D /* Try to locate the bpp and refresh specifiers, if any */=0D bpp_ptr =3D strnchr(name, options_off, '-');=0D + while (bpp_ptr && !isdigit(bpp_ptr[1]))=0D + bpp_ptr =3D strnchr(bpp_ptr + 1, options_off, '-');=0D if (bpp_ptr)=0D bpp_off =3D bpp_ptr - name;=0D =0D =0D -- =0D b4 0.10.0-dev-65ba7=0D From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 F083CECAAD4 for ; Mon, 29 Aug 2022 13:21:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C9F2510F29A; Mon, 29 Aug 2022 13:21:00 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2401610F2BB; Mon, 29 Aug 2022 13:20:49 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 1BDC52B06056; Mon, 29 Aug 2022 09:13:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:13:24 -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=fm3; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=X c7Z5RIAZDbcktvpiPovFQfv/Y+JZDt9Or7HaQL73yJS0K4Gs5Og1xFOgCL66llUO AN19C9qauHvTD9elrKkpu6uU27pT+S7+BMmY8zxNEi9Z4eRSvJ7IfXJf95w5SW7B CVhJfNFpKTe0B6nHT1lD8RablUVX4mVkdNpB/yG7wuX3iIEeq+74faTTJ4WdJ3K9 NRLwKnNCuIKPGysxdxJ+RfElAn8MeE63zZMUEu8Dgp4cfXpFLDlfwG2InlkmiXHe Pj4SOefke/2JUw+3akKRVKmqoLNKzBteC5Vp28rCeeqSGIR387lbhtUqOkRI/FbZ 6c5vslviwQEL6X+3/9c4A== 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=fm1; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=M bBgXynKSTeXOi2Bq2ciTxgZr49tswVd1B67bm33Oe+jsfieBOiGE/jghr/rQau7Q jfXnxj108C5/GztijwkGIyt8hYMdZOZhuqYiR5jEICLEN8FsUQiTaB/PMqTwlsDr m5xOhYIudZVeAWMzFDlrUNp6lw61f5HB3bp+MZ4MpyQvCPeOTH6KhjCsPzsPIAHA 7hYNarsPIwcQLMivE+KQpBeAYDF2Ua8cyOUn61E4gzrMp+7N5RLnQQJYVTXwrao+ jjvXGcY8QVG2ldnvaGx+pHaZO87UEnqo2O94itRw0ttGLi50emoVMQf1M7M7OY11 ktMxMF29aSYCZnc3i2XFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:13:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Date: Mon, 29 Aug 2022 15:11:26 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce+TyjEkD5ms8VGGkYRw7EWiyTTKy0ScuMQtAi1SOoM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+STGJ7KXdfiCpu8Ly6soUhh28WTTV9uP/32bVpCR9ya VT6nO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjARk2eMDDOtWWM3xD1IOvu6Yy7n9E XnpnI6a4mdEj0moHq09aWj+0lGhmbh6am2ujO65oV/3/+qPFxaidez/2Xpil3L5COOa6z4yg4A X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable Subject: [Intel-gfx] [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Geert Uytterhoeven =0D =0D It is fairly common for named video modes to contain dashes (e.g.=0D "tt-mid" on Atari, "dblntsc-ff" on Amiga). Currently such mode names=0D are not recognized, as the dash is considered to be a separator between=0D mode name and bpp.=0D =0D Fix this by skipping any dashes that are not followed immediately by a=0D digit when looking for the separator.=0D =0D Signed-off-by: Geert Uytterhoeven =0D Reviewed-by: Hans de Goede =0D Signed-off-by: Maxime Ripard =0D =0D diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D index b4e1ff56b4d8..99a21e5cd00d 100644=0D --- a/drivers/gpu/drm/drm_modes.c=0D +++ b/drivers/gpu/drm/drm_modes.c=0D @@ -2263,6 +2263,8 @@ bool drm_mode_parse_command_line_for_connector(const = char *mode_option,=0D =0D /* Try to locate the bpp and refresh specifiers, if any */=0D bpp_ptr =3D strnchr(name, options_off, '-');=0D + while (bpp_ptr && !isdigit(bpp_ptr[1]))=0D + bpp_ptr =3D strnchr(bpp_ptr + 1, options_off, '-');=0D if (bpp_ptr)=0D bpp_off =3D bpp_ptr - name;=0D =0D =0D -- =0D b4 0.10.0-dev-65ba7=0D From mboxrd@z Thu Jan 1 00:00:00 1970 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 EF1ADECAAD4 for ; Mon, 29 Aug 2022 13:21:51 +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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HXCY2J4A6GLGjPf2o36mhcSP2wk3JsFcEuni7xVZpyM=; b=L9ECG1RqUevbXD qC6fZU+uRR9Y/vO+0Ryv7UT6VxFqnP4ouDt/XeR89KZ0S2gAl5/2sVCk4vAlEbAF2iUWz2g+CEi48 jqoMt4aq/IWdciDGbF1VctR7vpkgNLLJ8CGMDxVF+n3SEVu5KkTjLAZFCuWUsj5rBWmcV3YYwr+CV 53O34jYA25uKal1Rz0tJO0Z56Y73NtozuW2DScrYYFmx32XDNT4LQB/hrAlmL6MAzWi0ZM0UPkZk1 0IWTmAe8Vye8dcFOssvZ7KP/nMMg6jTJxb3WEFaIXnd1JLAo/uR2+PjMDoD3JRXMNu+rTIa1wyT2P 1gyno55Psdl548YSNVLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSegU-00AeJk-Vi; Mon, 29 Aug 2022 13:20:11 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSeZx-00Aa8H-BY for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 13:13:31 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 1BDC52B06056; Mon, 29 Aug 2022 09:13:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:13:24 -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=fm3; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=X c7Z5RIAZDbcktvpiPovFQfv/Y+JZDt9Or7HaQL73yJS0K4Gs5Og1xFOgCL66llUO AN19C9qauHvTD9elrKkpu6uU27pT+S7+BMmY8zxNEi9Z4eRSvJ7IfXJf95w5SW7B CVhJfNFpKTe0B6nHT1lD8RablUVX4mVkdNpB/yG7wuX3iIEeq+74faTTJ4WdJ3K9 NRLwKnNCuIKPGysxdxJ+RfElAn8MeE63zZMUEu8Dgp4cfXpFLDlfwG2InlkmiXHe Pj4SOefke/2JUw+3akKRVKmqoLNKzBteC5Vp28rCeeqSGIR387lbhtUqOkRI/FbZ 6c5vslviwQEL6X+3/9c4A== 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=fm1; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=M bBgXynKSTeXOi2Bq2ciTxgZr49tswVd1B67bm33Oe+jsfieBOiGE/jghr/rQau7Q jfXnxj108C5/GztijwkGIyt8hYMdZOZhuqYiR5jEICLEN8FsUQiTaB/PMqTwlsDr m5xOhYIudZVeAWMzFDlrUNp6lw61f5HB3bp+MZ4MpyQvCPeOTH6KhjCsPzsPIAHA 7hYNarsPIwcQLMivE+KQpBeAYDF2Ua8cyOUn61E4gzrMp+7N5RLnQQJYVTXwrao+ jjvXGcY8QVG2ldnvaGx+pHaZO87UEnqo2O94itRw0ttGLi50emoVMQf1M7M7OY11 ktMxMF29aSYCZnc3i2XFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:13:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven Subject: [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes Date: Mon, 29 Aug 2022 15:11:26 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce+TyjEkD5ms8VGGkYRw7EWiyTTKy0ScuMQtAi1SOoM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+STGJ7KXdfiCpu8Ly6soUhh28WTTV9uP/32bVpCR9ya VT6nO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjARk2eMDDOtWWM3xD1IOvu6Yy7n9E XnpnI6a4mdEj0moHq09aWj+0lGhmbh6am2ujO65oV/3/+qPFxaidez/2Xpil3L5COOa6z4yg4A 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-20220829_061325_488156_D182D3FD X-CRM114-Status: UNSURE ( 8.01 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 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 b4e1ff56b4d8..99a21e5cd00d 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2263,6 +2263,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; -- b4 0.10.0-dev-65ba7 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (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 E922FC38145 for ; Tue, 6 Sep 2022 20:32:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF3FB10EAA9; Tue, 6 Sep 2022 20:31:30 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2401610F2BB; Mon, 29 Aug 2022 13:20:49 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.west.internal (Postfix) with ESMTP id 1BDC52B06056; Mon, 29 Aug 2022 09:13:22 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 29 Aug 2022 09:13:24 -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=fm3; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=X c7Z5RIAZDbcktvpiPovFQfv/Y+JZDt9Or7HaQL73yJS0K4Gs5Og1xFOgCL66llUO AN19C9qauHvTD9elrKkpu6uU27pT+S7+BMmY8zxNEi9Z4eRSvJ7IfXJf95w5SW7B CVhJfNFpKTe0B6nHT1lD8RablUVX4mVkdNpB/yG7wuX3iIEeq+74faTTJ4WdJ3K9 NRLwKnNCuIKPGysxdxJ+RfElAn8MeE63zZMUEu8Dgp4cfXpFLDlfwG2InlkmiXHe Pj4SOefke/2JUw+3akKRVKmqoLNKzBteC5Vp28rCeeqSGIR387lbhtUqOkRI/FbZ 6c5vslviwQEL6X+3/9c4A== 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=fm1; t=1661778801; x= 1661786001; bh=03XFcTJGiCv9x9hOMYU/IHnyg9+FpgYuQ7Ewjsv6kOA=; b=M bBgXynKSTeXOi2Bq2ciTxgZr49tswVd1B67bm33Oe+jsfieBOiGE/jghr/rQau7Q jfXnxj108C5/GztijwkGIyt8hYMdZOZhuqYiR5jEICLEN8FsUQiTaB/PMqTwlsDr m5xOhYIudZVeAWMzFDlrUNp6lw61f5HB3bp+MZ4MpyQvCPeOTH6KhjCsPzsPIAHA 7hYNarsPIwcQLMivE+KQpBeAYDF2Ua8cyOUn61E4gzrMp+7N5RLnQQJYVTXwrao+ jjvXGcY8QVG2ldnvaGx+pHaZO87UEnqo2O94itRw0ttGLi50emoVMQf1M7M7OY11 ktMxMF29aSYCZnc3i2XFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:13:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Date: Mon, 29 Aug 2022 15:11:26 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-12-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=1069; i=maxime@cerno.tech; h=from:subject:message-id; bh=Ce+TyjEkD5ms8VGGkYRw7EWiyTTKy0ScuMQtAi1SOoM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+STGJ7KXdfiCpu8Ly6soUhh28WTTV9uP/32bVpCR9ya VT6nO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjARk2eMDDOtWWM3xD1IOvu6Yy7n9E XnpnI6a4mdEj0moHq09aWj+0lGhmbh6am2ujO65oV/3/+qPFxaidez/2Xpil3L5COOa6z4yg4A X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Tue, 06 Sep 2022 20:31:04 +0000 Subject: [Nouveau] [PATCH v2 12/41] drm/modes: parse_cmdline: Add support for named modes containing dashes X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" From: Geert Uytterhoeven =0D =0D It is fairly common for named video modes to contain dashes (e.g.=0D "tt-mid" on Atari, "dblntsc-ff" on Amiga). Currently such mode names=0D are not recognized, as the dash is considered to be a separator between=0D mode name and bpp.=0D =0D Fix this by skipping any dashes that are not followed immediately by a=0D digit when looking for the separator.=0D =0D Signed-off-by: Geert Uytterhoeven =0D Reviewed-by: Hans de Goede =0D Signed-off-by: Maxime Ripard =0D =0D diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D index b4e1ff56b4d8..99a21e5cd00d 100644=0D --- a/drivers/gpu/drm/drm_modes.c=0D +++ b/drivers/gpu/drm/drm_modes.c=0D @@ -2263,6 +2263,8 @@ bool drm_mode_parse_command_line_for_connector(const = char *mode_option,=0D =0D /* Try to locate the bpp and refresh specifiers, if any */=0D bpp_ptr =3D strnchr(name, options_off, '-');=0D + while (bpp_ptr && !isdigit(bpp_ptr[1]))=0D + bpp_ptr =3D strnchr(bpp_ptr + 1, options_off, '-');=0D if (bpp_ptr)=0D bpp_off =3D bpp_ptr - name;=0D =0D =0D -- =0D b4 0.10.0-dev-65ba7=0D