From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=185.142.180.65 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795132796; b=tjYDZHH3QT7R0uuRnVju2qisQVf9f2aIi4mj+8nNP8Ze+wuuqUxnbEaRl+1wmqpzO4cw D5XnysY0ku384bcfACDpgZ6Yb+9LnG08I7f+gX+M2k3xFkJCmWo7u0JiAdPXg4RaVeMq5 K0fjNjk1sjBPRRpA6XoIETFt2vdkwRjSzuzfh43vhVyyNIZ+nJUWG4RHu8OsR9yfFUw1k kMgEXhHVyO5ftw3KRF4YWAvz6FydC4MryxlJWKvQlxsOxBm1ZKsuoiTxBSed09AUAiO0z VfS6CM7xNN4RUhSqc3q+a6FbEAgVgfHrKgpfyJzq68leWFKu9qUVyRTaO42df2NeDnA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795132796; h=DMARC-Filter:Received:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:Content-Disposition:In-Reply-To; bh=rnfANHm5VndNOm/vGgwNHjAjWuwRHwOMU9aT0kZ9hLM=; b=wDL4ue49Jlg8MZwAKGJFYGYNQmJ85KVhJBFGazJVrOTURGQPPVICecm38ZPEOJ/zZrP3 ENPOwXeocavxrDnU5ew2LdegKnBXboQ5d0PSulZmwTZijRt2BIYCh+2Aj6v4fPeTlb62L BrwWuaNcnI1ppEwyF+anBuRA6HYWPvTQQ4BRvdjTSRo7MEGq7osyyBEbOIIGr15W83+2A oGMkrt6+lbYkVd/l9fRSMh4Uy+n3NGAGMFYNjCLogBr+5XTsuNS6XNzQ11zf3BtQQ+bVo TWu0s9sURdeB02HpWuTH7UtBTuPVANOFB4+mq+hBhnNXKSyxuAMVhj0T2sRiPSteVvw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=makrotopia.org; spf=pass smtp.mailfrom=makrotopia.org; arc=none smtp.remote-ip=185.142.180.65 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5F62606A320 for ; Thu, 19 Nov 2026 23:59:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C5F62606A320 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=makrotopia.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=makrotopia.org Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256:X25519MLKEM768) (Exim 4.100.1) (envelope-from ) id 1xUC2h-0000000022k-3H1J; Thu, 19 Nov 2026 23:59:51 +0000 Date: Thu, 19 Nov 2026 23:59:42 +0000 From: Daniel Golle To: Neil Armstrong , Dmitry Baryshkov , Robert Foss , Laurent Pinchart , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Matthias Brugger , AngeloGioacchino Del Regno , Hermes Wu , Pin-yen Lin Cc: Chen-Yu Tsai , Jiaxin Yu , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v9 04/14] drm/bridge: it6505: unregister DP AUX adapter on bridge detach Message-ID: References: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: The DP AUX adapter is registered in .attach() but only unregistered in i2c remove(). Unbinding and rebinding the DRM device while the i2c driver stays bound registers the adapter a second time, which fails. Also unregister it in .detach() and on the .attach() error path, which so far leaked the registration. remove() keeps its call, which waits for in-flight AUX device users before devres frees the regmap. Track the registration in a flag so that each path only unregisters an adapter that is actually registered. A mutex serialises the flag, so that remove() cannot return while .detach() is still waiting for AUX device users. aux_lock cannot be reused for this, as AUX transfers take it while drm_dp_aux_unregister() waits for them. Fixes: b5c84a9edcd4 ("drm/bridge: add it6505 driver") Signed-off-by: Daniel Golle --- drivers/gpu/drm/bridge/ite-it6505.c | 33 ++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c index 9c4aae383c1c5..42fd24de9e147 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -439,6 +439,8 @@ struct it6505 { struct mutex extcon_lock; struct mutex mode_lock; /* used to bridge_detect */ struct mutex aux_lock; /* used to aux data transfers */ + struct mutex aux_reg_lock; /* protects aux_registered */ + bool aux_registered; struct regmap *regmap; struct drm_display_mode source_output_mode; struct drm_display_mode video_info; @@ -3069,6 +3071,29 @@ static inline struct it6505 *bridge_to_it6505(struct drm_bridge *bridge) return container_of(bridge, struct it6505, bridge); } +static int it6505_register_aux(struct it6505 *it6505) +{ + int ret; + + mutex_lock(&it6505->aux_reg_lock); + ret = drm_dp_aux_register(&it6505->aux); + if (!ret) + it6505->aux_registered = true; + mutex_unlock(&it6505->aux_reg_lock); + + return ret; +} + +static void it6505_unregister_aux(struct it6505 *it6505) +{ + mutex_lock(&it6505->aux_reg_lock); + if (it6505->aux_registered) { + drm_dp_aux_unregister(&it6505->aux); + it6505->aux_registered = false; + } + mutex_unlock(&it6505->aux_reg_lock); +} + static int it6505_bridge_attach(struct drm_bridge *bridge, struct drm_encoder *encoder, enum drm_bridge_attach_flags flags) @@ -3085,8 +3110,7 @@ static int it6505_bridge_attach(struct drm_bridge *bridge, /* Register aux channel */ it6505->aux.drm_dev = bridge->dev; - ret = drm_dp_aux_register(&it6505->aux); - + ret = it6505_register_aux(it6505); if (ret < 0) { dev_err(dev, "Failed to register aux: %d", ret); return ret; @@ -3096,6 +3120,7 @@ static int it6505_bridge_attach(struct drm_bridge *bridge, ret = it6505_use_notifier_module(it6505); if (ret < 0) { dev_err(dev, "use notifier module failed"); + it6505_unregister_aux(it6505); return ret; } } @@ -3109,6 +3134,7 @@ static void it6505_bridge_detach(struct drm_bridge *bridge) flush_work(&it6505->link_works); it6505_remove_notifier_module(it6505); + it6505_unregister_aux(it6505); } static enum drm_mode_status @@ -3573,6 +3599,7 @@ static int it6505_i2c_probe(struct i2c_client *client) mutex_init(&it6505->extcon_lock); mutex_init(&it6505->mode_lock); mutex_init(&it6505->aux_lock); + mutex_init(&it6505->aux_reg_lock); it6505->bridge.of_node = client->dev.of_node; it6505->connector_status = connector_status_disconnected; @@ -3655,7 +3682,7 @@ static void it6505_i2c_remove(struct i2c_client *client) struct it6505 *it6505 = i2c_get_clientdata(client); drm_bridge_remove(&it6505->bridge); - drm_dp_aux_unregister(&it6505->aux); + it6505_unregister_aux(it6505); it6505_debugfs_remove(it6505); it6505_remove_notifier_module(it6505); disable_irq(it6505->irq); -- 2.56.1