From: Thomas Zimmermann <tzimmermann@suse.de>
To: "Maxime Ripard" <maxime@cerno.tech>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
"Chen-Yu Tsai" <wens@csie.org>,
"Philipp Zabel" <p.zabel@pengutronix.de>,
"Jerome Brunet" <jbrunet@baylibre.com>,
"Samuel Holland" <samuel@sholland.org>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Emma Anholt" <emma@anholt.net>,
"David Airlie" <airlied@linux.ie>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Noralf Trønnes" <noralf@tronnes.org>,
"Kevin Hilman" <khilman@baylibre.com>,
"Neil Armstrong" <narmstrong@baylibre.com>,
"Maxime Ripard" <mripard@kernel.org>
Cc: Dom Cobley <dom@raspberrypi.com>,
Dave Stevenson <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-amlogic@lists.infradead.org, linux-sunxi@lists.linux.dev,
Phil Elwell <phil@raspberrypi.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v1 08/35] drm/client: Add some tests for drm_connector_pick_cmdline_mode()
Date: Tue, 2 Aug 2022 12:14:29 +0200 [thread overview]
Message-ID: <14d698dc-172c-773f-7ea1-7101b9f5b77f@suse.de> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v1-8-3d53ae722097@cerno.tech>
[-- Attachment #1.1: Type: text/plain, Size: 5661 bytes --]
Hi Maxime
Am 29.07.22 um 18:34 schrieb Maxime Ripard:
> drm_connector_pick_cmdline_mode() is in charge of finding a proper
> drm_display_mode from the definition we got in the video= command line
> argument.
>
> Let's add some unit tests to make sure we're not getting any regressions
> there.
>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> index bbc535cc50dd..ee6b8f193c24 100644
> --- a/drivers/gpu/drm/drm_client_modeset.c
> +++ b/drivers/gpu/drm/drm_client_modeset.c
> @@ -1237,3 +1237,7 @@ int drm_client_modeset_dpms(struct drm_client_dev *client, int mode)
> return ret;
> }
> EXPORT_SYMBOL(drm_client_modeset_dpms);
> +
> +#ifdef CONFIG_DRM_KUNIT_TEST
> +#include "tests/drm_mode_test.c"
> +#endif
Including source files is somewhat ugly, prolongs compile times and
could even interfere with the actual source code. Can we do this in some
other way?
I suggest to add the tests here and export them for use in the test
case. Something like
#ifdef CONFIG_DRM_KUNIT_TEST
static drm_mode_res_1920_1080_60()
{
...
}
struct kunit_case drm_mode_tests[] = {
drm_mode_res_1920_1080_60
};
EXPORT_SYMBOL(drm_mode_tests);
#endif
This would add the tests next to the tested code, but leave the test
driver in drm_mode_test.c.
Best regards
Thomas
> diff --git a/drivers/gpu/drm/tests/drm_mode_test.c b/drivers/gpu/drm/tests/drm_mode_test.c
> new file mode 100644
> index 000000000000..0f71519788a7
> --- /dev/null
> +++ b/drivers/gpu/drm/tests/drm_mode_test.c
> @@ -0,0 +1,132 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2022 Maxime Ripard <mripard@kernel.org>
> + */
> +
> +#include <drm/drm_mode.h>
> +#include <kunit/test.h>
> +
> +#include <drm/drm_connector.h>
> +#include <drm/drm_edid.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_modes.h>
> +#include <drm/drm_modeset_helper_vtables.h>
> +#include <drm/drm_probe_helper.h>
> +
> +struct drm_mode_test_priv {
> + struct device *dev;
> + struct drm_device *drm;
> + struct drm_connector connector;
> +};
> +
> +static const struct drm_mode_config_funcs drm_mode_config_funcs = {
> +};
> +
> +static const struct drm_driver drm_mode_driver = {
> +};
> +
> +static int drm_mode_connector_get_modes(struct drm_connector *connector)
> +{
> + struct drm_display_mode *mode;
> + int ret;
> +
> + ret = drm_add_modes_noedid(connector, 1920, 1200);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static const struct drm_connector_helper_funcs drm_mode_connector_helper_funcs = {
> + .get_modes = drm_mode_connector_get_modes,
> +};
> +
> +static const struct drm_connector_funcs drm_mode_connector_funcs = {
> +};
> +
> +static int drm_mode_test_init(struct kunit *test)
> +{
> + struct drm_mode_test_priv *priv;
> + int ret;
> +
> + priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
> + test->priv = priv;
> +
> + priv->dev = root_device_register("drm-mode-test");
> + if (IS_ERR(priv->dev))
> + return PTR_ERR(priv->dev);
> +
> + priv->drm = drm_dev_alloc(&drm_mode_driver, priv->dev);
> + if (IS_ERR(priv->drm))
> + return PTR_ERR(priv->drm);
> + priv->drm->mode_config.funcs = &drm_mode_config_funcs;
> +
> + ret = drmm_mode_config_init(priv->drm);
> + if (ret)
> + return ret;
> +
> + ret = drmm_connector_init(priv->drm, &priv->connector,
> + &drm_mode_connector_funcs,
> + DRM_MODE_CONNECTOR_Unknown,
> + NULL);
> + if (ret)
> + return ret;
> + drm_connector_helper_add(&priv->connector, &drm_mode_connector_helper_funcs);
> +
> + return 0;
> +}
> +
> +static void drm_mode_test_exit(struct kunit *test)
> +{
> + struct drm_mode_test_priv *priv = test->priv;
> +
> + drm_dev_put(priv->drm);
> + root_device_unregister(priv->dev);
> +}
> +
> +static void drm_mode_res_1920_1080_60(struct kunit *test)
> +{
> + struct drm_mode_test_priv *priv = test->priv;
> + struct drm_device *drm = priv->drm;
> + struct drm_connector *connector = &priv->connector;
> + struct drm_cmdline_mode *cmdline_mode = &connector->cmdline_mode;
> + struct drm_display_mode *expected_mode, *mode;
> + const char *cmdline = "1920x1080@60";
> + int ret;
> +
> + expected_mode = drm_mode_find_dmt(priv->drm, 1920, 1080, 60, false);
> + KUNIT_ASSERT_PTR_NE(test, expected_mode, NULL);
> +
> + KUNIT_ASSERT_TRUE(test,
> + drm_mode_parse_command_line_for_connector(cmdline,
> + connector,
> + cmdline_mode));
> +
> + mutex_lock(&drm->mode_config.mutex);
> + ret = drm_helper_probe_single_connector_modes(connector, 1920, 1080);
> + mutex_unlock(&drm->mode_config.mutex);
> + KUNIT_ASSERT_GT(test, ret, 0);
> +
> + mode = drm_connector_pick_cmdline_mode(connector);
> + KUNIT_ASSERT_PTR_NE(test, mode, NULL);
> +
> + KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));
> +}
> +
> +static struct kunit_case drm_mode_tests[] = {
> + KUNIT_CASE(drm_mode_res_1920_1080_60),
> + {}
> +};
> +
> +static struct kunit_suite drm_mode_test_suite = {
> + .name = "drm_mode",
> + .init = drm_mode_test_init,
> + .exit = drm_mode_test_exit,
> + .test_cases = drm_mode_tests
> +};
> +
> +kunit_test_suite(drm_mode_test_suite);
> +MODULE_AUTHOR("Maxime Ripard <mripard@kernel.org>");
> +MODULE_LICENSE("GPL");
>
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 840 bytes --]
next prev parent reply other threads:[~2022-08-02 10:14 UTC|newest]
Thread overview: 151+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 16:34 [PATCH v1 00/35] drm: Analog TV Improvements Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 01/35] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
2022-08-08 12:25 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 02/35] drm/connector: Rename subconnector state variable Maxime Ripard
2022-08-08 12:26 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 03/35] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
2022-08-08 12:30 ` Noralf Trønnes
2022-08-15 7:35 ` Maxime Ripard
2022-08-15 10:48 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 04/35] drm/modes: Introduce 480i and 576i modes Maxime Ripard
2022-08-02 13:58 ` Jani Nikula
2022-08-02 14:16 ` Thomas Zimmermann
2022-08-16 11:58 ` Maxime Ripard
2022-08-12 13:18 ` Geert Uytterhoeven
2022-08-16 13:26 ` Maxime Ripard
2022-08-16 15:00 ` Geert Uytterhoeven
2022-08-17 7:53 ` Maxime Ripard
2022-08-17 8:51 ` Geert Uytterhoeven
2022-08-17 13:14 ` Maxime Ripard
2022-08-17 14:01 ` Geert Uytterhoeven
2022-08-18 12:39 ` Maxime Ripard
2022-08-18 12:57 ` Geert Uytterhoeven
2022-08-18 13:42 ` Maxime Ripard
2022-08-18 15:34 ` Geert Uytterhoeven
2022-08-18 15:46 ` Maxime Ripard
2022-08-18 15:56 ` Geert Uytterhoeven
2022-08-24 16:42 ` Mateusz Kwiatkowski
2022-08-29 13:29 ` Maxime Ripard
2022-08-29 14:14 ` Geert Uytterhoeven
2022-08-29 14:33 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 05/35] drm/connector: Add TV standard property Maxime Ripard
2022-08-08 12:44 ` Noralf Trønnes
2022-08-16 8:26 ` Maxime Ripard
2022-08-16 9:42 ` Noralf Trønnes
2022-08-16 9:49 ` Maxime Ripard
2022-08-16 19:35 ` Noralf Trønnes
2022-08-17 11:46 ` Maxime Ripard
2022-08-17 13:11 ` Noralf Trønnes
2022-08-17 23:23 ` Noralf Trønnes
2022-08-18 15:01 ` Noralf Trønnes
2022-08-18 15:31 ` Maxime Ripard
2022-08-21 11:43 ` Noralf Trønnes
2022-08-26 8:21 ` Maxime Ripard
2022-08-18 15:27 ` Maxime Ripard
2022-08-12 13:25 ` Geert Uytterhoeven
2022-08-16 13:20 ` Maxime Ripard
2022-08-16 13:29 ` Geert Uytterhoeven
2022-08-16 14:11 ` Maxime Ripard
2022-08-16 14:43 ` Geert Uytterhoeven
2022-08-16 15:49 ` Maxime Ripard
2022-08-17 7:31 ` Geert Uytterhoeven
2022-08-17 7:32 ` Geert Uytterhoeven
2022-08-17 7:47 ` Maxime Ripard
2022-08-17 8:35 ` Geert Uytterhoeven
2022-08-17 11:14 ` Maxime Ripard
2022-08-17 13:05 ` Geert Uytterhoeven
2022-08-17 13:18 ` Maxime Ripard
2022-08-17 14:04 ` Geert Uytterhoeven
2022-08-18 14:54 ` Maxime Ripard
2022-08-18 15:20 ` Geert Uytterhoeven
2022-08-18 15:34 ` Maxime Ripard
2022-08-19 9:35 ` Geert Uytterhoeven
2022-08-25 13:39 ` Maxime Ripard
2022-08-20 20:12 ` Noralf Trønnes
2022-08-25 13:44 ` Maxime Ripard
2022-08-25 15:13 ` Noralf Trønnes
2022-08-29 8:28 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 06/35] drm/connector: Only register TV mode property if present Maxime Ripard
2022-08-08 12:49 ` Noralf Trønnes
2022-08-15 10:40 ` Maxime Ripard
2022-08-15 10:49 ` Noralf Trønnes
2022-07-29 16:34 ` [PATCH v1 07/35] drm/modes: Only consider bpp and refresh before options Maxime Ripard
2022-08-12 13:25 ` Geert Uytterhoeven
2022-08-16 12:20 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 08/35] drm/client: Add some tests for drm_connector_pick_cmdline_mode() Maxime Ripard
2022-08-02 10:14 ` Thomas Zimmermann [this message]
2022-08-15 8:42 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 09/35] drm/modes: Move named modes parsing to a separate function Maxime Ripard
2022-08-12 13:27 ` Geert Uytterhoeven
2022-08-16 13:46 ` Maxime Ripard
2022-08-16 14:44 ` Geert Uytterhoeven
2022-07-29 16:34 ` [PATCH v1 10/35] drm/modes: Switch to named mode descriptors Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 11/35] drm/modes: Fill drm_cmdline mode from named modes Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 12/35] drmi/modes: Properly generate a drm_display_mode from a named mode Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 13/35] drm/atomic-helper: Add a TV properties reset helper Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 14/35] drm/atomic-helper: Add an analog TV atomic_check implementation Maxime Ripard
2022-07-29 17:16 ` Mateusz Kwiatkowski
2022-08-15 8:30 ` Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 15/35] drm/vc4: vec: Remove empty mode_fixup Maxime Ripard
2022-07-29 16:34 ` [PATCH v1 16/35] drm/vc4: vec: Convert to atomic helpers Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 17/35] drm/vc4: vec: Refactor VEC TV mode setting Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 18/35] drm/vc4: vec: Remove redundant atomic_mode_set Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 19/35] drm/vc4: vec: Fix timings for VEC modes Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 20/35] drm/vc4: vec: Switch for common modes Maxime Ripard
2022-07-29 18:12 ` Mateusz Kwiatkowski
2022-08-16 11:57 ` Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 21/35] drm/vc4: vec: Fix definition of PAL-M mode Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 22/35] drm/vc4: vec: Use TV Reset implementation Maxime Ripard
2022-07-30 3:03 ` kernel test robot
2022-07-29 16:35 ` [PATCH v1 23/35] drm/vc4: vec: Convert to the new TV mode property Maxime Ripard
2022-08-20 17:22 ` Noralf Trønnes
2022-08-24 15:26 ` Maxime Ripard
2022-08-25 13:14 ` Noralf Trønnes
2022-08-29 12:13 ` Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 24/35] drm/vc4: vec: Add support for more analog TV standards Maxime Ripard
2022-07-29 17:55 ` Mateusz Kwiatkowski
2022-08-15 8:37 ` Maxime Ripard
2022-08-24 16:59 ` Mateusz Kwiatkowski
2022-07-29 16:35 ` [PATCH v1 25/35] drm/sun4i: tv: Remove unused mode_valid Maxime Ripard
2022-07-30 9:13 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 26/35] drm/sun4i: tv: Convert to atomic hooks Maxime Ripard
2022-07-30 9:12 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 27/35] drm/sun4i: tv: Merge mode_set into atomic_enable Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 28/35] drm/sun4i: tv: Remove useless function Maxime Ripard
2022-07-29 16:35 ` [PATCH v1 29/35] drm/sun4i: tv: Remove useless destroy function Maxime Ripard
2022-07-30 9:14 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 30/35] drm/sun4i: tv: Rename error label Maxime Ripard
2022-07-30 9:15 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 31/35] drm/sun4i: tv: Add missing reset assertion Maxime Ripard
2022-07-30 9:16 ` Jernej Škrabec
2022-07-29 16:35 ` [PATCH v1 32/35] drm/sun4i: tv: Convert to the new TV mode property Maxime Ripard
2022-08-28 17:12 ` Noralf Trønnes
2022-07-29 16:35 ` [PATCH v1 33/35] drm/connector: Remove TV modes property Maxime Ripard
2022-07-29 20:06 ` kernel test robot
2022-07-29 20:16 ` kernel test robot
2022-07-29 16:35 ` [PATCH v1 34/35] drm/modes: Introduce the tv_mode property as a command-line option Maxime Ripard
2022-08-12 13:31 ` Geert Uytterhoeven
2022-08-16 13:51 ` Maxime Ripard
2022-08-20 20:18 ` Noralf Trønnes
2022-08-24 15:45 ` Maxime Ripard
2022-08-24 17:08 ` Mateusz Kwiatkowski
2022-08-25 12:41 ` Noralf Trønnes
2022-08-26 6:46 ` Maxime Ripard
2022-08-28 17:06 ` Noralf Trønnes
2022-07-29 16:35 ` [PATCH v1 35/35] drm/modes: Introduce more named modes Maxime Ripard
2022-08-21 16:16 ` Noralf Trønnes
2022-08-25 14:22 ` Maxime Ripard
2022-08-08 13:03 ` [PATCH v1 00/35] drm: Analog TV Improvements Noralf Trønnes
2022-08-21 16:33 ` Noralf Trønnes
2022-08-22 7:48 ` Maxime Ripard
2022-08-22 8:57 ` Mateusz Kwiatkowski
2022-08-25 15:55 ` Maxime Ripard
2022-08-25 16:17 ` Mateusz Kwiatkowski
2022-08-26 4:07 ` Mateusz Kwiatkowski
2022-08-26 8:39 ` Maxime Ripard
2022-08-26 14:56 ` Dom Cobley
2022-08-27 16:11 ` Noralf Trønnes
2022-08-30 21:31 ` kFYatek
2022-08-22 13:21 ` Noralf Trønnes
2022-08-25 16:21 ` Maxime Ripard
2022-08-25 19:36 ` Noralf Trønnes
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=14d698dc-172c-773f-7ea1-7101b9f5b77f@suse.de \
--to=tzimmermann@suse.de \
--cc=airlied@linux.ie \
--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=jbrunet@baylibre.com \
--cc=jernej.skrabec@gmail.com \
--cc=kfyatek+publicgit@gmail.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=martin.blumenstingl@googlemail.com \
--cc=maxime@cerno.tech \
--cc=mripard@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=noralf@tronnes.org \
--cc=p.zabel@pengutronix.de \
--cc=phil@raspberrypi.com \
--cc=samuel@sholland.org \
--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).