From nobody Mon Feb 9 11:29:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1100EEB64DA for ; Mon, 10 Jul 2023 07:49:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231792AbjGJHs4 (ORCPT ); Mon, 10 Jul 2023 03:48:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232196AbjGJHsG (ORCPT ); Mon, 10 Jul 2023 03:48:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF82EB for ; Mon, 10 Jul 2023 00:48:05 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6374E60EB9 for ; Mon, 10 Jul 2023 07:48:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75EA1C433C8; Mon, 10 Jul 2023 07:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688975284; bh=fPdxAPJD7CpD3AfQBHyKw92YCMzAMwqXjaFIYguE02o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=E+/jYc+X+JfKXjXj4itmX1fGoj+DANb8FwUhV7qUTm3rOWT8eoltcsHw0bLOR9Ort 2ge/7liyze5sejdX6n9qxhJVvrJ9f5LcgtAAd7c2Le5HUcGkNE0Luh2a6E4AJAVmto h5Sw9hG8VPXzYznNfAOW8va+jVrz7edAffgEsm5+GFlqJRymyzoKvs3v7kqBvhikzl SKzzLK4dBdWV3HzMS4zm5WnhYROdkwyINjQgLncAHsK+q+XGNqNMxEYzt07rEYoVGA DiVx3/yIrueyyd8/EuqI4D7Vgzie9oYYtZTzzEvoqf/m5CXx3ukWj89FBirgFP2aDv z3lJSdbVJ4MaQ== From: Maxime Ripard Date: Mon, 10 Jul 2023 09:47:39 +0200 Subject: [PATCH 08/11] drm/vc4: tests: mock: Use a kunit action to unregister DRM device MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230710-kms-kunit-actions-rework-v1-8-722c58d72c72@kernel.org> References: <20230710-kms-kunit-actions-rework-v1-0-722c58d72c72@kernel.org> In-Reply-To: <20230710-kms-kunit-actions-rework-v1-0-722c58d72c72@kernel.org> To: David Airlie , Daniel Vetter , Maarten Lankhorst , Thomas Zimmermann , Emma Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maxime Ripard X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=2647; i=mripard@kernel.org; h=from:subject:message-id; bh=fPdxAPJD7CpD3AfQBHyKw92YCMzAMwqXjaFIYguE02o=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDCmrt8+4s67/9OcVT2x9VX4mPp21o8iVZ+I2s8nJ8cnzpD4u Yd3R2VHKwiDGxSArpsgSI2y+JO7UrNedbHzzYOawMoEMYeDiFICJ3L/K8D/YMUd04udJs8TENs+Wv8 EoLnZyVTNjzUdBtprnlvfldKQZGV4rbpzvevn4wZ9lORFMJ6btZe99t4llrsKUv04P0rcG+zIDAA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The *_mock_device functions allocate a DRM device that needs to be released using drm_dev_unregister. Now that we have a kunit release action API, we can switch to it and don't require any kind of garbage collection from the caller. Signed-off-by: Maxime Ripard Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/vc4/tests/vc4_mock.c | 5 +++++ drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tes= ts/vc4_mock.c index a4bed26af32f..00825ddc52f0 100644 --- a/drivers/gpu/drm/vc4/tests/vc4_mock.c +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c @@ -186,6 +186,11 @@ static struct vc4_dev *__mock_device(struct kunit *tes= t, bool is_vc5) ret =3D drm_dev_register(drm, 0); KUNIT_ASSERT_EQ(test, ret, 0); =20 + ret =3D kunit_add_action_or_reset(test, + (kunit_action_t *)drm_dev_unregister, + drm); + KUNIT_ASSERT_EQ(test, ret, 0); + return vc4; } =20 diff --git a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c b/drivers/gpu/d= rm/vc4/tests/vc4_test_pv_muxing.c index 6c982e72cae8..776a7b01608f 100644 --- a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c +++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c @@ -754,14 +754,11 @@ static int vc4_pv_muxing_test_init(struct kunit *test) static void vc4_pv_muxing_test_exit(struct kunit *test) { struct pv_muxing_priv *priv =3D test->priv; - struct vc4_dev *vc4 =3D priv->vc4; - struct drm_device *drm =3D &vc4->base; struct drm_atomic_state *state =3D priv->state; =20 drm_atomic_state_put(state); drm_modeset_drop_locks(&priv->ctx); drm_modeset_acquire_fini(&priv->ctx); - drm_dev_unregister(drm); } =20 static struct kunit_case vc4_pv_muxing_tests[] =3D { @@ -871,7 +868,6 @@ static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc= _enable(struct kunit *tes drm_atomic_state_put(state); drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); - drm_dev_unregister(drm); } =20 static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) @@ -960,7 +956,6 @@ static void drm_test_vc5_pv_muxing_bugs_stable_fifo(str= uct kunit *test) drm_atomic_state_put(state); drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); - drm_dev_unregister(drm); } =20 static void @@ -1013,7 +1008,6 @@ drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_to= o_many_crtc_state(struct ku drm_atomic_state_put(state); drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); - drm_dev_unregister(drm); } =20 static struct kunit_case vc5_pv_muxing_bugs_tests[] =3D { --=20 2.41.0