From: Maxime Ripard <mripard@kernel.org>
To: David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Emma Anholt <emma@anholt.net>
Cc: "Maíra Canal" <mairacanal@riseup.net>,
"Javier Martinez Canillas" <javierm@redhat.com>,
dri-devel@lists.freedesktop.org,
"David Gow" <davidgow@google.com>,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
linux-kernel@vger.kernel.org,
"Maxime Ripard" <mripard@kernel.org>,
"Brendan Higgins" <brendan.higgins@linux.dev>
Subject: [PATCH v2 05/11] drm/tests: helpers: Create a helper to allocate a locking ctx
Date: Thu, 20 Jul 2023 13:15:50 +0200 [thread overview]
Message-ID: <20230720-kms-kunit-actions-rework-v2-5-175017bd56ab@kernel.org> (raw)
In-Reply-To: <20230720-kms-kunit-actions-rework-v2-0-175017bd56ab@kernel.org>
As we get more and more tests, the locking context initialisation
creates more and more boilerplate, both at creation and destruction.
Let's create a helper that will allocate, initialise a context, and
register kunit actions to clean up once the test is done.
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/tests/drm_kunit_helpers.c | 41 +++++++++++++++++++++++++++++++
include/drm/drm_kunit_helpers.h | 2 ++
2 files changed, 43 insertions(+)
diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c
index 5856beb7f7d7..5130d4553262 100644
--- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
+++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
@@ -120,5 +120,46 @@ __drm_kunit_helper_alloc_drm_device_with_driver(struct kunit *test,
}
EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device_with_driver);
+static void action_drm_release_context(void *ptr)
+{
+ struct drm_modeset_acquire_ctx *ctx = ptr;
+
+ drm_modeset_drop_locks(ctx);
+ drm_modeset_acquire_fini(ctx);
+}
+
+/**
+ * drm_kunit_helper_context_alloc - Allocates an acquire context
+ * @test: The test context object
+ *
+ * Allocates and initializes a modeset acquire context.
+ *
+ * The context is tied to the kunit test context, so we must not call
+ * drm_modeset_acquire_fini() on it, it will be done so automatically.
+ *
+ * Returns:
+ * An ERR_PTR on error, a pointer to the newly allocated context otherwise
+ */
+struct drm_modeset_acquire_ctx *
+drm_kunit_helper_acquire_ctx_alloc(struct kunit *test)
+{
+ struct drm_modeset_acquire_ctx *ctx;
+ int ret;
+
+ ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL);
+ KUNIT_ASSERT_NOT_NULL(test, ctx);
+
+ drm_modeset_acquire_init(ctx, 0);
+
+ ret = kunit_add_action_or_reset(test,
+ action_drm_release_context,
+ ctx);
+ if (ret)
+ return ERR_PTR(ret);
+
+ return ctx;
+}
+EXPORT_SYMBOL_GPL(drm_kunit_helper_acquire_ctx_alloc);
+
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 ed013fdcc1ff..4ba5e10653c6 100644
--- a/include/drm/drm_kunit_helpers.h
+++ b/include/drm/drm_kunit_helpers.h
@@ -87,5 +87,7 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test,
sizeof(_type), \
offsetof(_type, _member), \
_feat))
+struct drm_modeset_acquire_ctx *
+drm_kunit_helper_acquire_ctx_alloc(struct kunit *test);
#endif // DRM_KUNIT_HELPERS_H_
--
2.41.0
next prev parent reply other threads:[~2023-07-20 11:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 11:15 [PATCH v2 00/11] drm: kunit: Switch to kunit actions Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 01/11] drm/tests: helpers: " Maxime Ripard
2023-07-20 17:14 ` kernel test robot
2023-07-24 11:19 ` Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 02/11] drm/tests: client-modeset: Remove call to drm_kunit_helper_free_device() Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 03/11] drm/tests: modes: " Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 04/11] drm/tests: probe-helper: " Maxime Ripard
2023-07-20 11:15 ` Maxime Ripard [this message]
2023-07-20 14:37 ` [PATCH v2 05/11] drm/tests: helpers: Create a helper to allocate a locking ctx kernel test robot
2023-07-20 11:15 ` [PATCH v2 06/11] drm/tests: helpers: Create a helper to allocate an atomic state Maxime Ripard
2023-07-20 18:06 ` kernel test robot
2023-07-20 11:15 ` [PATCH v2 07/11] drm/vc4: tests: pv-muxing: Remove call to drm_kunit_helper_free_device() Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 08/11] drm/vc4: tests: mock: Use a kunit action to unregister DRM device Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 09/11] drm/vc4: tests: pv-muxing: Switch to managed locking init Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 10/11] drm/vc4: tests: Switch to atomic state allocation helper Maxime Ripard
2023-07-20 11:15 ` [PATCH v2 11/11] drm/vc4: tests: pv-muxing: Document test scenario Maxime Ripard
2023-07-23 14:22 ` [PATCH v2 00/11] drm: kunit: Switch to kunit actions Maira Canal
2023-07-31 12:23 ` 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=20230720-kms-kunit-actions-rework-v2-5-175017bd56ab@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=brendan.higgins@linux.dev \
--cc=daniel@ffwll.ch \
--cc=davidgow@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=javierm@redhat.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mairacanal@riseup.net \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®