From nobody Thu Oct 2 00:57:45 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 From nobody Thu Oct 2 00:57:45 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 88E251F3BBB for ; Wed, 24 Sep 2025 10:37:20 +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=1758710246; cv=none; b=H9MK3GSjwQvR6rJnITTyqsKl7qi5GYiZ6MccrKacWwduS86OdE/RJPf0BYzPdq77P8Rw8IoS0tBk2Poyv1iSwfaB0raxmdCapEtPGrzVda9makQKOikq6mH6O+CwTeR0tb0nSCSE5gzNelZBGalWn9uyOYk30i7gpV/c2T3quy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758710246; c=relaxed/simple; bh=+J77+l7Lax/S/gMWseCwZwXAhPq50CEolzz2N70e80I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JJx4ZSgqmoHlowSRLpbo3g7G/u3ORnn29By9D3k6E3tHn2b9Jju3N0Yt/l1GxR1v23b7ML7OHvwyFm/+tG5CM3puyTuwpCu9RCNmV9MZkhBl6D4+70Y91feFMeKfotFeGW643zzysrPJftWJxWzOBopj55XjGZaOLZbLwgVrbpk= 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=KkW8jzA0; 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="KkW8jzA0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1758710238; bh=+J77+l7Lax/S/gMWseCwZwXAhPq50CEolzz2N70e80I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KkW8jzA0iWKXbsQJ8Ha4JsBLSVqztaLIMJZEiGGEJrBZmcrvem0mQSqvMpvJS5lYU 8Qq4eMK06HQuKWy/MtfE6+HFB3QONf58p4MG5fr2ur3BxLFvEEgj7RM3w04Kn3nOzT VIfjflLhf1kM05TtORCZqVdVPH1BwKvIMLlBuwTLaq7O+LhIBYSvLIIgnxbwo0z4VV axvVN3xCGMy8d5eSDUY9iu57iv+ncEk2106dOnJWno+hvi3/QirtMDf5bAC/6kPPIh l3HM48U27K4KxV6ITBreCSlXOZ+Thggi49rECVNwwnkL5MEEIRB4z/L+RRkULyI2Hg Jr3Cu+Ur8UL+g== 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 06AAF17E12E4; 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 2/3] drm/mediatek: mtk_disp_ovl: Enable/disable interrupt on bind/unbind Date: Wed, 24 Sep 2025 12:37:07 +0200 Message-ID: <20250924103708.19071-3-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" The OVL driver is installing an ISR in the probe function but, if the component is not bound yet, the interrupt handler may call the vblank_cb ahead of time (while probing other drivers) or too late (while removing other drivers), possibly accessing memory that it should not try to access by reusing stale pointers. In order to fix this, add a new `irq` member to struct mtk_disp_ovl and then set the NOAUTOEN flag to the irq before installing the ISR to manually call enable_irq() and disable_irq() in the bind and unbind callbacks respectively. Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.= ") Link: https://lore.kernel.org/r/20250402083628.20111-5-angelogioacchino.del= regno@collabora.com Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c b/drivers/gpu/drm/medi= atek/mtk_disp_ovl.c index e0236353d499..8e20b45411fc 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_ovl.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl.c @@ -161,6 +161,7 @@ struct mtk_disp_ovl { struct drm_crtc *crtc; struct clk *clk; void __iomem *regs; + int irq; struct cmdq_client_reg cmdq_reg; const struct mtk_disp_ovl_data *data; void (*vblank_cb)(void *data); @@ -594,12 +595,18 @@ void mtk_ovl_bgclr_in_off(struct device *dev) static int mtk_disp_ovl_bind(struct device *dev, struct device *master, void *data) { + struct mtk_disp_ovl *priv =3D dev_get_drvdata(dev); + + enable_irq(priv->irq); return 0; } =20 static void mtk_disp_ovl_unbind(struct device *dev, struct device *master, void *data) { + struct mtk_disp_ovl *priv =3D dev_get_drvdata(dev); + + disable_irq(priv->irq); } =20 static const struct component_ops mtk_disp_ovl_component_ops =3D { @@ -611,16 +618,15 @@ static int mtk_disp_ovl_probe(struct platform_device = *pdev) { struct device *dev =3D &pdev->dev; struct mtk_disp_ovl *priv; - int irq; int ret; =20 priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; =20 - irq =3D platform_get_irq(pdev, 0); - if (irq < 0) - return irq; + priv->irq =3D platform_get_irq(pdev, 0); + if (priv->irq < 0) + return priv->irq; =20 priv->clk =3D devm_clk_get(dev, NULL); if (IS_ERR(priv->clk)) @@ -640,10 +646,10 @@ static int mtk_disp_ovl_probe(struct platform_device = *pdev) priv->data =3D of_device_get_match_data(dev); platform_set_drvdata(pdev, priv); =20 - ret =3D devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler, - IRQF_TRIGGER_NONE, dev_name(dev), priv); + ret =3D devm_request_irq(dev, priv->irq, mtk_disp_ovl_irq_handler, + IRQF_NO_AUTOEN, dev_name(dev), priv); if (ret < 0) - return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); + return dev_err_probe(dev, ret, "Failed to request irq %d\n", priv->irq); =20 pm_runtime_enable(dev); =20 --=20 2.51.0 From nobody Thu Oct 2 00:57:45 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 590D02DF6FF for ; Wed, 24 Sep 2025 10:37:21 +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=1758710246; cv=none; b=efvgPW3u7rAV32b+rZtAGsUe+Kir0sBlSKXVmdL0hp3bfhLzpw+5Q2A+FxcFuODOPCVlwBfEiAS6Fp2t7QhHZtEqgpzb55g9s6SN04Pv3l7fpX3RhVHECrAI5ykqHF9fwJCEpHlshiVa6MSy4rnCQcqiGE5jeAUstoQD7AR7KOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758710246; c=relaxed/simple; bh=zBsUv12CnB+eYEv/phnc2P7PAeGpmJaBNqHcFB5Huqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=htAvueEQoMQOi1tNbHu/rn4zEimndXgfvvY/UvNPkC5UmdLDp6EhE/5HGT4cHaNmg0wbbfIzD4s+Xbx34eX1HVT7rLRjqzhZRdazMXuKrwskoz8pLeSxELM3EwLu8dqUA+GlTLL4LZiMmbJRH7J/57pFQlHYIxJSxY1PymgQ3ik= 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=DjpjYwUb; 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="DjpjYwUb" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1758710239; bh=zBsUv12CnB+eYEv/phnc2P7PAeGpmJaBNqHcFB5Huqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DjpjYwUb5pOMFOpgc5Ffg1V9RI+Q2NHA9uv7N9HEy4JDU+sGEWERm9NJNmIYxIK0Y bWSN2BXojWpqoxWqNoxaCWPULPMLnCLHBfjs9VsUWYkgN++pNztlxZYlZ/1u69egO/ E/MMa6w3OocHpTGsi/oIDnSRAWnonwOCaylCjeIWYIOBC4mjbWMKZnQr0IG458Zc07 2CMrHMLC/GvQ/qITeGf8b+ezFJSzcyAp/JGe6ZLcQKLMahG00tTjmYQMmYk55NzA3P 4YxVxtyjlqjYPussaH4fm/qKnM2UMLi/IwR9TJ8I4lg8hPxfzyeOevyW2n9UtTKlQS CqjUbPidS6+oQ== 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 DC33017E1389; Wed, 24 Sep 2025 12:37:18 +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 3/3] drm/mediatek: mtk_disp_rdma: Enable/disable interrupt on bind/unbind Date: Wed, 24 Sep 2025 12:37:08 +0200 Message-ID: <20250924103708.19071-4-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" The RDMA driver is installing an ISR in the probe function but, if the component is not bound yet, the interrupt handler may call the vblank_cb ahead of time (while probing other drivers) or too late (while removing other drivers), possibly accessing memory that it should not try to access by reusing stale pointers. In order to fix this, like done in the OVL driver, add a new `irq` member to struct mtk_disp_ovl and then set the NOAUTOEN flag to the irq before installing the ISR to manually disable and clear the hwirqs with register writes, and enable_irq() and disable_irq() in the bind and unbind callbacks respectively. Fixes: 119f5173628a ("drm/mediatek: Add DRM Driver for Mediatek SoC MT8173.= ") Link: https://lore.kernel.org/r/20250402083628.20111-6-angelogioacchino.del= regno@collabora.com Signed-off-by: AngeloGioacchino Del Regno --- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 34 ++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/med= iatek/mtk_disp_rdma.c index c9d41d75e7f2..9fd9bb1ee544 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c @@ -81,6 +81,7 @@ struct mtk_disp_rdma_data { struct mtk_disp_rdma { struct clk *clk; void __iomem *regs; + int irq; struct cmdq_client_reg cmdq_reg; const struct mtk_disp_rdma_data *data; void (*vblank_cb)(void *data); @@ -295,13 +296,23 @@ void mtk_rdma_layer_config(struct device *dev, unsign= ed int idx, static int mtk_disp_rdma_bind(struct device *dev, struct device *master, void *data) { - return 0; + struct mtk_disp_rdma *priv =3D dev_get_drvdata(dev); + + /* Disable and clear pending interrupts */ + writel(0x0, priv->regs + DISP_REG_RDMA_INT_ENABLE); + writel(0x0, priv->regs + DISP_REG_RDMA_INT_STATUS); + + enable_irq(priv->irq); =20 + return 0; } =20 static void mtk_disp_rdma_unbind(struct device *dev, struct device *master, void *data) { + struct mtk_disp_rdma *priv =3D dev_get_drvdata(dev); + + disable_irq(priv->irq); } =20 static const struct component_ops mtk_disp_rdma_component_ops =3D { @@ -313,16 +324,15 @@ static int mtk_disp_rdma_probe(struct platform_device= *pdev) { struct device *dev =3D &pdev->dev; struct mtk_disp_rdma *priv; - int irq; int ret; =20 priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; =20 - irq =3D platform_get_irq(pdev, 0); - if (irq < 0) - return irq; + priv->irq =3D platform_get_irq(pdev, 0); + if (priv->irq < 0) + return priv->irq; =20 priv->clk =3D devm_clk_get(dev, NULL); if (IS_ERR(priv->clk)) @@ -345,21 +355,17 @@ static int mtk_disp_rdma_probe(struct platform_device= *pdev) if (ret && (ret !=3D -EINVAL)) return dev_err_probe(dev, ret, "Failed to get rdma fifo size\n"); =20 - /* Disable and clear pending interrupts */ - writel(0x0, priv->regs + DISP_REG_RDMA_INT_ENABLE); - writel(0x0, priv->regs + DISP_REG_RDMA_INT_STATUS); - - ret =3D devm_request_irq(dev, irq, mtk_disp_rdma_irq_handler, - IRQF_TRIGGER_NONE, dev_name(dev), priv); - if (ret < 0) - return dev_err_probe(dev, ret, "Failed to request irq %d\n", irq); - priv->data =3D of_device_get_match_data(dev); =20 platform_set_drvdata(pdev, priv); =20 pm_runtime_enable(dev); =20 + ret =3D devm_request_irq(dev, priv->irq, mtk_disp_rdma_irq_handler, + IRQF_NO_AUTOEN, dev_name(dev), priv); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to request irq %d\n", priv->irq); + ret =3D component_add(dev, &mtk_disp_rdma_component_ops); if (ret) { pm_runtime_disable(dev); --=20 2.51.0