From patchwork Thu Sep 22 14:25:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 12985349 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 11C66C54EE9 for ; Thu, 22 Sep 2022 14:45: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=VM9FVxGpvwu1X2eMgwzQtKfXWgpckXnQK2a+Oxv3VtU=; b=s+zmI6Hi6lK6Aj U1g94pRbVslNiutV/uuqIsaABcWzBmU8NQWU+rJWJrQ9KbI2nGKysrHe14OHDz0W4Fo7hXyyhlr1v +oDb83kycgTxxO+y9PaXyDwpw3boSzPtZU8RKaDCow2LYrj75+KbT3GZYKz0Xc1eeuhuLRLB3sEEf hS62WIYPj5OLD/lg3l3xpjSI9iAJiN8GqhKc53+xWhPhhyppo6gG2gXK9eJ8c+Emez8QGHJl8DOb8 Ir4/dJhrxYaMkCy3HiPr+q24p/Iyzb6KxJ5PV6TfbbD+dDtbLiEL21vuBXK+tdO9NSmrldIAIzrlq 3BGMsJI+17iioo7yHrow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1obNRE-00G8lq-9j; Thu, 22 Sep 2022 14:44:29 +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 1obNB9-00G1Bm-AJ for linux-arm-kernel@lists.infradead.org; Thu, 22 Sep 2022 14:27:53 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 0C72E2B05B31; Thu, 22 Sep 2022 10:27:47 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 22 Sep 2022 10:27:50 -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=1663856867; x= 1663864067; bh=6jzwlHXRKIyndP+lXIzt3Yajs+mMskqMIyYzuX3/ETo=; b=3 rc9Y6M4VcaUa9oTKUDa98p2Tz57bk6UXGVPlSW9oNm9SOsde3XnA2r7T9qwa/ryb K+UJEOAzPS8W99+oFUDBwlHJQOfXcJJQ3CoxUMp4M5n/21g9EGjgAxHxZg6ivCMW p+1ZQNXoqrzqnlkIhPtzzseew4RybzT0r5y6doReHQYJPKbo39hXfEOfOpcegA7B fW+tZE7vHLssUDxcYVvn+YKhuw+wL49vIdk8HhI86S4eMPrdjJJxKjrvKQHM1ttm CTkdnWWTGp81f2c741J8Ya5hnFrbc+yl9UrNJD9qC6nH9fYfkv3HuNiTIdWgFsRA clj5wDEE3zotEqfjbLYUA== 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=1663856867; x= 1663864067; bh=6jzwlHXRKIyndP+lXIzt3Yajs+mMskqMIyYzuX3/ETo=; b=f ypF9vRSDT+YVhSsnOwVtIBWKhwUs4s8TBuV6SUJ0tvd6CF5TE8QGqFN9rr63iCFJ 6rpgLofGUBi39e/+xoeBAMpi1OPByGEXn4U3lrxawLmlMisOJktDZ81DgifUTXVW NRvDrCZsiGHSXUGqPheMCQwKZ8DloWHFMx8AcXE2Lri4b1N9YhyUvM9l4Ys3WEBE jxKs04OIrxj6/AphSWpM+pq/EuV5TWP8Fcnjo94/JDQBidauBlUvyeMHwxBmj7gU aFrEjUkwW+34NzCZFLdKhNrJm6FCsotYFBMcx5VmxVWXriorqNa1nGwgwPr2AvbQ /xZy/YERpU3OK+HvaQGFA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfeefgedgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdejnecuhfhrohhmpeforgig ihhmvgcutfhiphgrrhguuceomhgrgihimhgvsegtvghrnhhordhtvggthheqnecuggftrf grthhtvghrnhepudduudfhveejteefgedvffdvvedvjedugedukeejhedtlefhffevtefh jeeltdevnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrhhomh epmhgrgihimhgvsegtvghrnhhordhtvggthh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 22 Sep 2022 10:27:46 -0400 (EDT) From: Maxime Ripard Date: Thu, 22 Sep 2022 16:25:36 +0200 Subject: [PATCH v2 19/33] drm/modes: Switch to named mode descriptors MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v2-19-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=1610; i=maxime@cerno.tech; h=from:subject:message-id; bh=ak4bdagFeC60CdYLI9q4vEZkdpDO1FK48fEhtSFByyY=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk6BYGbFz1iPeo843W50lt+pagbitN0ctwkExet7RLXakh7 7fOro5SFQYyLQVZMkSVG2HxJ3KlZrzvZ+ObBzGFlAhnCwMUpABNRXszI8JzLoq3P9v5POUG18/FNL6 +/Sda7VPL0vpBtwdRaVnfjBIb/TknZa/ZLd3dx333Ff4pF4Ynbsn2vKqK2KxhGPd6yQoifCQA= 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_072751_513773_8584D135 X-CRM114-Status: GOOD ( 11.20 ) 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 The current named mode parsing relies only the mode name, and doesn't allow to specify any other parameter. Let's convert that string list to an array of a custom structure that will hold the name and some additional parameters in the future. Signed-off-by: Maxime Ripard diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 9cee0ad806b8..8c8b37ba37dc 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2224,9 +2224,13 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -static const char * const drm_named_modes_whitelist[] = { - "NTSC", - "PAL", +struct drm_named_mode { + const char *name; +}; + +static const struct drm_named_mode drm_named_modes[] = { + { "NTSC", }, + { "PAL", }, }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2262,14 +2266,15 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at that point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { + const struct drm_named_mode *mode = &drm_named_modes[i]; int ret; - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); + ret = str_has_prefix(name, mode->name); if (ret != name_end) continue; - strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]); + strcpy(cmdline_mode->name, mode->name); cmdline_mode->specified = true; return 1;