From nobody Sat Jul 25 04:53:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 ABAA942A16F; Fri, 17 Jul 2026 14:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298743; cv=none; b=PHGgEA4USzpORRwfiYdSkKBYYoJdiiqHXAYl2HIer+oq1MnkClzUljAu9CyOnU03J9NVVbGK55St8uuDJsVSttQbUGqhyLGyw+sn9gCej/Y7MSe5Lh6Xz2PfrRD86lCJLAbMnarXegeYGO/WA49jSGZLmw390RBxZ+oycoIh0CA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298743; c=relaxed/simple; bh=3yFGtFWPcBMBFVNyDOjCPPCeFrdoAG1jFJaYoWdNksY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h8vPmgz2N3oWSz6lKG1xBMCVz9v5Rs3duvq3WutzEPg4yPBMwi76IYgLrYqjkjep1E4vvI26DaKMnfXSz0cjlgid9O+NBFF3w5y1NkpfZV6UuAyvJdROtDREaG4MQ5cgJGV0eH9v1+5eL/KbEP5bjB0fM/fncVn1H4khnuDxsnI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c8td4nUK; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c8td4nUK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 77E311F00A3D; Fri, 17 Jul 2026 14:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784298742; bh=9e3obeHSY8HRaZ6EcfLjnYIVQchvEOlgGb8kG32Ajkg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c8td4nUK7DFtkSGo+eOM1wpgNsRE5Vge+fb6YkTM6Fyfg0QayTXHYNwnOoSKsiK3x WvoKYoq8qh0iSFfXStsANMmjcvRngKDYQJqfllIk1UmymlN1EpJhMJO1uviplU8fn1 UW30ONCjhE1u+CM45O27/Q3Ktag4rLnglHuA39+ZFL7LjL1JgIRyDT6IFV893UBVhm NHIOUpqNsZXdLbreP/8U9MYh1kzyimEl3g/3Aaet8gX82jhdGVjILKuPJOPRpzX5ya lXxQDvUJhquY7pL74r7/3tyEIb2s0Ixo6f/jxHjXi+OJzNpGQiU7T2hcEFTwdn3e4f zgkqKfz+L+eVQ== Received: from johan by xi.lan with local (Exim 4.99.4) (envelope-from ) id 1wkjbw-00000007cDD-0oss; Fri, 17 Jul 2026 16:32:20 +0200 From: Johan Hovold To: Douglas Anderson , Neil Armstrong , Jessica Zhang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 1/2] drm/panel-edp: fix i2c adapter leak on probe failure Date: Fri, 17 Jul 2026 16:31:18 +0200 Message-ID: <20260717143119.1815106-2-johan@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260717143119.1815106-1-johan@kernel.org> References: <20260717143119.1815106-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to drop the i2c adapter reference on probe failure (e.g. probe deferral) and on driver unbind also if a devicetree redundantly uses the 'ddc-i2c-bus' property to point to the aux ddc bus. Fixes: cc5a3fc041f0 ("drm/panel: panel-simple: Stash DP AUX bus; allow usin= g it for DDC") Cc: stable@vger.kernel.org # 5.15 Reported-by: Douglas Anderson Link: https://lore.kernel.org/r/CAD=3DFV=3DVZPhzHU+Pet2m3L+Pqc7mOPfZC-f5p0O= uNL79wNZPxRg@mail.gmail.com Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- drivers/gpu/drm/panel/panel-edp.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index aa27d6cd932e..ac815729aa83 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -831,6 +831,13 @@ static int generic_edp_panel_probe(struct device *dev,= struct panel_edp *panel) return 0; } =20 +static void panel_edp_put_adapter(void *_adap) +{ + struct i2c_adapter *adap =3D _adap; + + put_device(&adap->dev); +} + static int panel_edp_probe(struct device *dev, const struct panel_desc *de= sc, struct drm_dp_aux *aux) { @@ -878,6 +885,11 @@ static int panel_edp_probe(struct device *dev, const s= truct panel_desc *desc, =20 if (!panel->ddc) return -EPROBE_DEFER; + + err =3D devm_add_action_or_reset(dev, panel_edp_put_adapter, + panel->ddc); + if (err) + return err; } else if (aux) { panel->ddc =3D &aux->ddc; } @@ -889,7 +901,7 @@ static int panel_edp_probe(struct device *dev, const st= ruct panel_desc *desc, =20 err =3D drm_panel_of_backlight(&panel->base); if (err) - goto err_finished_ddc_init; + return err; =20 /* * We use runtime PM for prepare / unprepare since those power the panel @@ -936,9 +948,6 @@ static int panel_edp_probe(struct device *dev, const st= ruct panel_desc *desc, err_finished_pm_runtime: pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); -err_finished_ddc_init: - if (panel->ddc && (!panel->aux || panel->ddc !=3D &panel->aux->ddc)) - put_device(&panel->ddc->dev); =20 return err; } @@ -982,8 +991,6 @@ static void panel_edp_remove(struct device *dev) =20 pm_runtime_dont_use_autosuspend(dev); pm_runtime_disable(dev); - if (panel->ddc && (!panel->aux || panel->ddc !=3D &panel->aux->ddc)) - put_device(&panel->ddc->dev); =20 drm_edid_free(panel->drm_edid); panel->drm_edid =3D NULL; --=20 2.54.0 From nobody Sat Jul 25 04:53:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 ABB4A42A171 for ; Fri, 17 Jul 2026 14:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298743; cv=none; b=Xp+Vwyf+hrx6qHiM+E4MjZpqdUoKxFFLicB3hiMJnZCxQ9QNxUAku17TR/8IPnaJMgAundSQKZTFZUWoji4JlNtfa3YSdrW71Nz+VZSx0NFsgGR4iomtus9wzcPGjjRAmR/W/f/EYEo8zAqKViK+/RNqt6L0WdEiFXB97ECfm6A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784298743; c=relaxed/simple; bh=TVigLrY2IwIhNZ99RvGrxl/ztmu30auY+Wnb/g5LXR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bGGFrQx/14VVThRpdqqavzSeOnrMd41a8Ejm9Zt9hX/qmPheLXNpw8bvWRMlCD5xyByBVxl1dHLS/IgBcO/Ve2f2giL8LmVeMT5088NvTS3qHH8MEDlGtiZRL1sH3lnSiONIsHnZPreIHcfU6COu8lxU6MIYl52egy4EEkTRnrs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TCtKBw7W; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TCtKBw7W" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FCC91F000E9; Fri, 17 Jul 2026 14:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784298742; bh=EWJ6GGiCe+HmzuKwuv1zPKCZtQLuNomeRk/0qeAVPxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TCtKBw7Wd/yj5F+ULu9tBSU6+NyHSFDIh4edpYvBVlEk88YPz1ihn4hdIeeKP6Vhf LhKhKDcq7HXEkCkC5ubC9jSS3tvjdbr7POHjhzY9n04o/wdMkzRzRzlrWEoyioAxfp C2L+unCba2r/ae6cl679PNBIPFuZomMvQ7THtpyyZDwXrb8AIT10df3InvGR/9Njnl xSWhHlhbg9L7sxed0m4tJ0WcPNaHm5gHInBuD7XqyL58Dxib5BzpaK6rWt4TpA4Cal pgNYGsx/SEbYjdHcrUpoNBzEFsO9bnvny70wuLjEbMeRfUQ/L520xKvS9a0sD6GkNd qvS/wDOfd08Tg== Received: from johan by xi.lan with local (Exim 4.99.4) (envelope-from ) id 1wkjbw-00000007cDF-0rVX; Fri, 17 Jul 2026 16:32:20 +0200 From: Johan Hovold To: Douglas Anderson , Neil Armstrong , Jessica Zhang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 2/2] drm/panel-edp: take i2c adapter module reference Date: Fri, 17 Jul 2026 16:31:19 +0200 Message-ID: <20260717143119.1815106-3-johan@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260717143119.1815106-1-johan@kernel.org> References: <20260717143119.1815106-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The i2c subsystem currently blocks during adapter deregistration whenever there are consumers holding a reference. Switch to using of_get_i2c_adapter_by_node() which also takes a reference to the adapter module so that an attempt to unload the module while in use fails gracefully instead of blocking uninterruptibly. Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- drivers/gpu/drm/panel/panel-edp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index ac815729aa83..522bc665a11a 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -835,7 +835,7 @@ static void panel_edp_put_adapter(void *_adap) { struct i2c_adapter *adap =3D _adap; =20 - put_device(&adap->dev); + i2c_put_adapter(adap); } =20 static int panel_edp_probe(struct device *dev, const struct panel_desc *de= sc, @@ -880,7 +880,7 @@ static int panel_edp_probe(struct device *dev, const st= ruct panel_desc *desc, =20 ddc =3D of_parse_phandle(dev->of_node, "ddc-i2c-bus", 0); if (ddc) { - panel->ddc =3D of_find_i2c_adapter_by_node(ddc); + panel->ddc =3D of_get_i2c_adapter_by_node(ddc); of_node_put(ddc); =20 if (!panel->ddc) --=20 2.54.0