From nobody Fri Dec 19 20:13:30 2025 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 102AB1E47B3 for ; Fri, 6 Jun 2025 08:41:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199307; cv=none; b=MGAbsSzGYpnDkUYi5/CpDUAnK139IM3mgTKGuS0qxRh65AKugIqomv3yTCWbHYQJTt5JZ3RuGVgZP+xLqG5UEQuBO0Gti9EOx/A8MojqHeuiyXlVwW19GBUsyLtCoI7EefD65HIDWk/iKWo+fy71xL6NC+fTav3ob90uhBTESSs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199307; c=relaxed/simple; bh=mOBS5OeyBSAgQy+Rydxb+9br4n93vw3TEe0ztrHLFfE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tSAQcPbYzwj5aS99udoAnvCZUCNwUAUo/VcJvI+EY7MlunJfYdjgsVSSl5WwPpF/Rcvl9yjR1+w93CUwei+U2561EwWhzekAYLAeiUCtIEdSJMnVesMlGOFaCytMrBfPlZ1qlYz2ejEg528I1Ma/MkOPvABf/GN0YdShX6aK4Uc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=MnQe2X3g; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="MnQe2X3g" Received: by mail.gandi.net (Postfix) with ESMTPSA id 6333E439E7; Fri, 6 Jun 2025 08:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1749199303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aPvksxlf0Hyl0GWx9oF/FuC5ulQtC/iEwpumUiyWezs=; b=MnQe2X3gm/AWI6pN0PHB5SuT0ajW8eUsm1oWoqS3aSuJHgHf0D+DliE9SkFDRpyq49UNGW 8FcY1hljn/Bt7JTUt8WGGFRs9QQKMygRcja+paVHzYwIzTwCl9M+tqQWXP/391ZGXAK6tX 8QRLP7QJ32Th3tpQ5cXnZy4eTfTID2+G1DNg8qdVT0P8vEZd3B6o6Ll3xi0j3H09GG969I Lpsfe1kB1DXUYrPjiQnSGPMDK/ftXJp7BcSavg7ky3dH4j2Eub+Bd/utE/z8oN78Xhg+sE 5eYipAQD911ot/RDcZ+fMcEdTEOAIVmCrSxFWP02MWb7zyKj4k4tf5yyrTxzIg== From: Luca Ceresoli Date: Fri, 06 Jun 2025 10:41:19 +0200 Subject: [PATCH v9 1/3] drm/tests: bridge: convert to devm_drm_bridge_alloc() API Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250606-drm-bridge-alloc-doc-test-v9-1-b5bf7b43ed92@bootlin.com> References: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> In-Reply-To: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: Anusha Srivatsa , Paul Kocialkowski , Dmitry Baryshkov , =?utf-8?q?Herv=C3=A9_Codina?= , Hui Pu , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.2 X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdegkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomhepnfhutggrucevvghrvghsohhlihcuoehluhgtrgdrtggvrhgvshholhhisegsohhothhlihhnrdgtohhmqeenucggtffrrghtthgvrhhnpeeiieeuvdfftefgueduleehueetgffgjeeitedtteetkeeuueeuueekveevvdeuveenucfkphepfeejrdduiedvrdduvdefrdehvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeefjedrudeivddruddvfedrhedvpdhhvghloheplgduledvrdduieekrddvhedvrddvfeehngdpmhgrihhlfhhrohhmpehluhgtrgdrtggvrhgvshholhhisegsohhothhlihhnrdgtohhmpdhnsggprhgtphhtthhopedvtddprhgtphhtthhopefnrghurhgvnhhtrdhpihhntghhrghrthesihguvggrshhonhgsohgrrhgurdgtohhmpdhrtghpthhtoheplhhumhgrgheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheprghsrhhivhgrthhssehrvgguhhgrthdrtghomhdprhgtphhtthhopehrfhhoshhssehkvghrnhgvlhdrohhrghdprhgtphhtthhopehluhgtrgdrtggvrhgvshholhhisegsohhothhli hhnrdgtohhmpdhrtghpthhtohepthhhohhmrghsrdhpvghtrgiiiihonhhisegsohhothhlihhnrdgtohhmpdhrtghpthhtohepjfhuihdrrfhusehgvghhvggrlhhthhgtrghrvgdrtghomhdprhgtphhtthhopegrnhgurhiivghjrdhhrghjuggrsehinhhtvghlrdgtohhm X-GND-Sasl: luca.ceresoli@bootlin.com Use the new DRM bridge allocation API, which is the only supported now, for the kunit tests. This change is more massive than for the typical DRM bridge driver because struct drm_bridge_init_priv currently embeds a struct drm_bridge, which is not supported anymore. We now have to use devm_drm_bridge_alloc() to dynamically allocate a "private driver struct", which is a bit awkward here because there is no real bridge driver. Thus let's add a "dummy" DRM bridge struct to represent it. As a nice cleanup we can now move the enable_count and disable_count members, which are counting bridge-specific events, into the new "private driver struct" (and avoid adding new unnecessary indirections). Also add a trivial bridge_to_dummy_bridge() function just like many drivers do. Signed-off-by: Luca Ceresoli --- Changes in v9: * rename struct dummy_drm_bridge to drm_bridge_priv (and related variables accordingly) * slightly improve struct drm_bridge_priv docs * fix typo in commit message, improve commit message This patch was added in v8. --- drivers/gpu/drm/tests/drm_bridge_test.c | 87 +++++++++++++++++++----------= ---- 1 file changed, 51 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/test= s/drm_bridge_test.c index ff88ec2e911c9cc9a718483f09d4c764f45f991a..af1b9f9694b0091e6eaef78cb71= e39327ad8c3fa 100644 --- a/drivers/gpu/drm/tests/drm_bridge_test.c +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -10,29 +10,43 @@ =20 #include =20 +/* + * Mimick the typical "private" struct defined by a bridge driver, which + * embeds a bridge plus other fields. + * + * Having at least one member before @bridge ensures we test non-zero + * @bridge offset. + */ +struct drm_bridge_priv { + unsigned int enable_count; + unsigned int disable_count; + struct drm_bridge bridge; +}; + struct drm_bridge_init_priv { struct drm_device drm; struct drm_plane *plane; struct drm_crtc *crtc; struct drm_encoder encoder; - struct drm_bridge bridge; + struct drm_bridge_priv *test_bridge; struct drm_connector *connector; - unsigned int enable_count; - unsigned int disable_count; }; =20 +static struct drm_bridge_priv *bridge_to_priv(struct drm_bridge *bridge) +{ + return container_of(bridge, struct drm_bridge_priv, bridge); +} + static void drm_test_bridge_enable(struct drm_bridge *bridge) { - struct drm_bridge_init_priv *priv =3D - container_of(bridge, struct drm_bridge_init_priv, bridge); + struct drm_bridge_priv *priv =3D bridge_to_priv(bridge); =20 priv->enable_count++; } =20 static void drm_test_bridge_disable(struct drm_bridge *bridge) { - struct drm_bridge_init_priv *priv =3D - container_of(bridge, struct drm_bridge_init_priv, bridge); + struct drm_bridge_priv *priv =3D bridge_to_priv(bridge); =20 priv->disable_count++; } @@ -45,8 +59,7 @@ static const struct drm_bridge_funcs drm_test_bridge_lega= cy_funcs =3D { static void drm_test_bridge_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) { - struct drm_bridge_init_priv *priv =3D - container_of(bridge, struct drm_bridge_init_priv, bridge); + struct drm_bridge_priv *priv =3D bridge_to_priv(bridge); =20 priv->enable_count++; } @@ -54,8 +67,7 @@ static void drm_test_bridge_atomic_enable(struct drm_brid= ge *bridge, static void drm_test_bridge_atomic_disable(struct drm_bridge *bridge, struct drm_atomic_state *state) { - struct drm_bridge_init_priv *priv =3D - container_of(bridge, struct drm_bridge_init_priv, bridge); + struct drm_bridge_priv *priv =3D bridge_to_priv(bridge); =20 priv->disable_count++; } @@ -102,6 +114,10 @@ drm_test_bridge_init(struct kunit *test, const struct = drm_bridge_funcs *funcs) if (IS_ERR(priv)) return ERR_CAST(priv); =20 + priv->test_bridge =3D devm_drm_bridge_alloc(dev, struct drm_bridge_priv, = bridge, funcs); + if (IS_ERR(priv->test_bridge)) + return ERR_CAST(priv->test_bridge); + drm =3D &priv->drm; priv->plane =3D drm_kunit_helper_create_primary_plane(test, drm, NULL, @@ -125,9 +141,8 @@ drm_test_bridge_init(struct kunit *test, const struct d= rm_bridge_funcs *funcs) =20 enc->possible_crtcs =3D drm_crtc_mask(priv->crtc); =20 - bridge =3D &priv->bridge; + bridge =3D &priv->test_bridge->bridge; bridge->type =3D DRM_MODE_CONNECTOR_VIRTUAL; - bridge->funcs =3D funcs; =20 ret =3D drm_kunit_bridge_add(test, bridge); if (ret) @@ -173,7 +188,7 @@ static void drm_test_drm_bridge_get_current_state_atomi= c(struct kunit *test) KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); =20 retry_commit: - bridge =3D &priv->bridge; + bridge =3D &priv->test_bridge->bridge; bridge_state =3D drm_atomic_get_bridge_state(state, bridge); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, bridge_state); =20 @@ -228,7 +243,7 @@ static void drm_test_drm_bridge_get_current_state_legac= y(struct kunit *test) * locking. The function would return NULL in all cases anyway, * so we don't really have any concurrency to worry about. */ - bridge =3D &priv->bridge; + bridge =3D &priv->test_bridge->bridge; KUNIT_EXPECT_NULL(test, drm_bridge_get_current_state(bridge)); } =20 @@ -253,7 +268,7 @@ static void drm_test_drm_bridge_helper_reset_crtc_atomi= c(struct kunit *test) struct drm_modeset_acquire_ctx ctx; struct drm_bridge_init_priv *priv; struct drm_display_mode *mode; - struct drm_bridge *bridge; + struct drm_bridge_priv *bridge_priv; int ret; =20 priv =3D drm_test_bridge_init(test, &drm_test_bridge_atomic_funcs); @@ -279,14 +294,14 @@ static void drm_test_drm_bridge_helper_reset_crtc_ato= mic(struct kunit *test) drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); =20 - bridge =3D &priv->bridge; - KUNIT_ASSERT_EQ(test, priv->enable_count, 1); - KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + bridge_priv =3D priv->test_bridge; + KUNIT_ASSERT_EQ(test, bridge_priv->enable_count, 1); + KUNIT_ASSERT_EQ(test, bridge_priv->disable_count, 0); =20 drm_modeset_acquire_init(&ctx, 0); =20 retry_reset: - ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + ret =3D drm_bridge_helper_reset_crtc(&bridge_priv->bridge, &ctx); if (ret =3D=3D -EDEADLK) { drm_modeset_backoff(&ctx); goto retry_reset; @@ -296,8 +311,8 @@ static void drm_test_drm_bridge_helper_reset_crtc_atomi= c(struct kunit *test) drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); =20 - KUNIT_EXPECT_EQ(test, priv->enable_count, 2); - KUNIT_EXPECT_EQ(test, priv->disable_count, 1); + KUNIT_EXPECT_EQ(test, bridge_priv->enable_count, 2); + KUNIT_EXPECT_EQ(test, bridge_priv->disable_count, 1); } =20 /* @@ -309,7 +324,7 @@ static void drm_test_drm_bridge_helper_reset_crtc_atomi= c_disabled(struct kunit * struct drm_modeset_acquire_ctx ctx; struct drm_bridge_init_priv *priv; struct drm_display_mode *mode; - struct drm_bridge *bridge; + struct drm_bridge_priv *bridge_priv; int ret; =20 priv =3D drm_test_bridge_init(test, &drm_test_bridge_atomic_funcs); @@ -318,14 +333,14 @@ static void drm_test_drm_bridge_helper_reset_crtc_ato= mic_disabled(struct kunit * mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); =20 - bridge =3D &priv->bridge; - KUNIT_ASSERT_EQ(test, priv->enable_count, 0); - KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + bridge_priv =3D priv->test_bridge; + KUNIT_ASSERT_EQ(test, bridge_priv->enable_count, 0); + KUNIT_ASSERT_EQ(test, bridge_priv->disable_count, 0); =20 drm_modeset_acquire_init(&ctx, 0); =20 retry_reset: - ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + ret =3D drm_bridge_helper_reset_crtc(&bridge_priv->bridge, &ctx); if (ret =3D=3D -EDEADLK) { drm_modeset_backoff(&ctx); goto retry_reset; @@ -335,8 +350,8 @@ static void drm_test_drm_bridge_helper_reset_crtc_atomi= c_disabled(struct kunit * drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); =20 - KUNIT_EXPECT_EQ(test, priv->enable_count, 0); - KUNIT_EXPECT_EQ(test, priv->disable_count, 0); + KUNIT_EXPECT_EQ(test, bridge_priv->enable_count, 0); + KUNIT_EXPECT_EQ(test, bridge_priv->disable_count, 0); } =20 /* @@ -348,7 +363,7 @@ static void drm_test_drm_bridge_helper_reset_crtc_legac= y(struct kunit *test) struct drm_modeset_acquire_ctx ctx; struct drm_bridge_init_priv *priv; struct drm_display_mode *mode; - struct drm_bridge *bridge; + struct drm_bridge_priv *bridge_priv; int ret; =20 priv =3D drm_test_bridge_init(test, &drm_test_bridge_legacy_funcs); @@ -374,14 +389,14 @@ static void drm_test_drm_bridge_helper_reset_crtc_leg= acy(struct kunit *test) drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); =20 - bridge =3D &priv->bridge; - KUNIT_ASSERT_EQ(test, priv->enable_count, 1); - KUNIT_ASSERT_EQ(test, priv->disable_count, 0); + bridge_priv =3D priv->test_bridge; + KUNIT_ASSERT_EQ(test, bridge_priv->enable_count, 1); + KUNIT_ASSERT_EQ(test, bridge_priv->disable_count, 0); =20 drm_modeset_acquire_init(&ctx, 0); =20 retry_reset: - ret =3D drm_bridge_helper_reset_crtc(bridge, &ctx); + ret =3D drm_bridge_helper_reset_crtc(&bridge_priv->bridge, &ctx); if (ret =3D=3D -EDEADLK) { drm_modeset_backoff(&ctx); goto retry_reset; @@ -391,8 +406,8 @@ static void drm_test_drm_bridge_helper_reset_crtc_legac= y(struct kunit *test) drm_modeset_drop_locks(&ctx); drm_modeset_acquire_fini(&ctx); =20 - KUNIT_EXPECT_EQ(test, priv->enable_count, 2); - KUNIT_EXPECT_EQ(test, priv->disable_count, 1); + KUNIT_EXPECT_EQ(test, bridge_priv->enable_count, 2); + KUNIT_EXPECT_EQ(test, bridge_priv->disable_count, 1); } =20 static struct kunit_case drm_bridge_helper_reset_crtc_tests[] =3D { --=20 2.49.0 From nobody Fri Dec 19 20:13:30 2025 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3590828541A for ; Fri, 6 Jun 2025 08:41:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199318; cv=none; b=c2bh/PcxjXJnnugXiaxHXOXV9mtnEgwAOQLRvyJqDOmcfei2HaAhU2Vy3QOaR9eD/M4FBD1NQE0UayCPmjYdUcz2RPU8A//oomncMryY0yuG7O/WSGVSUZdVf5aHma0FPjEBjv/SEs+BYYtndyKcuk2hNffRylRkW6Z6hZbzV4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199318; c=relaxed/simple; bh=m3puINlcXxzsY7KcJAkyp3zcbG1FzBOW2xXnD6Z5Tz8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nYBtwGeCJJNc7MEZ10u49ADtwWGvRrrhaePj6zUIbbfIh3n/W92w9EK3BvXa0Zr/JiLV/TeSNu9OpZEixtjFMH67yj3Ej8gZU2M/xiJP8faO5WfIgq5J1b6HTr1tjJXUHwEknjLCvPk3iu9UP6YVjLZS2rhlTd/T3LUrfmvzFnw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=ecdgv+ik; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="ecdgv+ik" Received: by mail.gandi.net (Postfix) with ESMTPSA id 6F517432F6; Fri, 6 Jun 2025 08:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1749199314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=X7gkpeD02m42+Q8lo9vTdVvKSU1AoFKlmD/QgXdBYsg=; b=ecdgv+ikCDahE6D4S7NyPFR/ttLSmH+B91yJFjdrSgrx26x7nEOM+OzC98EOcsGySK3/BO vSy3Jqd35x/Je6IaDOaRoIu02DZgcsagwAe4kaX7fMq9ssxIbARbZfHHTZV1K63y5Epwhx YQytrgZu7aY6yJUVhNAt7PtyMajBR372xhwYTLb3RPZEfOAzLgqMsUNsHwYRtd/6sRlkqC X5czCxs1vOXS49+N8gm3PrMUZHqZfNDzDxCp7L4Ec0mx7P3LJ9wGWR/ZVdKy+YGjnSmSAi Fp4aRRCNeDvvqZViox1omO1paE+g3Sr6hKcYcwbWn3RjU6ejUY8Ht+BDOVEo7w== From: Luca Ceresoli Date: Fri, 06 Jun 2025 10:41:20 +0200 Subject: [PATCH v9 2/3] drm/bridge: add a .destroy func Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250606-drm-bridge-alloc-doc-test-v9-2-b5bf7b43ed92@bootlin.com> References: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> In-Reply-To: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: Anusha Srivatsa , Paul Kocialkowski , Dmitry Baryshkov , =?utf-8?q?Herv=C3=A9_Codina?= , Hui Pu , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.2 X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdegkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomhepnfhutggrucevvghrvghsohhlihcuoehluhgtrgdrtggvrhgvshholhhisegsohhothhlihhnrdgtohhmqeenucggtffrrghtthgvrhhnpeehjefgudegvddukeegvedtgfduudehtdfgteefvefgheekjeehvdeihfdtfffhkeenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecukfhppeefjedrudeivddruddvfedrhedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepfeejrdduiedvrdduvdefrdehvddphhgvlhhopegludelvddrudeikedrvdehvddrvdefhegnpdhmrghilhhfrhhomheplhhutggrrdgtvghrvghsohhlihessghoohhtlhhinhdrtghomhdpnhgspghrtghpthhtohepvddtpdhrtghpthhtohepnfgruhhrvghnthdrphhinhgthhgrrhhtsehiuggvrghsohhnsghorghrugdrtghomhdprhgtphhtthhopehluhhmrghgsehkvghrnhgvlhdrohhrghdprhgtphhtthhopegrshhrihhvrghtshesrhgvughhrghtrdgtohhmpdhrtghpthhtoheprhhfohhssheskhgvrhhnvghlrdhorhhgpdhrtghpthhtohepl hhutggrrdgtvghrvghsohhlihessghoohhtlhhinhdrtghomhdprhgtphhtthhopehthhhomhgrshdrphgvthgriiiiohhnihessghoohhtlhhinhdrtghomhdprhgtphhtthhopefjuhhirdfruhesghgvhhgvrghlthhhtggrrhgvrdgtohhmpdhrtghpthhtoheprghnughriigvjhdrhhgrjhgurgesihhnthgvlhdrtghomh X-GND-Sasl: luca.ceresoli@bootlin.com Some users of DRM bridges may need to execute specific code just before deallocation. As of now the only known user would be KUnit tests. Suggested-by: Maxime Ripard Acked-by: Maxime Ripard Signed-off-by: Luca Ceresoli --- Changes in v9: - move .destroy before .detach in struct drm_bridge_funcs declaration for alphabetic ordering - Add Maxime's Acked-by - Fix typo in commit message This patch was added in v8. The .destroy callback had appeared in v5 as well [5], but as part of a larger patch and for different reasons that do not apply anymore. [5] https://lore.kernel.org/all/20241231-hotplug-drm-bridge-v5-3-173065a1ec= e1@bootlin.com/#t --- drivers/gpu/drm/drm_bridge.c | 2 ++ include/drm/drm_bridge.h | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index d0e81639927a73422671b7b43f3e8a946f1d4300..bf34cc5ab0316889186ddf5ebb3= a984b09eeb86c 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -203,6 +203,8 @@ static void __drm_bridge_free(struct kref *kref) { struct drm_bridge *bridge =3D container_of(kref, struct drm_bridge, refco= unt); =20 + if (bridge->funcs->destroy) + bridge->funcs->destroy(bridge); kfree(bridge->container); } =20 diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 0af5db244db8580ea0c9af1d9a373b7bf62ee699..dbd6503f33ba917fbcfb73b985d= 9c34910f04e0f 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -77,6 +77,16 @@ struct drm_bridge_funcs { int (*attach)(struct drm_bridge *bridge, struct drm_encoder *encoder, enum drm_bridge_attach_flags flags); =20 + /** + * @destroy: + * + * This callback is invoked when the bridge is about to be + * deallocated. + * + * The @destroy callback is optional. + */ + void (*destroy)(struct drm_bridge *bridge); + /** * @detach: * --=20 2.49.0 From nobody Fri Dec 19 20:13:30 2025 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D56528541A for ; Fri, 6 Jun 2025 08:42:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199331; cv=none; b=tqDJEM9Xfpox2OnosSN/HAL8E5UuD7SGuOIo1fVr3fzpIk8e6hkjbzw+fH/YjTAwZZKpv/YjCGJxPBejV7rHVLbe1tCVa4/1A6nVTT8CFNcReqQaVm8gJ0x8UL9zFt877Sek2xAKJhl6VAwB8pt9f2+dHJ1SqxD6ES5Vk+GFWuI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749199331; c=relaxed/simple; bh=BbIj2J9SR8Ka+7Zf1yomdd+iUAyaUoWm2Ob9fhBjprI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NrGmwU6ZY6ZyEhHQsRXBuX2RKmBmnoI9sKZxD3l+PJRxNQ1a74ziqmqP7SpuMRO7bgwGt8DcHL+yTWTDqGNG9/F6mxpieiulLlisoTyWT/cLXKjNRr9wWsmFBVlrz2UTXMTGuieNj8eqwsXPVri/XMjo2eO150Exy4vHfXIhOpI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=L18DBCcG; arc=none smtp.client-ip=217.70.183.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="L18DBCcG" Received: by mail.gandi.net (Postfix) with ESMTPSA id E4061432D3; Fri, 6 Jun 2025 08:41:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1749199327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h2xxTLBglWDu+FJJp44/DHWzVBza00v+40GwPIA7+3I=; b=L18DBCcGWT6F1lLa+RDPA7nRK1/NmJQcUdRp2ywikpAMTuDcrEHdFUgeW0HiZAFEILrobr oX9+Npy9q11fYamfIbyc8fV72rOuDmobUSlxGrD15V7MxTGTRmXNYFVz7SPFfrgwK/5g02 h3S4X2jS29zLExcuXhLbHkhkmeVaKYYbdoERH76y82kE8j1ABtOfnSJYVw76BnOAmp6stz +mBoIHeZFGqI0SSxYNWSBniYauieiXqcdWTlE8ZRK1L4/xxP2yVIrvUcnAFU9CRB6tLLyK TsRg2cA0QOOyLXFRwVxVWRxvAPhdmJK2l40bhRLvPx9TDYZDim6j7WVEA0rvHQ== From: Luca Ceresoli Date: Fri, 06 Jun 2025 10:41:21 +0200 Subject: [PATCH v9 3/3] drm/tests: bridge: add KUnit tests for devm_drm_bridge_alloc() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250606-drm-bridge-alloc-doc-test-v9-3-b5bf7b43ed92@bootlin.com> References: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> In-Reply-To: <20250606-drm-bridge-alloc-doc-test-v9-0-b5bf7b43ed92@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec Cc: Anusha Srivatsa , Paul Kocialkowski , Dmitry Baryshkov , =?utf-8?q?Herv=C3=A9_Codina?= , Hui Pu , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.2 X-GND-State: clean X-GND-Score: -100 X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeeffedrtddugdegkeehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhfffugggtgffkfhgjvfevofesthejredtredtjeenucfhrhhomhepnfhutggrucevvghrvghsohhlihcuoehluhgtrgdrtggvrhgvshholhhisegsohhothhlihhnrdgtohhmqeenucggtffrrghtthgvrhhnpeeiieeuvdfftefgueduleehueetgffgjeeitedtteetkeeuueeuueekveevvdeuveenucfkphepfeejrdduiedvrdduvdefrdehvdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeefjedrudeivddruddvfedrhedvpdhhvghloheplgduledvrdduieekrddvhedvrddvfeehngdpmhgrihhlfhhrohhmpehluhgtrgdrtggvrhgvshholhhisegsohhothhlihhnrdgtohhmpdhnsggprhgtphhtthhopedvtddprhgtphhtthhopefnrghurhgvnhhtrdhpihhntghhrghrthesihguvggrshhonhgsohgrrhgurdgtohhmpdhrtghpthhtoheplhhumhgrgheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheprghsrhhivhgrthhssehrvgguhhgrthdrtghomhdprhgtphhtthhopehrfhhoshhssehkvghrnhgvlhdrohhrghdprhgtphhtthhopehluhgtrgdrtggvrhgvshholhhisegsohhothhli hhnrdgtohhmpdhrtghpthhtohepthhhohhmrghsrdhpvghtrgiiiihonhhisegsohhothhlihhnrdgtohhmpdhrtghpthhtohepjfhuihdrrfhusehgvghhvggrlhhthhgtrghrvgdrtghomhdprhgtphhtthhopegrnhgurhiivghjrdhhrghjuggrsehinhhtvghlrdgtohhm X-GND-Sasl: luca.ceresoli@bootlin.com Add KUnit tests for the newly introduced devm_drm_bridge_alloc(). Signed-off-by: Luca Ceresoli --- Changed in v9: - fold drm_bridge_alloc_test_ctx into drm_bridge_init_priv (do not introduce another test context struct specific to alloc tests) - use the existing func sets for .destroy (do not introduce another struct drm_ridge_funcs specific to alloc tests) - adapt existing tests accordingly by setting .data, to allow .destroy to work - rename 'ctx' variables to 'priv' - add comment describing new tests - use KUNIT_EXPECT_TRUE instead of KUNIT_ASSERT_TRUE where applicable Changed in v8: - rebase on new patch converting drm_bridge_test.c to devm_drm_bridge_alloc() - add check that bridge is removed (thanks to the .destroy callback) - add a check with get/put Changed in v7: - rebase on current drm-misc-next, which now has a drm_bridge_test.c file - cleanup commit message Changed in v6: - update to new devm_drm_bridge_alloc() API - remove drm_test_drm_bridge_put test, not straightforward to write with the new API and the current notification mechanism - do not allocate a drm_device: a bridge is allocated without one - rename some identifiers for easier code reading This patch was added in v5. --- drivers/gpu/drm/tests/drm_bridge_test.c | 89 +++++++++++++++++++++++++++++= ++++ 1 file changed, 89 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/test= s/drm_bridge_test.c index af1b9f9694b0091e6eaef78cb71e39327ad8c3fa..887020141c7f42b5ae74655f954= 4c224d3b07605 100644 --- a/drivers/gpu/drm/tests/drm_bridge_test.c +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -8,6 +8,7 @@ #include #include =20 +#include #include =20 /* @@ -21,15 +22,19 @@ struct drm_bridge_priv { unsigned int enable_count; unsigned int disable_count; struct drm_bridge bridge; + void *data; }; =20 struct drm_bridge_init_priv { struct drm_device drm; + /** @dev: device, only for tests not needing a whole drm_device */ + struct device *dev; struct drm_plane *plane; struct drm_crtc *crtc; struct drm_encoder encoder; struct drm_bridge_priv *test_bridge; struct drm_connector *connector; + bool destroyed; }; =20 static struct drm_bridge_priv *bridge_to_priv(struct drm_bridge *bridge) @@ -37,6 +42,14 @@ static struct drm_bridge_priv *bridge_to_priv(struct drm= _bridge *bridge) return container_of(bridge, struct drm_bridge_priv, bridge); } =20 +static void drm_test_bridge_priv_destroy(struct drm_bridge *bridge) +{ + struct drm_bridge_priv *bridge_priv =3D bridge_to_priv(bridge); + struct drm_bridge_init_priv *priv =3D (struct drm_bridge_init_priv *)brid= ge_priv->data; + + priv->destroyed =3D true; +} + static void drm_test_bridge_enable(struct drm_bridge *bridge) { struct drm_bridge_priv *priv =3D bridge_to_priv(bridge); @@ -52,6 +65,7 @@ static void drm_test_bridge_disable(struct drm_bridge *br= idge) } =20 static const struct drm_bridge_funcs drm_test_bridge_legacy_funcs =3D { + .destroy =3D drm_test_bridge_priv_destroy, .enable =3D drm_test_bridge_enable, .disable =3D drm_test_bridge_disable, }; @@ -73,6 +87,7 @@ static void drm_test_bridge_atomic_disable(struct drm_bri= dge *bridge, } =20 static const struct drm_bridge_funcs drm_test_bridge_atomic_funcs =3D { + .destroy =3D drm_test_bridge_priv_destroy, .atomic_enable =3D drm_test_bridge_atomic_enable, .atomic_disable =3D drm_test_bridge_atomic_disable, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, @@ -118,6 +133,8 @@ drm_test_bridge_init(struct kunit *test, const struct d= rm_bridge_funcs *funcs) if (IS_ERR(priv->test_bridge)) return ERR_CAST(priv->test_bridge); =20 + priv->test_bridge->data =3D priv; + drm =3D &priv->drm; priv->plane =3D drm_kunit_helper_create_primary_plane(test, drm, NULL, @@ -422,11 +439,83 @@ static struct kunit_suite drm_bridge_helper_reset_crt= c_test_suite =3D { .test_cases =3D drm_bridge_helper_reset_crtc_tests, }; =20 +static int drm_test_bridge_alloc_init(struct kunit *test) +{ + struct drm_bridge_init_priv *priv; + + priv =3D kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + priv->dev =3D kunit_device_register(test, "drm-bridge-dev"); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->dev); + + test->priv =3D priv; + + priv->test_bridge =3D devm_drm_bridge_alloc(priv->dev, struct drm_bridge_= priv, bridge, + &drm_test_bridge_atomic_funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->test_bridge); + + priv->test_bridge->data =3D priv; + + KUNIT_ASSERT_FALSE(test, priv->destroyed); + + return 0; +} + +/* + * Test that a bridge is freed when the device is destroyed in lack of + * other drm_bridge_get/put() operations. + */ +static void drm_test_drm_bridge_alloc_basic(struct kunit *test) +{ + struct drm_bridge_init_priv *priv =3D test->priv; + + KUNIT_ASSERT_FALSE(test, priv->destroyed); + + kunit_device_unregister(test, priv->dev); + KUNIT_EXPECT_TRUE(test, priv->destroyed); +} + +/* + * Test that a bridge is not freed when the device is destroyed when there + * is still a reference to it, and freed when that reference is put. + */ +static void drm_test_drm_bridge_alloc_get_put(struct kunit *test) +{ + struct drm_bridge_init_priv *priv =3D test->priv; + + KUNIT_ASSERT_FALSE(test, priv->destroyed); + + drm_bridge_get(&priv->test_bridge->bridge); + KUNIT_EXPECT_FALSE(test, priv->destroyed); + + kunit_device_unregister(test, priv->dev); + KUNIT_EXPECT_FALSE(test, priv->destroyed); + + drm_bridge_put(&priv->test_bridge->bridge); + KUNIT_EXPECT_TRUE(test, priv->destroyed); +} + +static struct kunit_case drm_bridge_alloc_tests[] =3D { + KUNIT_CASE(drm_test_drm_bridge_alloc_basic), + KUNIT_CASE(drm_test_drm_bridge_alloc_get_put), + { } +}; + +static struct kunit_suite drm_bridge_alloc_test_suite =3D { + .name =3D "drm_bridge_alloc", + .init =3D drm_test_bridge_alloc_init, + .test_cases =3D drm_bridge_alloc_tests, +}; + kunit_test_suites( &drm_bridge_get_current_state_test_suite, &drm_bridge_helper_reset_crtc_test_suite, + &drm_bridge_alloc_test_suite, ); =20 MODULE_AUTHOR("Maxime Ripard "); +MODULE_AUTHOR("Luca Ceresoli "); + MODULE_DESCRIPTION("Kunit test for drm_bridge functions"); MODULE_LICENSE("GPL"); --=20 2.49.0