From: Maxime Ripard <maxime@cerno.tech>
To: Jernej Skrabec <jernej.skrabec@gmail.com>,
Chen-Yu Tsai <wens@csie.org>, Karol Herbst <kherbst@redhat.com>,
Samuel Holland <samuel@sholland.org>,
Lyude Paul <lyude@redhat.com>,
Jani Nikula <jani.nikula@linux.intel.com>,
Daniel Vetter <daniel@ffwll.ch>,
Thomas Zimmermann <tzimmermann@suse.de>,
Emma Anholt <emma@anholt.net>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Ben Skeggs <bskeggs@redhat.com>, David Airlie <airlied@linux.ie>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
Maxime Ripard <maxime@cerno.tech>,
dri-devel@lists.freedesktop.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
intel-gfx@lists.freedesktop.org, linux-sunxi@lists.linux.dev,
Hans de Goede <hdegoede@redhat.com>,
nouveau@lists.freedesktop.org,
Noralf Trønnes <noralf@tronnes.org>,
Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org, Dom Cobley <dom@raspberrypi.com>,
Phil Elwell <phil@raspberrypi.com>
Subject: [PATCH v4 15/30] drm/modes: Move named modes parsing to a separate function
Date: Thu, 29 Sep 2022 18:31:09 +0200 [thread overview]
Message-ID: <20220728-rpi-analog-tv-properties-v4-15-60d38873f782@cerno.tech> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v4-0-60d38873f782@cerno.tech>
The current construction of the named mode parsing doesn't allow to extend
it easily. Let's move it to a separate function so we can add more
parameters and modes.
In order for the tests to still pass, some extra checks are needed, so
it's not a 1:1 move.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
Changes in v4:
- Fold down all the named mode patches that were split into a single
patch again to maintain bisectability
---
drivers/gpu/drm/drm_modes.c | 73 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 62 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index c0dceff51cac..2f020ef2ddf2 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -2229,6 +2229,55 @@ static const char * const drm_named_modes_whitelist[] = {
"PAL",
};
+static int drm_mode_parse_cmdline_named_mode(const char *name,
+ unsigned int name_end,
+ struct drm_cmdline_mode *cmdline_mode)
+{
+ unsigned int i;
+
+ if (!name_end)
+ return 0;
+
+ /* If the name starts with a digit, it's not a named mode */
+ if (isdigit(name[0]))
+ return 0;
+
+ /*
+ * If there's an equal sign in the name, the command-line
+ * contains only an option and no mode.
+ */
+ if (strnchr(name, name_end, '='))
+ return 0;
+
+#define STR_STRICT_EQ(str, len, cmp) \
+ (str_has_prefix(str, cmp) == len)
+
+ /* The connection status extras can be set without a mode. */
+ if (STR_STRICT_EQ(name, name_end, "d") ||
+ STR_STRICT_EQ(name, name_end, "D") ||
+ STR_STRICT_EQ(name, name_end, "e"))
+ return 0;
+
+ /*
+ * 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++) {
+ int ret;
+
+ ret = str_has_prefix(name, drm_named_modes_whitelist[i]);
+ if (ret != name_end)
+ continue;
+
+ strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]);
+ cmdline_mode->specified = true;
+
+ return 1;
+ }
+
+ return -EINVAL;
+}
+
/**
* drm_mode_parse_command_line_for_connector - parse command line modeline for connector
* @mode_option: optional per connector mode option
@@ -2265,7 +2314,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL;
const char *options_ptr = NULL;
char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL;
- int i, len, ret;
+ int len, ret;
memset(mode, 0, sizeof(*mode));
mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN;
@@ -2306,17 +2355,19 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
parse_extras = true;
}
- /* First check for a named mode */
- for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) {
- ret = str_has_prefix(name, drm_named_modes_whitelist[i]);
- if (ret == mode_end) {
- if (refresh_ptr)
- return false; /* named + refresh is invalid */
- strcpy(mode->name, drm_named_modes_whitelist[i]);
- mode->specified = true;
- break;
- }
+ if (mode_end) {
+ ret = drm_mode_parse_cmdline_named_mode(name, mode_end, mode);
+ if (ret < 0)
+ return false;
+
+ /*
+ * Having a mode that starts by a letter (and thus is named)
+ * and an at-sign (used to specify a refresh rate) is
+ * disallowed.
+ */
+ if (ret && refresh_ptr)
+ return false;
}
/* No named mode? Check for a normal mode argument, e.g. 1024x768 */
--
b4 0.11.0-dev-7da52
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-09-29 16:45 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 16:30 [PATCH v4 00/30] drm: Analog TV Improvements Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 01/30] drm/docs: Remove unused TV Standard property Maxime Ripard
2022-09-30 11:34 ` Noralf Trønnes
2022-09-29 16:30 ` [PATCH v4 02/30] drm/tests: Order Kunit tests in Makefile Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 03/30] drm/tests: Add Kunit Helpers Maxime Ripard
2022-09-30 14:47 ` Noralf Trønnes
2022-09-29 16:30 ` [PATCH v4 04/30] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:30 ` [PATCH v4 05/30] drm/connector: Rename subconnector state variable Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 06/30] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 07/30] drm/connector: Rename legacy TV property Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 08/30] drm/connector: Only register TV mode property if present Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 09/30] drm/connector: Rename drm_mode_create_tv_properties Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 10/30] drm/connector: Add TV standard property Maxime Ripard
2022-09-30 11:46 ` Noralf Trønnes
2022-09-29 16:31 ` [PATCH v4 11/30] drm/modes: Add a function to generate analog display modes Maxime Ripard
2022-10-01 12:52 ` Noralf Trønnes
2022-10-13 8:36 ` Maxime Ripard
2022-10-15 15:04 ` Noralf Trønnes
2022-10-18 7:34 ` Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 12/30] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 13/30] drm/modes: parse_cmdline: Add support for named modes containing dashes Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 14/30] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-10-01 17:42 ` Maíra Canal
2022-09-29 16:31 ` Maxime Ripard [this message]
2022-09-29 16:31 ` [PATCH v4 16/30] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 17/30] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 18/30] drm/connector: Add pixel clock to cmdline mode Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 19/30] drm/connector: Add a function to lookup a TV mode by its name Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 20/30] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 21/30] drm/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 22/30] drm/modes: Introduce more named modes Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 23/30] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 24/30] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 25/30] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-10-10 12:10 ` (subset) " Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 26/30] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 27/30] drm/vc4: vec: Check for VEC output constraints Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 28/30] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 29/30] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-09-29 16:31 ` [PATCH v4 30/30] drm/sun4i: tv: Convert to the new TV mode property Maxime Ripard
2022-10-01 12:37 ` Noralf Trønnes
2022-10-01 13:12 ` [PATCH v4 00/30] drm: Analog TV Improvements Noralf Trønnes
2022-10-10 12:11 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220728-rpi-analog-tv-properties-v4-15-60d38873f782@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=daniel@ffwll.ch \
--cc=dave.stevenson@raspberrypi.com \
--cc=dom@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=geert@linux-m68k.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jernej.skrabec@gmail.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=kfyatek+publicgit@gmail.com \
--cc=kherbst@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=lyude@redhat.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=noralf@tronnes.org \
--cc=nouveau@lists.freedesktop.org \
--cc=phil@raspberrypi.com \
--cc=rodrigo.vivi@intel.com \
--cc=samuel@sholland.org \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).