From: Maxime Ripard <mripard@kernel.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Emma Anholt" <emma@anholt.net>,
"Jonathan Corbet" <corbet@lwn.net>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Chen-Yu Tsai" <wens@csie.org>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev,
Maxime Ripard <mripard@kernel.org>
Subject: [PATCH v5 03/44] drm/tests: Add helper to create mock plane
Date: Thu, 07 Dec 2023 16:49:26 +0100 [thread overview]
Message-ID: <20231207-kms-hdmi-connector-state-v5-3-6538e19d634d@kernel.org> (raw)
In-Reply-To: <20231207-kms-hdmi-connector-state-v5-0-6538e19d634d@kernel.org>
We're going to need a full-blown, functional, KMS device to test more
components of the atomic modesetting infrastructure.
Let's add a new helper to create a dumb, mocked, primary plane. By
default, it will create a linear XRGB8888 plane, using the default
helpers.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/tests/drm_kunit_helpers.c | 85 +++++++++++++++++++++++++++++++
include/drm/drm_kunit_helpers.h | 11 ++++
2 files changed, 96 insertions(+)
diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c
index 272a3ba46d60..e0778a7ec260 100644
--- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
@@ -3,6 +3,7 @@
#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_drv.h>
+#include <drm/drm_fourcc.h>
#include <drm/drm_kunit_helpers.h>
#include <drm/drm_managed.h>
@@ -236,5 +237,89 @@ drm_kunit_helper_atomic_state_alloc(struct kunit *test,
}
EXPORT_SYMBOL_GPL(drm_kunit_helper_atomic_state_alloc);
+static const uint32_t default_plane_formats[] = {
+ DRM_FORMAT_XRGB8888,
+};
+
+static const uint64_t default_plane_modifiers[] = {
+ DRM_FORMAT_MOD_LINEAR,
+ DRM_FORMAT_MOD_INVALID
+};
+
+static const struct drm_plane_helper_funcs default_plane_helper_funcs = {
+};
+
+static const struct drm_plane_funcs default_plane_funcs = {
+ .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
+ .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
+ .reset = drm_atomic_helper_plane_reset,
+};
+
+/**
+ * drm_kunit_helper_create_primary_plane - Creates a mock primary plane for a KUnit test
+ * @test: The test context object
+ * @drm: The device to alloc the plane for
+ * @funcs: Callbacks for the new plane. Optional.
+ * @helper_funcs: Helpers callbacks for the new plane. Optional.
+ * @formats: array of supported formats (DRM_FORMAT\_\*). Optional.
+ * @num_formats: number of elements in @formats
+ * @modifiers: array of struct drm_format modifiers terminated by
+ * DRM_FORMAT_MOD_INVALID. Optional.
+ *
+ * This allocates and initializes a mock struct &drm_plane meant to be
+ * part of a mock device for a KUnit test.
+ *
+ * Resources will be cleaned up automatically.
+ *
+ * @funcs will default to the default helpers implementations.
+ * @helper_funcs will default to an empty implementation. @formats will
+ * default to XRGB8888 only. @modifiers will default to a linear
+ * modifier only.
+ *
+ * Returns:
+ * A pointer to the new plane, or an ERR_PTR() otherwise.
+ */
+struct drm_plane *
+drm_kunit_helper_create_primary_plane(struct kunit *test,
+ struct drm_device *drm,
+ const struct drm_plane_funcs *funcs,
+ const struct drm_plane_helper_funcs *helper_funcs,
+ const uint32_t *formats,
+ unsigned int num_formats,
+ const uint64_t *modifiers)
+{
+ struct drm_plane *plane;
+
+ if (!funcs)
+ funcs = &default_plane_funcs;
+
+ if (!helper_funcs)
+ helper_funcs = &default_plane_helper_funcs;
+
+ if (!formats || !num_formats) {
+ formats = default_plane_formats;
+ num_formats = ARRAY_SIZE(default_plane_formats);
+ }
+
+ if (!modifiers)
+ modifiers = default_plane_modifiers;
+
+ plane = __drmm_universal_plane_alloc(drm,
+ sizeof(struct drm_plane), 0,
+ 0,
+ funcs,
+ formats,
+ num_formats,
+ default_plane_modifiers,
+ DRM_PLANE_TYPE_PRIMARY,
+ NULL);
+ KUNIT_ASSERT_NOT_ERR_OR_NULL(test, plane);
+
+ drm_plane_helper_add(plane, helper_funcs);
+
+ return plane;
+}
+EXPORT_SYMBOL_GPL(drm_kunit_helper_create_primary_plane);
+
MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
MODULE_LICENSE("GPL");
diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h
index 3ae19892229d..38667d624aa8 100644
--- a/include/drm/drm_kunit_helpers.h
+++ b/include/drm/drm_kunit_helpers.h
@@ -10,6 +10,8 @@
#include <kunit/test.h>
struct drm_device;
+struct drm_plane_funcs;
+struct drm_plane_helper_funcs;
struct kunit;
struct device *drm_kunit_helper_alloc_device(struct kunit *test);
@@ -99,4 +101,13 @@ drm_kunit_helper_atomic_state_alloc(struct kunit *test,
struct drm_device *drm,
struct drm_modeset_acquire_ctx *ctx);
+struct drm_plane *
+drm_kunit_helper_create_primary_plane(struct kunit *test,
+ struct drm_device *drm,
+ const struct drm_plane_funcs *funcs,
+ const struct drm_plane_helper_funcs *helper_funcs,
+ const uint32_t *formats,
+ unsigned int num_formats,
+ const uint64_t *modifiers);
+
#endif // DRM_KUNIT_HELPERS_H_
--
2.43.0
next prev parent reply other threads:[~2023-12-07 15:49 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 15:49 [PATCH v5 00/44] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 01/44] drm/tests: helpers: Include missing drm_drv header Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 02/44] drm/tests: helpers: Add atomic helpers Maxime Ripard
2023-12-07 15:49 ` Maxime Ripard [this message]
2023-12-07 15:49 ` [PATCH v5 04/44] drm/tests: Add helper to create mock crtc Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 05/44] drm/tests: connector: Add tests for drmm_connector_init Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 06/44] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2023-12-14 14:39 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 07/44] drm/connector: hdmi: Create an HDMI sub-state Maxime Ripard
2023-12-14 14:40 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 08/44] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2023-12-14 14:43 ` Dave Stevenson
2024-01-12 13:59 ` Maxime Ripard
2024-01-12 15:59 ` Dave Stevenson
2024-01-15 14:33 ` Sebastian Wick
2024-01-15 14:37 ` Sebastian Wick
2024-01-15 15:30 ` Maxime Ripard
2024-02-02 13:01 ` Maxime Ripard
2024-02-02 15:40 ` Ville Syrjälä
2024-02-02 15:59 ` Maxime Ripard
2024-02-02 16:37 ` Ville Syrjälä
2024-02-05 9:39 ` Maxime Ripard
2024-02-09 20:34 ` Sebastian Wick
2024-02-12 10:01 ` Maxime Ripard
2024-02-12 15:49 ` Ville Syrjälä
2024-02-12 16:39 ` Hans Verkuil
2024-02-12 17:00 ` Maxime Ripard
2024-02-12 16:53 ` Re: Re: Re: " Maxime Ripard
2024-02-12 17:06 ` Sebastian Wick
2024-02-15 11:00 ` Maxime Ripard
2024-02-19 14:01 ` Sebastian Wick
2024-02-22 10:54 ` Maxime Ripard
2024-02-22 12:58 ` Ville Syrjälä
2024-02-22 13:12 ` Sebastian Wick
2024-02-22 13:20 ` Maxime Ripard
2024-02-13 8:38 ` Re: Re: Re: Re: " Ville Syrjälä
2024-02-15 10:53 ` Maxime Ripard
2024-02-15 15:09 ` Ville Syrjälä
2024-01-15 15:25 ` Maxime Ripard
2024-01-18 21:21 ` Sebastian Wick
2024-02-02 11:04 ` Jani Nikula
2024-02-02 11:20 ` Hans Verkuil
2024-02-02 16:35 ` Ville Syrjälä
2024-02-02 15:49 ` Maxime Ripard
2024-02-09 20:30 ` Sebastian Wick
2024-02-12 9:55 ` Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 09/44] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2023-12-14 14:46 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 10/44] drm/connector: hdmi: Add output BPC " Maxime Ripard
2023-12-14 14:48 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 11/44] drm/connector: hdmi: Add support for output format Maxime Ripard
2023-12-14 14:52 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 12/44] drm/connector: hdmi: Add HDMI compute clock helper Maxime Ripard
2023-12-14 15:02 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 13/44] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2023-12-14 15:04 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 14/44] drm/connector: hdmi: Add custom hook to filter " Maxime Ripard
2023-12-14 15:06 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 15/44] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2023-12-14 15:10 ` Dave Stevenson
2024-02-01 12:51 ` Maxime Ripard
2024-02-01 15:33 ` Dave Stevenson
2024-02-01 16:50 ` Maxime Ripard
2024-02-02 13:58 ` Jani Nikula
2023-12-07 15:49 ` [PATCH v5 16/44] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 17/44] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 18/44] drm/vc4: hdmi: Create destroy state implementation Maxime Ripard
2023-12-12 11:40 ` Dave Stevenson
2023-12-14 8:48 ` Maxime Ripard
2023-12-13 15:22 ` (subset) " Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 19/44] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 20/44] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 21/44] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 22/44] drm/rockchip: inno_hdmi: Remove useless mode_fixup Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 23/44] drm/rockchip: inno_hdmi: Remove useless copy of drm_display_mode Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 24/44] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 25/44] drm/rockchip: inno_hdmi: Get rid of mode_set Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 26/44] drm/rockchip: inno_hdmi: no need to store vic Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 27/44] drm/rockchip: inno_hdmi: Remove unneeded has audio flag Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 28/44] drm/rockchip: inno_hdmi: Remove useless input format Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 29/44] drm/rockchip: inno_hdmi: Remove useless output format Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 30/44] drm/rockchip: inno_hdmi: Remove useless colorimetry Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 31/44] drm/rockchip: inno_hdmi: Remove useless enum Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 32/44] drm/rockchip: inno_hdmi: Remove tmds rate from structure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 33/44] drm/rockchip: inno_hdmi: Remove useless coeff_csc matrix Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 34/44] drm/rockchip: inno_hdmi: Remove useless mode_valid Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 35/44] drm/rockchip: inno_hdmi: Drop HDMI Vendor Infoframe support Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 36/44] drm/rockchip: inno_hdmi: Move infoframe disable to separate function Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 37/44] drm/rockchip: inno_hdmi: Switch to infoframe type Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 38/44] drm/rockchip: inno_hdmi: Remove unused drm device pointer Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 39/44] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 40/44] drm/sun4i: hdmi: Convert encoder to atomic Maxime Ripard
2023-12-21 14:33 ` [v5,40/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 41/44] drm/sun4i: hdmi: Move mode_set into enable Maxime Ripard
2023-12-21 14:43 ` [v5,41/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 42/44] drm/sun4i: hdmi: Switch to container_of_const Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 43/44] drm/sun4i: hdmi: Consolidate atomic_check and mode_valid Maxime Ripard
2023-12-21 14:53 ` [v5,43/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 44/44] drm/sun4i: hdmi: Switch to HDMI connector 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=20231207-kms-hdmi-connector-state-v5-3-6538e19d634d@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=samuel@sholland.org \
--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).