From nobody Sat Apr 25 15:07:22 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 481A42236EE for ; Tue, 7 Apr 2026 14:41:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775572917; cv=none; b=ufiev85RiHamOvvrllh+rKF7BbJomzUaZnbvgENUeAOj5vVvLTkpGhT7I1Tlfc1YdT5LX7gi4qEpTfYwbSZ77kctsxliDEUSAY1fwi/jQCnEZ1WXb0g0hcsqYnuqLQt/PH9EsW7j372LBzhVgeCXj6bCaRpttbY/62dVA/VYgeo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775572917; c=relaxed/simple; bh=xQEGRyP1H4wepinHqC9zBhayNpeAzbDrVWZunTvCxuI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DtCdZSHiV0InEOVlaJD7WLi/nl9UthB5LVz72Pb46b3twwNveo49ppAfbj59nXHNmJ23E2NTuPbedxurADbga1Xp4PuTHO89QW8ysiAPpFfd8gs8tiUQKvsB82uRE/a7tpv/eelQyi4CxmIIIMyyh5zrzPTdhkr/vexf5KqnP6o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=n9rq9Hfr; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n9rq9Hfr" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-43cfbd17589so4056364f8f.0 for ; Tue, 07 Apr 2026 07:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775572913; x=1776177713; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aBvRjjOb926xFV+H1FqZpjuC1zFML4FZaPUVcq0/XXk=; b=n9rq9HfruTYCxwwUbdGoyrUAas4SeSb3A7FJW3uPQ+PJKG7bmSDQAPaRNVBBNsSIgK DmACQ7I5vxsHeoglkuLuqr2Lj7b7S8btT0CxUHlFFXka6hd4xIhxT7aKG58WrYrMbmuY ThZSkwRd+htH6bCLVuJd1bZl9Mr3/iCYp5b8uiLeG4eIv8erk214zZN7V9kZSVbVciCc Sv7RBt1W8sg3efzKCHgZR1ImglNalJ1BVidxQXXMIaYSkuCK/0fy5iF6SA0X2sQ0Hwen MauDycOJYLmEduFIlm5ioed6UoEo55QiaK4jR3Ca/WoPyPexTx19Hjl6q80CjXgJdrZn vBbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775572913; x=1776177713; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=aBvRjjOb926xFV+H1FqZpjuC1zFML4FZaPUVcq0/XXk=; b=i+LYThHj6+FNvRHseuvYZZVLrq1qo7cM3bPBazJe3UUFNxxjPHX+SVymYkOm+NEpcX 4XiicNddwJoHjXqYYjUqlHM9SPAina5JAbsEd+KPGNO1UIWCu90keUkfDkyY6q/8Zvzg 53NEc7Pr8w1V8K0Mq1TYXBjuKDKm5dRiAv8U5ZgByq3JuF6x1gnG+vNO6D6t8WFZ7gvw ZupL/tImBfR6yoqCYRGjCfhXU88Vu+9xxKZnJqSp9eUr0q+NtfMI+4BkRqJ+xm9Z7bZU nfg6GhWjY6EdqBT3WrZHhTCCdIA4cZttlcsilRVVCWiK6DoJjYkQZ/MGtsN7GE9fUHiJ 6GbQ== X-Forwarded-Encrypted: i=1; AJvYcCVbw1buJiR1Agivb+Q0Q7VCrWSOhqsGmlbsm6C8ddxx5TkJ52cfHxdiUU0/TfhKA6cIRPEHFLqzhiUvaZ4=@vger.kernel.org X-Gm-Message-State: AOJu0Yyi776PPOgtGOGyZLtCBnnCYJwbzD3+znnkOWEQqrqsPX6YFcwa aGy31F8cTAqP+e3U9dOozFivPWlI8BX79NgwtXU2Fn1vVIy4s2Ut0+cw X-Gm-Gg: AeBDieudgPsWe9lS7ZYE1blgaPGCo/CPEdlnihTmwzZAQOx41gI4iRbuvEh/81AwEko xq9vDn1fRUZFIdlxdC7wCIovZHDYFTRbrzlX5Dv75cxskTBt5IWWhafX763kIcSQOXlRjhLHTMf 2qnQIwq/2ZKGiNhn7ybbE1uSicVcLgeiOEEKvheg/0JjOCyXPK8DI/oA6Ar4mBM/9WXq/YS4HeE //qC3Bxqb+9u3TA2klsbGNlVX+/IUrZJ3XsOnSatjYZa59AePComy6lTi96kf7Ex4OhEgJRwe+f OqfC1RWFj9SIzMIApMiGyoirH5OuSqf95nBKbKxxBBKosRRdUGzxqulT/cHao2vc99B7L5L5T+V RxMIQ4bIjQOL1WgTtLTzL80975lAGa3urSMGALXmIKJirwWMRhG1RnyVXkhBk6aO4z3MuPj+H0E ifbD9z2BWeS56tEK+Xqw3ereCz7WJOcgz38iZYlBE= X-Received: by 2002:a5d:4445:0:b0:43d:4a43:53db with SMTP id ffacd0b85a97d-43d4a4355afmr3472891f8f.26.1775572913195; Tue, 07 Apr 2026 07:41:53 -0700 (PDT) Received: from vitor-nb (dsl-43-224.bl27.telepac.pt. [176.79.43.224]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43d1e4e5890sm49990292f8f.31.2026.04.07.07.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 07:41:52 -0700 (PDT) From: Vitor Soares To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Vitor Soares , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Tomi Valkeinen Subject: [PATCH v4] drm/bridge: cdns-dsi: Replace deprecated UNIVERSAL_DEV_PM_OPS() Date: Tue, 7 Apr 2026 15:41:41 +0100 Message-ID: <20260407144142.1420354-2-ivitro@gmail.com> X-Mailer: git-send-email 2.53.0 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" From: Vitor Soares 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 SET_RUNTIME_PM_OPS(), enabling suspend/resume handling through the _enable()/_disable() hooks managed by the DRM framework for both runtime and system-wide PM. 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 --- v3 -> v4 - Add Reviewed-by from Tomi Valkeinen - Rebase on top of drm-misc-fixes - Verified issue still present on current mainline v2 -> v3 - Fix warning: 'cdns_dsi_suspend' defined but not used [-Wunused-function] - Fix warning: 'cdns_dsi_resume' defined but not used [-Wunused-function] v1 -> v2 - Rely only on SET_RUNTIME_PM_OPS() for the PM. drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c b/drivers/gpu/d= rm/bridge/cadence/cdns-dsi-core.c index 0dd85e26248c..e07a9892df4e 100644 --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c @@ -1230,7 +1230,7 @@ static const struct mipi_dsi_host_ops cdns_dsi_ops = =3D { .transfer =3D cdns_dsi_transfer, }; =20 -static int __maybe_unused cdns_dsi_resume(struct device *dev) +static int cdns_dsi_resume(struct device *dev) { struct cdns_dsi *dsi =3D dev_get_drvdata(dev); =20 @@ -1241,7 +1241,7 @@ static int __maybe_unused cdns_dsi_resume(struct devi= ce *dev) return 0; } =20 -static int __maybe_unused cdns_dsi_suspend(struct device *dev) +static int cdns_dsi_suspend(struct device *dev) { struct cdns_dsi *dsi =3D dev_get_drvdata(dev); =20 @@ -1251,8 +1251,9 @@ static int __maybe_unused cdns_dsi_suspend(struct dev= ice *dev) return 0; } =20 -static UNIVERSAL_DEV_PM_OPS(cdns_dsi_pm_ops, cdns_dsi_suspend, cdns_dsi_re= sume, - NULL); +static const struct dev_pm_ops cdns_dsi_pm_ops =3D { + RUNTIME_PM_OPS(cdns_dsi_suspend, cdns_dsi_resume, NULL) +}; =20 static int cdns_dsi_drm_probe(struct platform_device *pdev) { @@ -1399,7 +1400,7 @@ static struct platform_driver cdns_dsi_platform_drive= r =3D { .driver =3D { .name =3D "cdns-dsi", .of_match_table =3D cdns_dsi_of_match, - .pm =3D &cdns_dsi_pm_ops, + .pm =3D pm_ptr(&cdns_dsi_pm_ops), }, }; module_platform_driver(cdns_dsi_platform_driver); --=20 2.53.0