From: "Maíra Canal" <mcanal@igalia.com>
To: Maxime Ripard <maxime@cerno.tech>,
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: "Dom Cobley" <dom@raspberrypi.com>,
"Dave Stevenson" <dave.stevenson@raspberrypi.com>,
"Phil Elwell" <phil@raspberrypi.com>,
nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
"Mateusz Kwiatkowski" <kfyatek+publicgit@gmail.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Noralf Trønnes" <noralf@tronnes.org>,
"Geert Uytterhoeven" <geert@linux-m68k.org>,
linux-sunxi@lists.linux.dev,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 14/30] drm/client: Add some tests for drm_connector_pick_cmdline_mode()
Date: Sat, 1 Oct 2022 14:42:18 -0300 [thread overview]
Message-ID: <4d9d7795-7e98-5bca-14fd-8e8f86da31b3@igalia.com> (raw)
In-Reply-To: <20220728-rpi-analog-tv-properties-v4-14-60d38873f782@cerno.tech>
On 9/29/22 13:31, Maxime Ripard wrote:
> 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>
>
> ---
> Changes in v4:
> - Removed MODULE macros
> ---
> drivers/gpu/drm/drm_client_modeset.c | 4 +
> drivers/gpu/drm/tests/drm_client_modeset_test.c | 105 ++++++++++++++++++++++++
> 2 files changed, 109 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c
> index bbc535cc50dd..d553e793e673 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_client_modeset_test.c"
> +#endif
> diff --git a/drivers/gpu/drm/tests/drm_client_modeset_test.c b/drivers/gpu/drm/tests/drm_client_modeset_test.c
> new file mode 100644
> index 000000000000..09dc5acbbc42
> --- /dev/null
> +++ b/drivers/gpu/drm/tests/drm_client_modeset_test.c
> @@ -0,0 +1,105 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2022 Maxime Ripard <mripard@kernel.org>
> + */
> +
> +#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>
> +
> +#include "drm_kunit_helpers.h"
> +
> +struct drm_client_modeset_test_priv {
> + struct drm_device *drm;
> + struct drm_connector connector;
> +};
> +
> +static int drm_client_modeset_connector_get_modes(struct drm_connector *connector)
> +{
> + struct drm_display_mode *mode;
Small nit: I guess this should be added on patch 21/30, as it is not
being currently used.
> + int count;
> +
> + count = drm_add_modes_noedid(connector, 1920, 1200);
> +
> + return count;
> +}
> +
> +static const struct drm_connector_helper_funcs drm_client_modeset_connector_helper_funcs = {
> + .get_modes = drm_client_modeset_connector_get_modes,
> +};
> +
> +static const struct drm_connector_funcs drm_client_modeset_connector_funcs = {
> +};
> +
> +static int drm_client_modeset_test_init(struct kunit *test)
> +{
> + struct drm_client_modeset_test_priv *priv;
> + int ret;
> +
> + priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
> + if (!priv)
> + return -ENOMEM;
I believe it would be nicer to use KUNIT_ASSERT_NOT_NULL here, instead
of returning a error.
> + test->priv = priv;
> +
> + priv->drm = drm_kunit_device_init(test, "drm-client-modeset-test");
> + if (IS_ERR(priv->drm))
> + return PTR_ERR(priv->drm);
Here you could use KUNIT_ASSERT_NOT_ERR_OR_NULL.
> +
> + ret = drmm_connector_init(priv->drm, &priv->connector,
> + &drm_client_modeset_connector_funcs,
> + DRM_MODE_CONNECTOR_Unknown,
> + NULL);
> + if (ret)
> + return ret;
Same idea here. This would make it more compliant to the KUnit API.
> + drm_connector_helper_add(&priv->connector, &drm_client_modeset_connector_helper_funcs);
> +
> + return 0;
> +
> +}
> +
> +static void drm_pick_cmdline_res_1920_1080_60(struct kunit *test)
> +{
> + struct drm_client_modeset_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);
You could use KUNIT_ASSERT_NOT_NULL here.
> +
> + 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);
You could also use KUNIT_ASSERT_NOT_NULL here.
This idea could also apply to the patches 21/30 and 22/30, which have a
similar structure and are also using KUNIT_ASSERT_PTR_NE.
Best Regards,
- Maíra Canal
> +
> + KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));
> +}
> +
> +static struct kunit_case drm_pick_cmdline_tests[] = {
> + KUNIT_CASE(drm_pick_cmdline_res_1920_1080_60),
> + {}
> +};
> +
> +static struct kunit_suite drm_pick_cmdline_test_suite = {
> + .name = "drm_pick_cmdline",
> + .init = drm_client_modeset_test_init,
> + .test_cases = drm_pick_cmdline_tests
> +};
> +
> +kunit_test_suite(drm_pick_cmdline_test_suite);
>
next prev parent reply other threads:[~2022-10-01 17:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220728-rpi-analog-tv-properties-v4-0-60d38873f782@cerno.tech>
[not found] ` <20220728-rpi-analog-tv-properties-v4-1-60d38873f782@cerno.tech>
2022-09-30 11:34 ` [PATCH v4 01/30] drm/docs: Remove unused TV Standard property Noralf Trønnes
[not found] ` <20220728-rpi-analog-tv-properties-v4-10-60d38873f782@cerno.tech>
2022-09-30 11:46 ` [PATCH v4 10/30] drm/connector: Add TV standard property Noralf Trønnes
[not found] ` <20220728-rpi-analog-tv-properties-v4-3-60d38873f782@cerno.tech>
2022-09-30 14:47 ` [PATCH v4 03/30] drm/tests: Add Kunit Helpers Noralf Trønnes
[not found] ` <20220728-rpi-analog-tv-properties-v4-30-60d38873f782@cerno.tech>
2022-10-01 12:37 ` [PATCH v4 30/30] drm/sun4i: tv: Convert to the new TV mode property Noralf Trønnes
[not found] ` <20220728-rpi-analog-tv-properties-v4-11-60d38873f782@cerno.tech>
2022-10-01 12:52 ` [PATCH v4 11/30] drm/modes: Add a function to generate analog display modes 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-10-01 13:12 ` [PATCH v4 00/30] drm: Analog TV Improvements Noralf Trønnes
2022-10-10 12:11 ` Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-14-60d38873f782@cerno.tech>
2022-10-01 17:42 ` Maíra Canal [this message]
[not found] ` <20220728-rpi-analog-tv-properties-v4-2-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 02/30] drm/tests: Order Kunit tests in Makefile Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-4-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 04/30] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-5-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 05/30] drm/connector: Rename subconnector state variable Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-6-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 06/30] drm/atomic: Add TV subconnector property to get/set_property Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-12-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 12/30] drm/modes: Only consider bpp and refresh before options Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-13-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 13/30] drm/modes: parse_cmdline: Add support for named modes containing dashes Maxime Ripard
[not found] ` <20220728-rpi-analog-tv-properties-v4-25-60d38873f782@cerno.tech>
2022-10-10 12:10 ` (subset) [PATCH v4 25/30] drm/vc4: vec: Fix definition of PAL-M mode 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=4d9d7795-7e98-5bca-14fd-8e8f86da31b3@igalia.com \
--to=mcanal@igalia.com \
--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=maxime@cerno.tech \
--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).