Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
From:   Maxime Ripard <maxime@cerno.tech>
To:     Maxime Ripard <mripard@kernel.org>,
        Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>, Chen-Yu Tsai <wens@csie.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Lyude Paul <lyude@redhat.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Samuel Holland <samuel@sholland.org>,
        Karol Herbst <kherbst@redhat.com>,
        =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>,
        Emma Anholt <emma@anholt.net>, Daniel Vetter <daniel@ffwll.ch>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc:     Maxime Ripard <maxime@cerno.tech>,
        Hans de Goede <hdegoede@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Phil Elwell <phil@raspberrypi.com>,
        intel-gfx@lists.freedesktop.org,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        dri-devel@lists.freedesktop.org, Dom Cobley <dom@raspberrypi.com>,
        linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org,
        linux-sunxi@lists.linux.dev,
        Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 15/41] drm/modes: Switch to named mode descriptors
Date:   Mon, 29 Aug 2022 15:11:29 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-15-459522d653a7@cerno.tech>
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"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

The current named mode parsing relies only the mode name, and doesn't allow=
=0D
to specify any other parameter.=0D
=0D
Let's convert that string list to an array of a custom structure that will=
=0D
hold the name and some additional parameters in the future.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
=0D
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D
index 0636cb707544..1fdfa004b139 100644=0D
--- a/drivers/gpu/drm/drm_modes.c=0D
+++ b/drivers/gpu/drm/drm_modes.c=0D
@@ -2206,9 +2206,13 @@ static int drm_mode_parse_cmdline_options(const char=
 *str,=0D
 	return 0;=0D
 }=0D
 =0D
-static const char * const drm_named_modes_whitelist[] =3D {=0D
-	"NTSC",=0D
-	"PAL",=0D
+struct drm_named_mode {=0D
+	const char *name;=0D
+};=0D
+=0D
+static const struct drm_named_mode drm_named_modes[] =3D {=0D
+	{ "NTSC", },=0D
+	{ "PAL", },=0D
 };=0D
 =0D
 static int drm_mode_parse_cmdline_named_mode(const char *name,=0D
@@ -2241,14 +2245,15 @@ static int drm_mode_parse_cmdline_named_mode(const =
char *name,=0D
 	 * We're sure we're a named mode at that point, iterate over the=0D
 	 * list of modes we're aware of.=0D
 	 */=0D
-	for (i =3D 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) {=0D
+	for (i =3D 0; i < ARRAY_SIZE(drm_named_modes); i++) {=0D
+		const struct drm_named_mode *mode =3D &drm_named_modes[i];=0D
 		int ret;=0D
 =0D
-		ret =3D str_has_prefix(name, drm_named_modes_whitelist[i]);=0D
+		ret =3D str_has_prefix(name, mode->name);=0D
 		if (ret !=3D name_end)=0D
 			continue;=0D
 =0D
-		strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]);=0D
+		strcpy(cmdline_mode->name, mode->name);=0D
 		cmdline_mode->specified =3D true;=0D
 =0D
 		return 1;=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D