From nobody Thu Apr 10 21:38:01 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 2383D24BC00 for ; Thu, 3 Apr 2025 11:09:22 +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=1743678565; cv=none; b=YVC6qqdX8bYGUQppIbt+D1T6vNmusvNZ4amPX4nnx8KzNW7sPO0TmRWdbe9gEMaR3E9D6wSu8f+AJBUnfmGSTkmqcpu1EU80O3IkqK5mfQuZgppFAnleClbnAyOXNV7p0uVpmDs5eoUjQweYRpppvnziQQXrlE4XQeTm/TTQ+wo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743678565; c=relaxed/simple; bh=6U0cHRYsd8YJZVPQS4TWK9TB+mTlNZFERJhRe89GdgA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=X5LsArOQvKzyxvXBX+J8sT6OLi0jcjNd19tSd3dYYVEDrqQOf3pDXZFdKsdy+Jy8YFQcHWiuEQFZaZrB7b0ALN385sgghKZQX7BLUzbZrzVvvEQwny5Gx0/ihL7G85HaBLoeygrBzllJA6mhcmvCFZbsYjtncmfMO1bMoFQPpY0= 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=hGUVqqWW; 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="hGUVqqWW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1743678561; bh=6U0cHRYsd8YJZVPQS4TWK9TB+mTlNZFERJhRe89GdgA=; h=From:To:Cc:Subject:Date:From; b=hGUVqqWWvT6HZ8wy3gVVJ99WBr//wGvHfNckq266fh3RrwSdsFjfCOTVRxuWCRkDj eNBwVRzUNd5vi72D7vnYUxYFhnT8JI7X3G+ZaMzmREmV0D/HaTDtb4XDwfGDJx8K3C SYng2KuqoY6AblI0COl23ewcoHiMv6CW9UYpPpVFOLMdSr5713KbC+NgbvSo+S9w7j YDxWTv2bYw5L1fsfZojKUHEKPfrN+zXHtc30/7RjMLMFjUK1kNjYP0u0vQXUmfkM4r u6ag4br80yBZZ8oxTV4oey8BmG85ck560VjpuJqGboYudnEMRdXQHnKGH9l83kCuyO gWHGzPIyWBovQ== 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 4F51517E00A3; Thu, 3 Apr 2025 13:09:20 +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, nancy.lin@mediatek.com, ck.hu@mediatek.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, wenst@chromium.org, kernel@collabora.com Subject: [PATCH] drm/mediatek: mtk_dp: Fix hdmi codec and phy driver unregistration Date: Thu, 3 Apr 2025 13:09:15 +0200 Message-ID: <20250403110915.75322-1-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.48.1 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 3d4648d2e15f..3eb685a46d99 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2648,6 +2648,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); @@ -2658,18 +2665,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, @@ -2679,6 +2697,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"); @@ -2848,9 +2873,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) del_timer_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.48.1