From nobody Fri Dec 19 15:50:14 2025 Received: from smtpout-03.galae.net (smtpout-03.galae.net [185.246.85.4]) (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 9356525BEE5 for ; Mon, 13 Oct 2025 16:25:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.85.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760372709; cv=none; b=lxC54WAwwTdhWqEJIM8ouhc0RNcTDp9njwcFnQGBK0t+mJXHFHVATmILoiZ3jpAGtLe4cp+BOzpjAgwo8axSIzxm4ZyR5FOVKunzmy1clZVE3lX7Sq7ykYkZdFp8nm6hPahMehCvU4CUrGqO6vCOLPmPTkxc1X+y/habLEY/G+o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760372709; c=relaxed/simple; bh=DfVT5kzcLG95p559gLJlDsH9sMjJYe+qc4iyvjAQQeE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BGNtfcrlHO0YIp+WCEHZF6OA0zLcUSu8AwouxCewEZoxTraIK79orSHO987OcQIwdAv+xcUMqk0oAoNN7TvQcIDnMSjMsaca5I/OMa9CCQUtg88t5ctMAUr6G9oM/zOANPO8F7Cmw/7ACj0/YiaC/rwc77uiZa+QLroeXD9w0v8= 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=Btku4Kmg; arc=none smtp.client-ip=185.246.85.4 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="Btku4Kmg" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-03.galae.net (Postfix) with ESMTPS id E29264E4102F; Mon, 13 Oct 2025 16:25:05 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id B7A7B6067B; Mon, 13 Oct 2025 16:25:05 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E8853102F2279; Mon, 13 Oct 2025 18:24:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1760372703; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=Gv0maEjq5v/FElsFwj5bt6nUQBctEM89W5hyzui+jc0=; b=Btku4KmgpXmFc33YSzZUjtX/oFmmd7anKehG8NfVPSNBg8HB4XyywCc2BoW072/V5JCcto 2P+u5KQdJjr2RiwQx7SPPg6BBVs/KifEJI8NlyO5zCUTU5dIhi9mnnejIXsWra1rRaccuw AHwuz/EdzbK52O8xVX0rPQoVTk6OCCuDRN2a5rlVhsc9ytHXuiZuVXkCi/spwTzctr7iEQ zqRqRD1Dtep+Vkg3Luq0F3sp/kODgQY2zbsPfKfEoMIlFbdnRdskhQ0gtRUjPPZq47OKpj EaVVPUP/ZpwZ8T2Bv+NQQtXs0uECJf9uBMUeGhsBYVOmalTwY2w3W8TPWNqFwg== From: Luca Ceresoli Date: Mon, 13 Oct 2025 18:24:22 +0200 Subject: [PATCH 1/2] drm/atomic: pass drm_device pointer to drm_atomic_private_obj_fini() 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: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-1-1fc2e58102e0@bootlin.com> References: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-0-1fc2e58102e0@bootlin.com> In-Reply-To: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-0-1fc2e58102e0@bootlin.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Paul Cercueil , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Tomi Valkeinen , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance Cc: Hui Pu , Thomas Petazzoni , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-tegra@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.2 X-Last-TLS-Session-Version: TLSv1.3 In preparation for creating a drm_modeset_acquire_ctx for locking insode drm_atomic_private_obj_fini(), pass a pointer to the struct drm_device which is needed to create such context. Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c | 2 +- drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- drivers/gpu/drm/display/drm_dp_tunnel.c | 2 +- drivers/gpu/drm/drm_atomic.c | 3 ++- drivers/gpu/drm/drm_bridge.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- drivers/gpu/drm/tegra/hub.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 6 +++--- include/drm/drm_atomic.h | 3 ++- 14 files changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index fe41494635c54ee58354b51b53449835a7f47328..e5391dc5a69c7266e6902bd6ea0= 1a229b002ffc6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5491,7 +5491,7 @@ static int amdgpu_dm_initialize_drm_device(struct amd= gpu_device *adev) static void amdgpu_dm_destroy_drm_device(struct amdgpu_display_manager *dm) { if (dm->atomic_obj.state) - drm_atomic_private_obj_fini(&dm->atomic_obj); + drm_atomic_private_obj_fini(dm->ddev, &dm->atomic_obj); } =20 /*************************************************************************= ***** diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c b/driv= ers/gpu/drm/arm/display/komeda/komeda_private_obj.c index 914400c4af73824e52dda76425a73a74e681a146..08b1f35727ded45b7b00c727199= f0f952f9c5108 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c @@ -428,5 +428,5 @@ void komeda_kms_cleanup_private_objs(struct komeda_kms_= dev *kms) struct drm_private_obj *obj, *next; =20 list_for_each_entry_safe(obj, next, &config->privobj_list, head) - drm_atomic_private_obj_fini(obj); + drm_atomic_private_obj_fini(&kms->base, obj); } diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/dr= m/display/drm_dp_mst_topology.c index 64e5c176d5cce9df9314f77a0b4c97662c30c070..b1ab7b8e4bf9c9b3fe46ad90558= edf48b5521ed2 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -5773,9 +5773,9 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_ms= t_topology_mgr *mgr) destroy_workqueue(mgr->delayed_destroy_wq); mgr->delayed_destroy_wq =3D NULL; } + drm_atomic_private_obj_fini(mgr->dev, &mgr->base); mgr->dev =3D NULL; mgr->aux =3D NULL; - drm_atomic_private_obj_fini(&mgr->base); mgr->funcs =3D NULL; =20 mutex_destroy(&mgr->delayed_destroy_lock); diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/disp= lay/drm_dp_tunnel.c index 43f13a7c79b931beb230f8afe20afa0ebcf5ed8d..407eda40981c687a0e8bc3a7d61= c6fbda0c61100 100644 --- a/drivers/gpu/drm/display/drm_dp_tunnel.c +++ b/drivers/gpu/drm/display/drm_dp_tunnel.c @@ -1601,7 +1601,7 @@ static bool init_group(struct drm_dp_tunnel_mgr *mgr,= struct drm_dp_tunnel_group =20 static void cleanup_group(struct drm_dp_tunnel_group *group) { - drm_atomic_private_obj_fini(&group->base); + drm_atomic_private_obj_fini(group->mgr->dev, &group->base); } =20 #ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index be2cb6e43cb07fbe553d1ab875911253be628d1a..7910dacb269c03a0f3e1785bb86= 4d228a693a1aa 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -807,7 +807,8 @@ EXPORT_SYMBOL(drm_atomic_private_obj_init); * Finalize the private object. */ void -drm_atomic_private_obj_fini(struct drm_private_obj *obj) +drm_atomic_private_obj_fini(struct drm_device *dev, + struct drm_private_obj *obj) { list_del(&obj->head); obj->funcs->atomic_destroy_state(obj, obj->state); diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 53e7ece36dd940aabd1c0880f296fce7224a12ac..0997a17a6793f5e42a488d81d8e= 57b93c5f425a3 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -512,7 +512,7 @@ void drm_bridge_detach(struct drm_bridge *bridge) return; =20 if (drm_bridge_is_atomic(bridge)) - drm_atomic_private_obj_fini(&bridge->base); + drm_atomic_private_obj_fini(bridge->dev, &bridge->base); =20 if (bridge->funcs->detach) bridge->funcs->detach(bridge); diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/in= genic/ingenic-drm-drv.c index d3213fbf22be14b177fc1b7100c5b721d5f17924..9d7f978eeefd317c07e6b0d328b= 9f59a0048e073 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1081,7 +1081,7 @@ static void ingenic_drm_configure_hwdesc_plane(struct= ingenic_drm *priv, =20 static void ingenic_drm_atomic_private_obj_fini(struct drm_device *drm, vo= id *private_obj) { - drm_atomic_private_obj_fini(private_obj); + drm_atomic_private_obj_fini(drm, private_obj); } =20 static int ingenic_drm_bind(struct device *dev, bool has_components) diff --git a/drivers/gpu/drm/ingenic/ingenic-ipu.c b/drivers/gpu/drm/ingeni= c/ingenic-ipu.c index 32638a713241abbd4eaed09f0aaec2b790650cc9..c89dd4ce73e277e382b244e73b4= d1474ad544c6b 100644 --- a/drivers/gpu/drm/ingenic/ingenic-ipu.c +++ b/drivers/gpu/drm/ingenic/ingenic-ipu.c @@ -908,7 +908,7 @@ static void ingenic_ipu_unbind(struct device *dev, { struct ingenic_ipu *ipu =3D dev_get_drvdata(dev); =20 - drm_atomic_private_obj_fini(&ipu->private_obj); + drm_atomic_private_obj_fini(ipu->drm, &ipu->private_obj); clk_unprepare(ipu->clk); } =20 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 4e5a8ecd31f7570beb45fd1629a131e70aaefea8..6f03e2e11d255b734f6212bc57b= f2d5660d89269 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -400,7 +400,7 @@ static int dpu_kms_global_obj_init(struct dpu_kms *dpu_= kms) =20 static void dpu_kms_global_obj_fini(struct dpu_kms *dpu_kms) { - drm_atomic_private_obj_fini(&dpu_kms->global_state); + drm_atomic_private_obj_fini(dpu_kms->dev, &dpu_kms->global_state); } =20 static int dpu_kms_parse_data_bus_icc_path(struct dpu_kms *dpu_kms) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm= /disp/mdp5/mdp5_kms.c index 61edf6864092664afe474cc8d1fd097ca495ebb8..57ecc2ca8bb9d8e2ce38f3eff4c= c67c179c98438 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -571,7 +571,7 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms) if (mdp5_kms->rpm_enabled) pm_runtime_disable(&mdp5_kms->pdev->dev); =20 - drm_atomic_private_obj_fini(&mdp5_kms->glob_state); + drm_atomic_private_obj_fini(mdp5_kms->dev, &mdp5_kms->glob_state); } =20 static int construct_pipes(struct mdp5_kms *mdp5_kms, int cnt, diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/o= map_drv.c index 794267f0f007850e43949f93be5c98d0e32a84ea..37b9cf58d4b3776a484d9923c29= 1e49a9d899cf4 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -295,7 +295,7 @@ static int omap_global_obj_init(struct drm_device *dev) =20 static void omap_global_obj_fini(struct omap_drm_private *priv) { - drm_atomic_private_obj_fini(&priv->glob_obj); + drm_atomic_private_obj_fini(priv->ddev, &priv->glob_obj); } =20 static void omap_disconnect_pipelines(struct drm_device *ddev) diff --git a/drivers/gpu/drm/tegra/hub.c b/drivers/gpu/drm/tegra/hub.c index 8f779f23dc0904d38b14d3f3a928a07fc9e601ad..b468be737273b4ba7682e8b4cc5= bffd061b4914e 100644 --- a/drivers/gpu/drm/tegra/hub.c +++ b/drivers/gpu/drm/tegra/hub.c @@ -959,7 +959,7 @@ static int tegra_display_hub_exit(struct host1x_client = *client) struct drm_device *drm =3D dev_get_drvdata(client->host); struct tegra_drm *tegra =3D drm->dev_private; =20 - drm_atomic_private_obj_fini(&tegra->hub->base); + drm_atomic_private_obj_fini(drm, &tegra->hub->base); tegra->hub =3D NULL; =20 return 0; diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index 8f983edb81ff0e3b11bbc8465e69f838050f0d07..2150d4c28cbe4f16ed089a04215= bb4b4bfa48985 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -93,7 +93,7 @@ static void vc4_ctm_obj_fini(struct drm_device *dev, void= *unused) { struct vc4_dev *vc4 =3D to_vc4_dev(dev); =20 - drm_atomic_private_obj_fini(&vc4->ctm_manager); + drm_atomic_private_obj_fini(dev, &vc4->ctm_manager); } =20 static int vc4_ctm_obj_init(struct vc4_dev *vc4) @@ -726,7 +726,7 @@ static void vc4_load_tracker_obj_fini(struct drm_device= *dev, void *unused) { struct vc4_dev *vc4 =3D to_vc4_dev(dev); =20 - drm_atomic_private_obj_fini(&vc4->load_tracker); + drm_atomic_private_obj_fini(dev, &vc4->load_tracker); } =20 static int vc4_load_tracker_obj_init(struct vc4_dev *vc4) @@ -809,7 +809,7 @@ static void vc4_hvs_channels_obj_fini(struct drm_device= *dev, void *unused) { struct vc4_dev *vc4 =3D to_vc4_dev(dev); =20 - drm_atomic_private_obj_fini(&vc4->hvs_channels); + drm_atomic_private_obj_fini(dev, &vc4->hvs_channels); } =20 static int vc4_hvs_channels_obj_init(struct vc4_dev *vc4) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 155e82f87e4d47161475b57fc28762d7ba8fd206..d9a26da24fa89ccb6ab351c9dbe= b4978ee117f7d 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -672,7 +672,8 @@ void drm_atomic_private_obj_init(struct drm_device *dev, struct drm_private_obj *obj, struct drm_private_state *state, const struct drm_private_state_funcs *funcs); -void drm_atomic_private_obj_fini(struct drm_private_obj *obj); +void drm_atomic_private_obj_fini(struct drm_device *dev, + struct drm_private_obj *obj); =20 struct drm_private_state * __must_check drm_atomic_get_private_obj_state(struct drm_atomic_state *state, --=20 2.51.0 From nobody Fri Dec 19 15:50:14 2025 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (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 422FB2701DC for ; Mon, 13 Oct 2025 16:25:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760372715; cv=none; b=LPND5lJIinpJD5MFzKnyatRshB/fHGJMzNKAcfLZWdRe8cdaqiXb1uwPgBNapgoEuxPciLS1RRt9xxdAta2HoiYzvKLgQL5+a7zPlSbSItVXEWpCN5E8dtLiDVcOY8JLKrFSSzuhdXz9EHavoiXkUOdpzt7Z2w+gJdPOOx2rfFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760372715; c=relaxed/simple; bh=Cy1uXxZB1SYXQYaLvBKqrPBCBk/c+HAQzdXcSoZ1C9w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WFo0htl32IwU5Y0NuQBG7xQCMIIyfY7KCmjesQH3U/3/5gbZqoc32JurjP6+Ri+I56cLzCAH4X6yCzTl43EDQoVeJ+eRkPG196RoZ0fi+UPkBsxZxxukO813eQ1U46ytuZrwmB0Wd/PfUhcIdO0jdTFNyuAVynCR/PsztSp0+uk= 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=oCUOSAm8; arc=none smtp.client-ip=185.246.84.56 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="oCUOSAm8" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 8F76A1A1342; Mon, 13 Oct 2025 16:25:11 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 60DDA6067B; Mon, 13 Oct 2025 16:25:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 432C3102F2240; Mon, 13 Oct 2025 18:25:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1760372709; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=EYvKa1NV3blrMZOG3M4T8TIRo5Q0mosa2RgW0yGH+VY=; b=oCUOSAm8u75+NIooX1Iu/utEPRwF6wSEVsxC2e0orTivV67rSE/EUC+5tgmpm5Ge1G87TX OPWXNK1AU42EfctE/Wk1KxoK2VZ5mZUuLxAH8cIQaowSmFwQIF1j6F11IVvOiA7KhisMhn 0c/nR9aeBNArW6i3huyJKvjcxqIZ+rtkn6E4T9bvDIeLEiJXORxK2C/cZ6ylWJLf9EVeCG QbYrjbMehUQRdkjqBRv0drmS2sTBxpgU5N1xcQ5BKN28OB4v3Htu71Uxwp3ZoMUkLJkTEC EtUGmOWANdY7UgjMA4fLDhuQ3Be5whmv8MeZU8dyEbiAoG3E+DKsNuNhfeBvxg== From: Luca Ceresoli Date: Mon, 13 Oct 2025 18:24:23 +0200 Subject: [PATCH 2/2] drm_atomic_private_obj_fini: protect private_obj removal from list 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: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-2-1fc2e58102e0@bootlin.com> References: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-0-1fc2e58102e0@bootlin.com> In-Reply-To: <20251013-drm-bridge-atomic-vs-remove-private_obj-v1-0-1fc2e58102e0@bootlin.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Liviu Dudau , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Paul Cercueil , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , Tomi Valkeinen , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Dave Stevenson , =?utf-8?q?Ma=C3=ADra_Canal?= , Raspberry Pi Kernel Maintenance Cc: Hui Pu , Thomas Petazzoni , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-tegra@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.2 X-Last-TLS-Session-Version: TLSv1.3 Currently drm_bridge_detach() expects that the bridge private_obj is not locked by a drm_modeset_acquire_ctx, and it warns in case that happens: drm_bridge_detach() -> drm_atomic_private_obj_fini() -> list_del(&obj->head) // removes priv_obj from // dev->mode_config.privobj_list -> obj->funcs->atomic_destroy_state() -> drm_modeset_lock_fini(&obj->lock) -> WARN_ON(!list_empty(&lock->head)) // warn if priv_obj->lock // is still in ctx->locked The expectation is not respected when adding bridge hot-plugging. In such case the warning triggers if the bridge is being removed concurrently to an operation that locks the private object using a drm_modeset_acquire_ctx, such as in this execution scenario: CPU0: drm_mode_obj_get_properties_ioctl() // userspace request -> DRM_MODESET_LOCK_ALL_BEGIN() . -> drm_for_each_privobj() // loop on dev->mode_config.privobj_list . - lock the privobj mutex . - add priv_obj->lock to ctx->locked . (list of locks to be released) . . CPU1: . drm_bridge_detach() // bridge hot-unplug . -> WARN triggers! . -> DRM_MODESET_LOCK_ALL_END() -> for each lock in ctx->locked - remove priv_obj->lock from ctx->locked - unlock the privobj mutex Fix this by using DRM_MODESET_LOCK_ALL_BEGIN/END() around the list removal in drm_atomic_private_obj_fini(). This ensures that exactly one of these happens: * the concurrent code (e.g. drm_mode_obj_get_properties_ioctl()) acquires all the locks first, so it can execute fully and release the privobj->lock before drm_atomic_private_obj_fini() calls list_del() and before the WARN_ON() * drm_atomic_private_obj_fini() acquires all the locks first, so it removes its privobj->lock from the dev->mode_config.privobj_list; the concurrent code will run afterwards and not acquire that lock because it is not present anymore Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/drm_atomic.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 7910dacb269c03a0f3e1785bb864d228a693a1aa..aa13389a8efe06b0f67cdce4699= d403906b282be 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -810,7 +810,13 @@ void drm_atomic_private_obj_fini(struct drm_device *dev, struct drm_private_obj *obj) { + struct drm_modeset_acquire_ctx ctx; + int ret =3D 0; + + DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, ret); list_del(&obj->head); + DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); + obj->funcs->atomic_destroy_state(obj, obj->state); drm_modeset_lock_fini(&obj->lock); } --=20 2.51.0