From nobody Thu Oct 2 02:15:15 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (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 941342DEA7E for ; Wed, 24 Sep 2025 10:37:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758710245; cv=none; b=MWVVML/rY8H7X0JROwLhYMrmBksko4HGwkC/MoGbJqHOmrR/IVdKP3UJUbQoUBU5a1Fz0NJ/Iubl0HuGbpHCYynGnzfiFsjiaC6UuoqZDC+B+9TmqvHDu+1az+4pK3/0x6NpXTFAaRT/dUt9HN4EKvTAJD7XnZZGhbywCwj9aj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758710245; c=relaxed/simple; bh=6q4nIF9PbW8vKqtt8oUILNc6BjJu8LTWVp+LAjhBKV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YTa4guB+vVap6rqsYi2N7/wTk7nkPrR/KvpqOw7P1ktuwyxJvfIoQ5xdaQZNgqJxGxcEY6bPySQBUb/9FHfivdFaLkO9/gsMCgt3E0vqYPy7n5Uq7x4sGo1QHeQTla2ABBAiliqgPLX6yP0Z28DnJJLSykc/DE/C6ID0MFnbr8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=KYorXydr; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="KYorXydr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1758710237; bh=6q4nIF9PbW8vKqtt8oUILNc6BjJu8LTWVp+LAjhBKV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYorXydr04gRo8aD6mEUTsaAEfjf68IsYc/xPn+AY75dqEk4qsAErHToxf/23Qf50 V2kuQKgEinw2Avv35Et65VjGv5ABHECvVsHMSxJMZol1yF0MFMR3KXQzqNfsPSkNzj X45ccvwsAx7OitpexfKtvkU/6G6WTbOTk+0sTj/TyS/8uYAM6FR3b5mEcYDP0zlnrf E7/7deUpAPPZP/K42HOtBv+wvIs+cDB7lnk3R0VhuSQBJ16I+/VqttkQAW/5zIn3kC FdMF2LtvJs9NqI3aSb4fkRQ5nSfRK9JkTOJl5ZdJB299L5EIvM/LesV7hzYM3qDzy1 knM5JDQY4v4WQ== Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id 2324017E12DF; Wed, 24 Sep 2025 12:37:17 +0200 (CEST) From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, simona@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dmitry.osipenko@collabora.com, granquet@baylibre.com, rex-bc.chen@mediatek.com, ck.hu@mediatek.com, amergnat@baylibre.com, djkurtz@chromium.org, littlecvr@chromium.org, bibby.hsieh@mediatek.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com Subject: [PATCH 1/3] drm/mediatek: mtk_dp: Fix hdmi codec and phy driver unregistration Date: Wed, 24 Sep 2025 12:37:06 +0200 Message-ID: <20250924103708.19071-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250924103708.19071-1-angelogioacchino.delregno@collabora.com> References: <20250924103708.19071-1-angelogioacchino.delregno@collabora.com> 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" During probe, this driver is registering two platform devices: one for the HDMI Codec driver and one for the DisplayPort PHY driver. In the probe function, none of the error cases are unregistering any of the two platform devices and this may cause registration of multiple instances of those in case this driver returns one or more probe deferral(s) in the "wrong" spots. In order to fix this, add devm actions to unregister those and remove the manual calls to platform_device_unregister in the mtk_dp_remove() function, as those would otherwise be redundant. Fixes: e71a8ebbe086 ("drm/mediatek: dp: Audio support for MT8195") Fixes: caf2ae486742 ("drm/mediatek: dp: Add support for embedded DisplayPor= t aux-bus") Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_dp.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/m= tk_dp.c index bef6eeb30d3e..9b374b8d079e 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2650,6 +2650,13 @@ static const struct hdmi_codec_ops mtk_dp_audio_code= c_ops =3D { .hook_plugged_cb =3D mtk_dp_audio_hook_plugged_cb, }; =20 +static void mtk_dp_unregister_pdevs(void *data) +{ + struct platform_device *ext_pdev =3D data; + + platform_device_unregister(ext_pdev); +} + static int mtk_dp_register_audio_driver(struct device *dev) { struct mtk_dp *mtk_dp =3D dev_get_drvdata(dev); @@ -2660,18 +2667,29 @@ static int mtk_dp_register_audio_driver(struct devi= ce *dev) .data =3D mtk_dp, .no_capture_mute =3D 1, }; + int ret; =20 mtk_dp->audio_pdev =3D platform_device_register_data(dev, HDMI_CODEC_DRV_NAME, PLATFORM_DEVID_AUTO, &codec_data, sizeof(codec_data)); - return PTR_ERR_OR_ZERO(mtk_dp->audio_pdev); + if (IS_ERR(mtk_dp->audio_pdev)) + return PTR_ERR(mtk_dp->audio_pdev); + + ret =3D devm_add_action_or_reset(dev, mtk_dp_unregister_pdevs, mtk_dp->ph= y_dev); + if (ret) { + platform_device_unregister(mtk_dp->audio_pdev); + return dev_err_probe(dev, ret, + "Failed to add codec unregister devm action"); + } + return 0; } =20 static int mtk_dp_register_phy(struct mtk_dp *mtk_dp) { struct device *dev =3D mtk_dp->dev; + int ret; =20 mtk_dp->phy_dev =3D platform_device_register_data(dev, "mediatek-dp-phy", PLATFORM_DEVID_AUTO, @@ -2681,6 +2699,13 @@ static int mtk_dp_register_phy(struct mtk_dp *mtk_dp) return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev), "Failed to create device mediatek-dp-phy\n"); =20 + ret =3D devm_add_action_or_reset(dev, mtk_dp_unregister_pdevs, mtk_dp->ph= y_dev); + if (ret) { + platform_device_unregister(mtk_dp->phy_dev); + return dev_err_probe(dev, ret, + "Failed to add phy unregister devm action"); + } + mtk_dp_get_calibration_data(mtk_dp); =20 mtk_dp->phy =3D devm_phy_get(&mtk_dp->phy_dev->dev, "dp"); @@ -2850,9 +2875,6 @@ static void mtk_dp_remove(struct platform_device *pde= v) pm_runtime_disable(&pdev->dev); if (mtk_dp->data->bridge_type !=3D DRM_MODE_CONNECTOR_eDP) timer_delete_sync(&mtk_dp->debounce_timer); - platform_device_unregister(mtk_dp->phy_dev); - if (mtk_dp->audio_pdev) - platform_device_unregister(mtk_dp->audio_pdev); } =20 #ifdef CONFIG_PM_SLEEP --=20 2.51.0