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 11/41] drm/modes: Only consider bpp and refresh before options
Date:   Mon, 29 Aug 2022 15:11:25 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-11-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

Some video=3D options might have a value that contains a dash. However, the=
=0D
command line parsing mode considers all dashes as the separator between the=
=0D
mode and the bpp count.=0D
=0D
Let's rework the parsing code a bit to only consider a dash as the bpp=0D
separator if it before a comma, the options separator.=0D
=0D
A follow-up patch will add a unit-test for this once such an option is=0D
introduced.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>=0D
=0D
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c=0D
index ee581ee17171..b4e1ff56b4d8 100644=0D
--- a/drivers/gpu/drm/drm_modes.c=0D
+++ b/drivers/gpu/drm/drm_modes.c=0D
@@ -2254,20 +2254,22 @@ bool drm_mode_parse_command_line_for_connector(cons=
t char *mode_option,=0D
 =0D
 	name =3D mode_option;=0D
 =0D
+	/* Locate the start of named options */=0D
+	options_ptr =3D strchr(name, ',');=0D
+	if (options_ptr)=0D
+		options_off =3D options_ptr - name;=0D
+	else=0D
+		options_off =3D strlen(name);=0D
+=0D
 	/* Try to locate the bpp and refresh specifiers, if any */=0D
-	bpp_ptr =3D strchr(name, '-');=0D
+	bpp_ptr =3D strnchr(name, options_off, '-');=0D
 	if (bpp_ptr)=0D
 		bpp_off =3D bpp_ptr - name;=0D
 =0D
-	refresh_ptr =3D strchr(name, '@');=0D
+	refresh_ptr =3D strnchr(name, options_off, '@');=0D
 	if (refresh_ptr)=0D
 		refresh_off =3D refresh_ptr - name;=0D
 =0D
-	/* Locate the start of named options */=0D
-	options_ptr =3D strchr(name, ',');=0D
-	if (options_ptr)=0D
-		options_off =3D options_ptr - name;=0D
-=0D
 	/* Locate the end of the name / resolution, and parse it */=0D
 	if (bpp_ptr) {=0D
 		mode_end =3D bpp_off;=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D