From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) (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 12EB8403123 for ; Mon, 7 Sep 2026 20:17:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.11 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788812255; cv=pass; b=Ray+LjntFmS8AnWrOsg9EwEQw9whQWRGGCXVQGGp9nV5O2rxdwVJ6+y371YC9fEea+EB82tguFZvVy/0vyiWfM0NH8z0epktDDCAR+8mTjUxrNwHj6c/c/nHnEDBP62HAOKa43pAsEFQ/h9l0PtOLS0cCzQ/Y42iRoRzMYycNlI= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788812255; c=relaxed/simple; bh=xtRlWEclna7fpBZRwaaN8ipv7QPcm0cUBvxcGdCNDXY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gIkzsRnXOGv70NKrR8eotz4EeHRmyeB1nQpHFBKb/kHKDEkKriYMYwjxZu/+N8Oni+nyGhuUsL/SyNRhVKG7AZmbVQrkl4IWrn6LvVCwyv4LstNVYJ9Ajk9APUSfxmwD6NkrdubiXhx/SMUnOI3a3sk8LQpT74lMpryb64N76dg= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=HDc411/9; arc=pass smtp.client-ip=136.143.188.11 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 (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="HDc411/9" ARC-Seal: i=1; a=rsa-sha256; t=1788812210; cv=none; d=zohomail.com; s=zohoarc; b=VZweWr/VK1lIqOpiPKfJ3+/D68RNj1Bwnb8afrmu3xKh3s4Ue2+rfNbpbCuVlKDh4FpOFQhtkkjXdLlYlcW2nlv8uasTi31yUW5s3VPDzU3cVfE6+qHzXyoX2rBDI1TsNcfj28zmAqMWWQdqTbFYatgID7uBt91EMkiXEBuDTX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1788812210; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=8yU6CY1Li0Akzlr3bt5a2BjknT/kv0BwUncj4FmHAak=; b=PeUm4PzzgULRYRqIfTg84CjPivXwC6jRxs+u3JQYfU23GfZTkP5BMrBavp11v+tStquWlVF+7tGov/uqjl7aNgge1VGfPvCPISqbeFUsfaF2WEXjim+gwFLUepdqSwMqCwcVm/A0j6nkxfHouEzqFbuVyXgCVDUlUA2OXeT0fSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1788812210; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=8yU6CY1Li0Akzlr3bt5a2BjknT/kv0BwUncj4FmHAak=; b=HDc411/9ep6Vl1Zlc6wrTEyMCjldmgT/yjgZOAChAMNCEYihhsaXlTgX3SrytoBk 2xnWogINHtU7wG1aeQlfuBM/G/0ccAdtZlECBhbZRFVlpD9bffzdav1XmcxCAyEZmMa eufa9YaoyQXftzShs0RuFo/uXnuZbjKtcMi8xSvA= Received: by mx.zohomail.com with SMTPS id 1788812209620170.80202207594527; Mon, 7 Sep 2026 13:16:49 -0700 (PDT) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= Date: Mon, 07 Sep 2026 21:16:14 +0100 Subject: [PATCH v8 05/16] drm/panfrost: Consolidate device clock management and reset Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260907-claude-fixes-v8-5-c2bcb5e82184@collabora.com> References: <20260907-claude-fixes-v8-0-c2bcb5e82184@collabora.com> In-Reply-To: <20260907-claude-fixes-v8-0-c2bcb5e82184@collabora.com> To: Boris Brezillon , Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Faith Ekstrand , "Marty E. Plummer" , Tomeu Vizoso , Eric Anholt , Alyssa Rosenzweig , Robin Murphy , Philipp Zabel Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Collabora Kernel Team , =?utf-8?q?Adri=C3=A1n_Larumbe?= , Neil Armstrong X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6154; i=adrian.larumbe@collabora.com; h=from:subject:message-id; bh=xtRlWEclna7fpBZRwaaN8ipv7QPcm0cUBvxcGdCNDXY=; b=owEB7QES/pANAwAKAQ4mfkzuU0M9AcsmYgBqnxuLPdzQp9kdK0/PHUc8LOp3rvkhSKmLjFgxc dzPbe2HQQ+JAbMEAAEKAB0WIQQyQDDowAUXXfk3B6QOJn5M7lNDPQUCap8biwAKCRAOJn5M7lND PeQTC/9ZlXwaut9zQMKhYCr9G2afCMEOCnw3V97nW19O53hRJtnbN37H1rp0Ss6excwQYL/J0On SYXjf8nU993olKzcCOQfDDd1L7nJI+MAkualUmo1EF7RNEDZnbWZ0aazAZg24imBa1VVhgZnYKq fzm960T/SKn5774PImVpxz8jpD9GyErgTxYT/BqCyv/2w7Mg5s83f/rWlI4AlIyrsA0NEpQ/RcH FJc70/6saHG9e5ivd4wmEl+ASI8S/mvKDNEY54iHRwgZwnyg1upONiRGVOxo/th5QZvOMSaY5gB DVzQuOsYAGJ53aSVgu3mSaHliFxicOV9I2GHm8D+xB+gORNs5Rk1KWpLGj7T8JCuAFm9skysHri iMscfF6sA/M943Pi5aO76dKdpPZ9MUq3oi3xznuGCH++pVSXEE8gnRiP/+yfgV8zTrS3qhUqb8g 1vCN4qu41gNMoAHtxscOTifklyK4rlYWU3B040hfcaeqaP13u7s4f+3mF5F91BgT3nPP8= X-Developer-Key: i=adrian.larumbe@collabora.com; a=openpgp; fpr=324030E8C005175DF93707A40E267E4CEE53433D Gather all clock enables and disables into a single function to avoid repetitions between driver init/fini and device resume/suspend, since these clocks are always handled in bulk. Also do clk (un)prepares and dis/enables at the same time, since the clk_prepare_* family of functions can simply increase the refcnt of an already prepared clock. Signed-off-by: Adrián Larumbe --- drivers/gpu/drm/panfrost/panfrost_device.c | 110 +++++++++++++---------------- 1 file changed, 51 insertions(+), 59 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index b3a53504bd01..48135e412b6c 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -34,10 +34,43 @@ static void panfrost_reset_fini(struct panfrost_device *pfdev) reset_control_assert(pfdev->rstc); } -static int panfrost_clk_init(struct panfrost_device *pfdev) +static int panfrost_clk_enable(struct panfrost_device *pfdev) { int err; + + err = clk_prepare_enable(pfdev->clock); + if (err) + return err; + + err = clk_prepare_enable(pfdev->bus_clock); + if (err) + goto disable_clock; + + err = clk_prepare_enable(pfdev->bus_ace_clock); + if (err) + goto disable_bus_clock; + + return 0; + +disable_bus_clock: + clk_disable_unprepare(pfdev->bus_clock); +disable_clock: + clk_disable_unprepare(pfdev->clock); + + return err; +} + +static void panfrost_clk_disable(struct panfrost_device *pfdev) +{ + clk_disable_unprepare(pfdev->bus_ace_clock); + clk_disable_unprepare(pfdev->bus_clock); + clk_disable_unprepare(pfdev->clock); +} + +static int panfrost_clk_init(struct panfrost_device *pfdev) +{ unsigned long rate; + int err; pfdev->clock = devm_clk_get(pfdev->base.dev, NULL); if (IS_ERR(pfdev->clock)) { @@ -48,53 +81,31 @@ static int panfrost_clk_init(struct panfrost_device *pfdev) rate = clk_get_rate(pfdev->clock); dev_info(pfdev->base.dev, "clock rate = %lu\n", rate); - err = clk_prepare_enable(pfdev->clock); - if (err) - return err; - pfdev->bus_clock = devm_clk_get_optional(pfdev->base.dev, "bus"); if (IS_ERR(pfdev->bus_clock)) { - dev_err(pfdev->base.dev, "get bus_clock failed %ld\n", - PTR_ERR(pfdev->bus_clock)); err = PTR_ERR(pfdev->bus_clock); - goto disable_clock; + dev_err(pfdev->base.dev, "get bus_clock failed %d\n", err); + return err; } if (pfdev->bus_clock) { rate = clk_get_rate(pfdev->bus_clock); dev_info(pfdev->base.dev, "bus_clock rate = %lu\n", rate); - - err = clk_prepare_enable(pfdev->bus_clock); - if (err) - goto disable_clock; } pfdev->bus_ace_clock = devm_clk_get_optional(pfdev->base.dev, "bus_ace"); if (IS_ERR(pfdev->bus_ace_clock)) { err = PTR_ERR(pfdev->bus_ace_clock); dev_err(pfdev->base.dev, "get bus_ace_clock failed %d\n", err); - goto disable_bus_clock; + return err; } - err = clk_prepare_enable(pfdev->bus_ace_clock); - if (err) - goto disable_bus_clock; - - return 0; - -disable_bus_clock: - clk_disable_unprepare(pfdev->bus_clock); -disable_clock: - clk_disable_unprepare(pfdev->clock); - - return err; + return panfrost_clk_enable(pfdev); } static void panfrost_clk_fini(struct panfrost_device *pfdev) { - clk_disable_unprepare(pfdev->bus_ace_clock); - clk_disable_unprepare(pfdev->bus_clock); - clk_disable_unprepare(pfdev->clock); + panfrost_clk_disable(pfdev); } static int panfrost_regulator_init(struct panfrost_device *pfdev) @@ -436,34 +447,17 @@ static int panfrost_device_runtime_resume(struct device *dev) if (ret) return ret; - ret = clk_enable(pfdev->clock); - if (ret) - goto err_clk; - - ret = clk_enable(pfdev->bus_clock); - if (ret) - goto err_bus_clk; - - ret = clk_enable(pfdev->bus_ace_clock); - if (ret) - goto err_bus_ace_clk; + ret = panfrost_clk_enable(pfdev); + if (ret) { + reset_control_assert(pfdev->rstc); + return ret; + } } panfrost_device_reset(pfdev, true); panfrost_devfreq_resume(pfdev); return 0; - -err_bus_ace_clk: - if (pfdev->comp->pm_features & BIT(GPU_PM_RT)) - clk_disable(pfdev->bus_clock); -err_bus_clk: - if (pfdev->comp->pm_features & BIT(GPU_PM_RT)) - clk_disable(pfdev->clock); -err_clk: - if (pfdev->comp->pm_features & BIT(GPU_PM_RT)) - reset_control_assert(pfdev->rstc); - return ret; } static int panfrost_device_runtime_suspend(struct device *dev) @@ -480,9 +474,7 @@ static int panfrost_device_runtime_suspend(struct device *dev) panfrost_gpu_power_off(pfdev); if (pfdev->comp->pm_features & BIT(GPU_PM_RT)) { - clk_disable(pfdev->bus_ace_clock); - clk_disable(pfdev->bus_clock); - clk_disable(pfdev->clock); + panfrost_clk_disable(pfdev); reset_control_assert(pfdev->rstc); } @@ -506,11 +498,11 @@ static int panfrost_device_resume(struct device *dev) } if (pfdev->comp->pm_features & BIT(GPU_PM_CLK_DIS)) { - ret = clk_enable(pfdev->clock); + ret = clk_prepare_enable(pfdev->clock); if (ret) goto err_clk; - ret = clk_enable(pfdev->bus_clock); + ret = clk_prepare_enable(pfdev->bus_clock); if (ret) goto err_bus_clk; } @@ -523,10 +515,10 @@ static int panfrost_device_resume(struct device *dev) err_resume: if (pfdev->comp->pm_features & BIT(GPU_PM_CLK_DIS)) - clk_disable(pfdev->bus_clock); + clk_disable_unprepare(pfdev->bus_clock); err_bus_clk: if (pfdev->comp->pm_features & BIT(GPU_PM_CLK_DIS)) - clk_disable(pfdev->clock); + clk_disable_unprepare(pfdev->clock); err_clk: if (pfdev->comp->pm_features & BIT(GPU_PM_VREG_OFF)) dev_pm_opp_set_opp(dev, NULL); @@ -543,8 +535,8 @@ static int panfrost_device_suspend(struct device *dev) return ret; if (pfdev->comp->pm_features & BIT(GPU_PM_CLK_DIS)) { - clk_disable(pfdev->bus_clock); - clk_disable(pfdev->clock); + clk_disable_unprepare(pfdev->bus_clock); + clk_disable_unprepare(pfdev->clock); } if (pfdev->comp->pm_features & BIT(GPU_PM_VREG_OFF)) -- 2.55.0