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 21/41] drm/modes: Introduce more named modes
Date:   Mon, 29 Aug 2022 15:11:35 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-21-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

Now that we can easily extend the named modes list, let's add a few more=0D
analog TV modes that were used in the wild, and some unit tests to make=0D
sure it works as intended.=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 065dbfbd815e..7d769de4d31b 100644=0D
--- a/drivers/gpu/drm/drm_modes.c=0D
+++ b/drivers/gpu/drm/drm_modes.c=0D
@@ -2254,7 +2254,9 @@ struct drm_named_mode {=0D
 =0D
 static const struct drm_named_mode drm_named_modes[] =3D {=0D
 	NAMED_MODE("NTSC", 13500, 720, 480, DRM_MODE_FLAG_INTERLACE, DRM_MODE_TV_=
MODE_NTSC_M),=0D
+	NAMED_MODE("NTSC_J", 13500, 720, 480, DRM_MODE_FLAG_INTERLACE, DRM_MODE_T=
V_MODE_NTSC_J),=0D
 	NAMED_MODE("PAL", 13500, 720, 576, DRM_MODE_FLAG_INTERLACE, DRM_MODE_TV_M=
ODE_PAL_B),=0D
+	NAMED_MODE("PAL_M", 13500, 720, 480, DRM_MODE_FLAG_INTERLACE, DRM_MODE_TV=
_MODE_PAL_M),=0D
 };=0D
 =0D
 static int drm_mode_parse_cmdline_named_mode(const char *name,=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 4380cf670fb4..d6ecb5fbe159 100644=0D
--- a/drivers/gpu/drm/tests/drm_client_modeset_test.c=0D
+++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c=0D
@@ -140,6 +140,32 @@ static void drm_pick_cmdline_named_ntsc(struct kunit *=
test)=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_ntsc_j(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_J";=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
@@ -166,10 +192,38 @@ static void drm_pick_cmdline_named_pal(struct kunit *=
test)=0D
 	KUNIT_EXPECT_TRUE(test, drm_mode_equal(drm_mode_analog_pal_576i(drm), mod=
e));=0D
 }=0D
 =0D
+static void drm_pick_cmdline_named_pal_m(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_M";=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 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_ntsc_j),=0D
 	KUNIT_CASE(drm_pick_cmdline_named_pal),=0D
+	KUNIT_CASE(drm_pick_cmdline_named_pal_m),=0D
 	{}=0D
 };=0D
 =0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D