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 2DF40449B28 for ; Thu, 30 Jul 2026 19:29:16 +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=1785439761; cv=none; b=SiJVss9hUV6J755ulnjaXTvHJToWgbo0DU6KmB0goPgiCDmjQHHiTPt9RhiGTSLAtD5/d6xWwviuUZAbm57VnG9uTGZ05PimUpkQBVZmSOLWvufTbGwAIRFCupsXhwFKtJ2bSpvYq8HMm4P1FLfZUYqNDOyVpTknMi+ZI1qKczQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785439761; c=relaxed/simple; bh=ST042sEA1UjRxgl+sz2KmmRsNw0r8j+wd5EZ/38sOUY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c880mWtx6MWwkm9CzOBrMCpHS4In9Uc4B2QuMOMyJpfYZVX6nNf4rVCDnU0mxhpnqskne7NUHkkycXh/Pg04eI2O+a8LCnIra//Z5RPtx5vGvdj2lwS/dUXTUN/CF3DDm5n6kQwtlJOY0t56U7MM6DXkCRwtSAE9JDOMzQjUSZc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xsu+PDUj; 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="Xsu+PDUj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E70C31F000E9; Thu, 30 Jul 2026 19:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785439756; bh=OfsDAwM5tpBn9EI/v/7IWf27Pfr2FXHMdW2yn6yNh0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xsu+PDUjUDB0CkVDtFXF2t1EXRzGU3LH3Ub07tdTCyOA/iCpAyvyDqtpkb3TUOigi nWnVQ1/e2/mIsws5CDwT8TK2pZLcPEGOG0ZPPoErWrl/TE0yMwdv0EhHxfEOwAa5+R 9fjr59FPupUDC5bfUJ9pxSKOOywHvlZUiYgurfadAnYaWDmUd3CkixKLEuGdY+NvaZ FMZOA13rR1GP3Q5SLyiUjVHFFrQlsypi8SwisDk6IVJBejhz3TxDXTIfg1GHm+GfGX JYjfaEB2VQ1rPWC4kXBaDXdrPfYLbL48iANj9eFwYD/70UBVk7gyYTn+eo87QMTZ0y Q5ZVtw39LQA0A== From: Sasha Levin To: stable@vger.kernel.org Cc: Vitor Soares , Tomi Valkeinen , Luca Ceresoli , Sasha Levin Subject: [PATCH 6.1.y] drm/bridge: cdns-dsi: Replace deprecated UNIVERSAL_DEV_PM_OPS() Date: Thu, 30 Jul 2026 15:29:13 -0400 Message-ID: <20260730192913.3123445-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072909-childish-udder-2b58@gregkh> References: <2026072909-childish-udder-2b58@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Vitor Soares [ Upstream commit 2d8b08844c0ecc6f2002fa68711e779aa18c8585 ] The deprecated UNIVERSAL_DEV_PM_OPS() macro uses the provided callbacks for both runtime PM and system sleep. This causes the DSI clocks to be disabled twice: once during runtime suspend and again during system suspend, resulting in a WARN message from the clock framework when attempting to disable already-disabled clocks. [ 84.384540] clk:231:5 already disabled [ 84.388314] WARNING: CPU: 2 PID: 531 at /drivers/clk/clk.c:1181 clk_core_disable+0xa4/0xac ... [ 84.579183] Call trace: [ 84.581624] clk_core_disable+0xa4/0xac [ 84.585457] clk_disable+0x30/0x4c [ 84.588857] cdns_dsi_suspend+0x20/0x58 [cdns_dsi] [ 84.593651] pm_generic_suspend+0x2c/0x44 [ 84.597661] ti_sci_pd_suspend+0xbc/0x15c [ 84.601670] dpm_run_callback+0x8c/0x14c [ 84.605588] __device_suspend+0x1a0/0x56c [ 84.609594] dpm_suspend+0x17c/0x21c [ 84.613165] dpm_suspend_start+0xa0/0xa8 [ 84.617083] suspend_devices_and_enter+0x12c/0x634 [ 84.621872] pm_suspend+0x1fc/0x368 To address this issue, replace UNIVERSAL_DEV_PM_OPS() with RUNTIME_PM_OPS(). Bridge and panel drivers should only deal with runtime PM, as the DRM framework manages system-wide power transitions through the bridge enable() and disable() hooks. Link: https://lore.kernel.org/all/fbde0659-78f3-46e4-98cf-d832f765a18b@ideasonboard.com/ Cc: stable@vger.kernel.org # 6.1.x Fixes: e19233955d9e ("drm/bridge: Add Cadence DSI driver") Reviewed-by: Tomi Valkeinen Signed-off-by: Vitor Soares Reviewed-by: Luca Ceresoli Link: https://patch.msgid.link/20260505134705.188661-2-ivitro@gmail.com Signed-off-by: Tomi Valkeinen Signed-off-by: Sasha Levin --- drivers/gpu/drm/bridge/cdns-dsi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c index fd4e1853d414..a66e0698761c 100644 --- a/drivers/gpu/drm/bridge/cdns-dsi.c +++ b/drivers/gpu/drm/bridge/cdns-dsi.c @@ -1189,7 +1189,7 @@ static const struct mipi_dsi_host_ops cdns_dsi_ops = { .transfer = cdns_dsi_transfer, }; -static int __maybe_unused cdns_dsi_resume(struct device *dev) +static int cdns_dsi_resume(struct device *dev) { struct cdns_dsi *dsi = dev_get_drvdata(dev); @@ -1200,7 +1200,7 @@ static int __maybe_unused cdns_dsi_resume(struct device *dev) return 0; } -static int __maybe_unused cdns_dsi_suspend(struct device *dev) +static int cdns_dsi_suspend(struct device *dev) { struct cdns_dsi *dsi = dev_get_drvdata(dev); @@ -1210,8 +1210,9 @@ static int __maybe_unused cdns_dsi_suspend(struct device *dev) return 0; } -static UNIVERSAL_DEV_PM_OPS(cdns_dsi_pm_ops, cdns_dsi_suspend, cdns_dsi_resume, - NULL); +static const struct dev_pm_ops cdns_dsi_pm_ops = { + RUNTIME_PM_OPS(cdns_dsi_suspend, cdns_dsi_resume, NULL) +}; static int cdns_dsi_drm_probe(struct platform_device *pdev) { @@ -1338,7 +1339,7 @@ static struct platform_driver cdns_dsi_platform_driver = { .driver = { .name = "cdns-dsi", .of_match_table = cdns_dsi_of_match, - .pm = &cdns_dsi_pm_ops, + .pm = pm_ptr(&cdns_dsi_pm_ops), }, }; module_platform_driver(cdns_dsi_platform_driver); -- 2.53.0