From mboxrd@z Thu Jan 1 00:00:00 1970 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 C326143F0B4 for ; Thu, 16 Jul 2026 13:21:13 +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=1784208074; cv=none; b=bMECJBgccLf7+ZXe54ZF+zP240WLSjLd1/0riZqwAj4AV3n/SVNUPPEtmijmj0hXKm5thSbtjGvYlwETHIVcuTXJT1VjU2XRNtpoSzLV9yuJbvv/0bMfeXEZEO4KRJvtc4gplH58I2lvMPIHflLTo7o5EpjsMCEyUhhTsdvvElg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784208074; c=relaxed/simple; bh=3HOfp0UNJ48N1tCLkKv9h4j7D3fPzthk/mm0ifhw99A=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gN+xqcNpGY5I4kueqoCvUVKEdOOj7c/+JiyxEhSoB2KvzaGDlWpVFLbdFXY7DCPvIyki8iA3hfTrD91DOLrzd05rBz0Rp1Y8Kj3xITleyyMjm77pDcXcen2nvC4JJLMX/uQVBk/Y/Gfo12ptFH5pKT1LtAjuzLO+RiFpWKc+/88= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VWzDH6HK; 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="VWzDH6HK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94B151F00A3A; Thu, 16 Jul 2026 13:21:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784208073; bh=5+PTVvtbxISQHBh7RDfP9RhXJiuh9DQQG1Am4RdSHNo=; h=From:To:Cc:Subject:Date; b=VWzDH6HKO66dhqFPwZt4Mw2z+IwI9naF9ychftoED8XY5nqveyqmvIIE1OxYfYjiC zIveTkz/zovHhdcc/Ze9mz6hxbhVM6jcHPyYzU/9YkdfciE+1KS63V9mJX1qkrIrFr g/bMeNYFs62QI2x9erMnZ6toFGpV418L/v3umUf4ngDuelbgYVeP1R7hzGZv+IP3IH 3AF+ReY6nlu3H2KM3bm/WSVBWpQ5/vRCahO4KgcXtdL/bFWNzMkZSQQ7D7/n0u5oc3 v5FHeD/PhQWpi9YWNel+OP3lyV3q2qvqrF5y9PTdOQR/d+A8XtY29Rw7pXTVACUx0D 1u3Vt0daJz5pg== Received: from johan by xi.lan with local (Exim 4.99.4) (envelope-from ) id 1wkM1X-00000006Z8A-22kw; Thu, 16 Jul 2026 15:21:11 +0200 From: Johan Hovold To: Chun-Kuang Hu , Philipp Zabel Cc: David Airlie , Simona Vetter , Matthias Brugger , AngeloGioacchino Del Regno , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH] drm/mediatek: mtk_hdmi_common: take i2c adapter module reference Date: Thu, 16 Jul 2026 15:21:03 +0200 Message-ID: <20260716132103.1564995-1-johan@kernel.org> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/gpu/drm/mediatek/mtk_hdmi_common.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_common.c b/drivers/gpu/drm/mediatek/mtk_hdmi_common.c index a049489daa2d..042b98e5a519 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi_common.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_common.c @@ -290,6 +290,13 @@ static int mtk_hdmi_get_cec_dev(struct mtk_hdmi *hdmi, struct device *dev, struc return 0; } +static void mtk_hdmi_put_adapter(void *_adap) +{ + struct i2c_adapter *adap = _adap; + + i2c_put_adapter(adap); +} + static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, struct platform_device *pdev, const char * const *clk_names, size_t num_clocks) { @@ -328,12 +335,12 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, struct platform_device if (!i2c_np) return dev_err_probe(dev, -EINVAL, "No ddc-i2c-bus in connector\n"); - hdmi->ddc_adpt = of_find_i2c_adapter_by_node(i2c_np); + hdmi->ddc_adpt = of_get_i2c_adapter_by_node(i2c_np); of_node_put(i2c_np); if (!hdmi->ddc_adpt) return dev_err_probe(dev, -EPROBE_DEFER, "Failed to get ddc i2c adapter by node\n"); - ret = devm_add_action_or_reset(dev, mtk_hdmi_put_device, &hdmi->ddc_adpt->dev); + ret = devm_add_action_or_reset(dev, mtk_hdmi_put_adapter, hdmi->ddc_adpt); if (ret) return ret; -- 2.54.0