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 20/41] drm/modes: Properly generate a drm_display_mode from a named mode
Date:   Mon, 29 Aug 2022 15:11:34 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-20-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 framework will get the drm_display_mode from the drm_cmdline_mode it=0D
got by parsing the video command line argument by calling=0D
drm_connector_pick_cmdline_mode().=0D
=0D
The heavy lifting will then be done by the drm_mode_create_from_cmdline_mod=
e()=0D
function.=0D
=0D
In the case of the named modes though, there's no real code to make that=0D
translation and we rely on the drivers to guess which actual display mode=0D
we meant.=0D
=0D
Let's modify drm_mode_create_from_cmdline_mode() to properly generate the=0D
drm_display_mode we mean when passing a named mode.=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 a759a4ba0036..065dbfbd815e 100644=0D
--- a/drivers/gpu/drm/drm_modes.c=0D
+++ b/drivers/gpu/drm/drm_modes.c=0D
@@ -2480,6 +2480,36 @@ bool drm_mode_parse_command_line_for_connector(const=
 char *mode_option,=0D
 }=0D
 EXPORT_SYMBOL(drm_mode_parse_command_line_for_connector);=0D
 =0D
+static struct drm_display_mode *drm_named_mode(struct drm_device *dev,=0D
+					       struct drm_cmdline_mode *cmd)=0D
+{=0D
+	struct drm_display_mode *mode;=0D
+	unsigned int i;=0D
+=0D
+	for (i =3D 0; i < ARRAY_SIZE(drm_named_modes); i++) {=0D
+		const struct drm_named_mode *named_mode =3D &drm_named_modes[i];=0D
+=0D
+		if (strcmp(cmd->name, named_mode->name))=0D
+			continue;=0D
+=0D
+		if (!named_mode->tv_mode)=0D
+			continue;=0D
+=0D
+		mode =3D drm_analog_tv_mode(dev,=0D
+					  named_mode->tv_mode,=0D
+					  named_mode->pixel_clock_khz * 1000,=0D
+					  named_mode->xres,=0D
+					  named_mode->yres,=0D
+					  named_mode->flags & DRM_MODE_FLAG_INTERLACE);=0D
+		if (!mode)=0D
+			return NULL;=0D
+=0D
+		return mode;=0D
+	}=0D
+=0D
+	return NULL;=0D
+}=0D
+=0D
 /**=0D
  * drm_mode_create_from_cmdline_mode - convert a command line modeline int=
o a DRM display mode=0D
  * @dev: DRM device to create the new mode for=0D
@@ -2497,7 +2527,9 @@ drm_mode_create_from_cmdline_mode(struct drm_device *=
dev,=0D
 	if (cmd->xres =3D=3D 0 || cmd->yres =3D=3D 0)=0D
 		return NULL;=0D
 =0D
-	if (cmd->cvt)=0D
+	if (strlen(cmd->name))=0D
+		mode =3D drm_named_mode(dev, cmd);=0D
+	else if (cmd->cvt)=0D
 		mode =3D drm_cvt_mode(dev,=0D
 				    cmd->xres, cmd->yres,=0D
 				    cmd->refresh_specified ? cmd->refresh : 60,=0D
diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/=
drm/tests/drm_client_modeset_test.c=0D
index 46335de7bc6b..4380cf670fb4 100644=0D
--- a/drivers/gpu/drm/tests/drm_client_modeset_test.c=0D
+++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c=0D
@@ -26,6 +26,20 @@ static int drm_client_modeset_connector_get_modes(struct=
 drm_connector *connecto=0D
 =0D
 	count =3D drm_add_modes_noedid(connector, 1920, 1200);=0D
 =0D
+	mode =3D drm_mode_analog_ntsc_480i(connector->dev);=0D
+	if (!mode)=0D
+		return -ENOMEM;=0D
+=0D
+	drm_mode_probed_add(connector, mode);=0D
+	count +=3D 1;=0D
+=0D
+	mode =3D drm_mode_analog_pal_576i(connector->dev);=0D
+	if (!mode)=0D
+		return -ENOMEM;=0D
+=0D
+	drm_mode_probed_add(connector, mode);=0D
+	count +=3D 1;=0D
+=0D
 	return count;=0D
 }=0D
 =0D
@@ -58,6 +72,9 @@ static int drm_client_modeset_test_init(struct kunit *tes=
t)=0D
 		return ret;=0D
 	drm_connector_helper_add(&priv->connector, &drm_client_modeset_connector_=
helper_funcs);=0D
 =0D
+	priv->connector.interlace_allowed =3D true;=0D
+	priv->connector.doublescan_allowed =3D true;=0D
+=0D
 	return 0;=0D
 }=0D
 =0D
@@ -97,8 +114,62 @@ static void drm_pick_cmdline_res_1920_1080_60(struct ku=
nit *test)=0D
 	KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));=0D
 }=0D
 =0D
+static void drm_pick_cmdline_named_ntsc(struct kunit *test)=0D
+{=0D
+	struct drm_client_modeset_test_priv *priv =3D test->priv;=0D
+	struct drm_device *drm =3D priv->drm;=0D
+	struct drm_connector *connector =3D &priv->connector;=0D
+	struct drm_cmdline_mode *cmdline_mode =3D &connector->cmdline_mode;=0D
+	struct drm_display_mode *mode;=0D
+	const char *cmdline =3D "NTSC";=0D
+	int ret;=0D
+=0D
+	KUNIT_ASSERT_TRUE(test,=0D
+			  drm_mode_parse_command_line_for_connector(cmdline,=0D
+								    connector,=0D
+								    cmdline_mode));=0D
+=0D
+	mutex_lock(&drm->mode_config.mutex);=0D
+	ret =3D drm_helper_probe_single_connector_modes(connector, 1920, 1080);=0D
+	mutex_unlock(&drm->mode_config.mutex);=0D
+	KUNIT_ASSERT_GT(test, ret, 0);=0D
+=0D
+	mode =3D drm_connector_pick_cmdline_mode(connector);=0D
+	KUNIT_ASSERT_PTR_NE(test, mode, NULL);=0D
+=0D
+	KUNIT_EXPECT_TRUE(test, drm_mode_equal(drm_mode_analog_ntsc_480i(drm), mo=
de));=0D
+}=0D
+=0D
+static void drm_pick_cmdline_named_pal(struct kunit *test)=0D
+{=0D
+	struct drm_client_modeset_test_priv *priv =3D test->priv;=0D
+	struct drm_device *drm =3D priv->drm;=0D
+	struct drm_connector *connector =3D &priv->connector;=0D
+	struct drm_cmdline_mode *cmdline_mode =3D &connector->cmdline_mode;=0D
+	struct drm_display_mode *mode;=0D
+	const char *cmdline =3D "PAL";=0D
+	int ret;=0D
+=0D
+	KUNIT_ASSERT_TRUE(test,=0D
+			  drm_mode_parse_command_line_for_connector(cmdline,=0D
+								    connector,=0D
+								    cmdline_mode));=0D
+=0D
+	mutex_lock(&drm->mode_config.mutex);=0D
+	ret =3D drm_helper_probe_single_connector_modes(connector, 1920, 1080);=0D
+	mutex_unlock(&drm->mode_config.mutex);=0D
+	KUNIT_ASSERT_GT(test, ret, 0);=0D
+=0D
+	mode =3D drm_connector_pick_cmdline_mode(connector);=0D
+	KUNIT_ASSERT_PTR_NE(test, mode, NULL);=0D
+=0D
+	KUNIT_EXPECT_TRUE(test, drm_mode_equal(drm_mode_analog_pal_576i(drm), mod=
e));=0D
+}=0D
+=0D
 static struct kunit_case drm_pick_cmdline_tests[] =3D {=0D
 	KUNIT_CASE(drm_pick_cmdline_res_1920_1080_60),=0D
+	KUNIT_CASE(drm_pick_cmdline_named_ntsc),=0D
+	KUNIT_CASE(drm_pick_cmdline_named_pal),=0D
 	{}=0D
 };=0D
 =0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D