From: "Clément Péron" <peron.clem@gmail.com> To: Rob Herring <robh@kernel.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Steven Price <steven.price@arm.com>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>, Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Clément Péron" <peron.clem@gmail.com> Subject: [PATCH v2 09/14] drm/panfrost: dynamically alloc regulators Date: Sat, 4 Jul 2020 12:25:30 +0200 [thread overview] Message-ID: <20200704102535.189647-10-peron.clem@gmail.com> (raw) In-Reply-To: <20200704102535.189647-1-peron.clem@gmail.com> We will later introduce regulators managed by OPP. Only alloc regulators when it's needed. This also help use to release the regulators only when they are allocated. Signed-off-by: Clément Péron <peron.clem@gmail.com> Reviewed-by: Steven Price <steven.price@arm.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 14 +++++++++----- drivers/gpu/drm/panfrost/panfrost_device.h | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 464da1646398..0b0fb45aee82 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -90,9 +90,11 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) { int ret, i; - if (WARN(pfdev->comp->num_supplies > ARRAY_SIZE(pfdev->regulators), - "Too many supplies in compatible structure.\n")) - return -EINVAL; + pfdev->regulators = devm_kcalloc(pfdev->dev, pfdev->comp->num_supplies, + sizeof(*pfdev->regulators), + GFP_KERNEL); + if (!pfdev->regulators) + return -ENOMEM; for (i = 0; i < pfdev->comp->num_supplies; i++) pfdev->regulators[i].supply = pfdev->comp->supply_names[i]; @@ -117,8 +119,10 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) static void panfrost_regulator_fini(struct panfrost_device *pfdev) { - regulator_bulk_disable(pfdev->comp->num_supplies, - pfdev->regulators); + if (!pfdev->regulators) + return; + + regulator_bulk_disable(pfdev->comp->num_supplies, pfdev->regulators); } static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 2efa59c9d1c5..953f7536a773 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -22,7 +22,6 @@ struct panfrost_job; struct panfrost_perfcnt; #define NUM_JOB_SLOTS 3 -#define MAX_REGULATORS 2 #define MAX_PM_DOMAINS 3 struct panfrost_features { @@ -81,7 +80,7 @@ struct panfrost_device { void __iomem *iomem; struct clk *clock; struct clk *bus_clock; - struct regulator_bulk_data regulators[MAX_REGULATORS]; + struct regulator_bulk_data *regulators; struct reset_control *rstc; /* pm_domains for devices with more than one. */ struct device *pm_domain_devs[MAX_PM_DOMAINS]; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com> To: Rob Herring <robh@kernel.org>, Tomeu Vizoso <tomeu.vizoso@collabora.com>, Steven Price <steven.price@arm.com>, Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>, Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>, Stephen Boyd <sboyd@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org> Cc: "Clément Péron" <peron.clem@gmail.com>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 09/14] drm/panfrost: dynamically alloc regulators Date: Sat, 4 Jul 2020 12:25:30 +0200 [thread overview] Message-ID: <20200704102535.189647-10-peron.clem@gmail.com> (raw) In-Reply-To: <20200704102535.189647-1-peron.clem@gmail.com> We will later introduce regulators managed by OPP. Only alloc regulators when it's needed. This also help use to release the regulators only when they are allocated. Signed-off-by: Clément Péron <peron.clem@gmail.com> Reviewed-by: Steven Price <steven.price@arm.com> --- drivers/gpu/drm/panfrost/panfrost_device.c | 14 +++++++++----- drivers/gpu/drm/panfrost/panfrost_device.h | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c index 464da1646398..0b0fb45aee82 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.c +++ b/drivers/gpu/drm/panfrost/panfrost_device.c @@ -90,9 +90,11 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) { int ret, i; - if (WARN(pfdev->comp->num_supplies > ARRAY_SIZE(pfdev->regulators), - "Too many supplies in compatible structure.\n")) - return -EINVAL; + pfdev->regulators = devm_kcalloc(pfdev->dev, pfdev->comp->num_supplies, + sizeof(*pfdev->regulators), + GFP_KERNEL); + if (!pfdev->regulators) + return -ENOMEM; for (i = 0; i < pfdev->comp->num_supplies; i++) pfdev->regulators[i].supply = pfdev->comp->supply_names[i]; @@ -117,8 +119,10 @@ static int panfrost_regulator_init(struct panfrost_device *pfdev) static void panfrost_regulator_fini(struct panfrost_device *pfdev) { - regulator_bulk_disable(pfdev->comp->num_supplies, - pfdev->regulators); + if (!pfdev->regulators) + return; + + regulator_bulk_disable(pfdev->comp->num_supplies, pfdev->regulators); } static void panfrost_pm_domain_fini(struct panfrost_device *pfdev) diff --git a/drivers/gpu/drm/panfrost/panfrost_device.h b/drivers/gpu/drm/panfrost/panfrost_device.h index 2efa59c9d1c5..953f7536a773 100644 --- a/drivers/gpu/drm/panfrost/panfrost_device.h +++ b/drivers/gpu/drm/panfrost/panfrost_device.h @@ -22,7 +22,6 @@ struct panfrost_job; struct panfrost_perfcnt; #define NUM_JOB_SLOTS 3 -#define MAX_REGULATORS 2 #define MAX_PM_DOMAINS 3 struct panfrost_features { @@ -81,7 +80,7 @@ struct panfrost_device { void __iomem *iomem; struct clk *clock; struct clk *bus_clock; - struct regulator_bulk_data regulators[MAX_REGULATORS]; + struct regulator_bulk_data *regulators; struct reset_control *rstc; /* pm_domains for devices with more than one. */ struct device *pm_domain_devs[MAX_PM_DOMAINS]; -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-07-04 10:26 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-04 10:25 [PATCH v2 00/14] Add regulator devfreq support to Panfrost Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 01/14] drm/panfrost: avoid static declaration Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 02/14] drm/panfrost: clean headers in devfreq Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 03/14] drm/panfrost: don't use pfdevfreq.busy_count to know if hw is idle Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 04/14] drm/panfrost: introduce panfrost_devfreq struct Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 05/14] drm/panfrost: use spinlock instead of atomic Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 06/14] drm/panfrost: properly handle error in probe Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 07/14] drm/panfrost: rename error labels in device_init Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 08/14] drm/panfrost: move devfreq_init()/fini() in device Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` Clément Péron [this message] 2020-07-04 10:25 ` [PATCH v2 09/14] drm/panfrost: dynamically alloc regulators Clément Péron 2020-07-04 10:25 ` [PATCH v2 10/14] drm/panfrost: add regulators to devfreq Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 11/14] arm64: defconfig: Enable devfreq cooling device Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 12/14] arm64: dts: allwinner: h6: Add cooling map for GPU Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:25 ` [PATCH v2 13/14] [DO NOT MERGE] arm64: dts: allwinner: h6: Add GPU OPP table Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 12:13 ` Maxime Ripard 2020-07-04 12:13 ` Maxime Ripard 2020-07-04 14:56 ` Clément Péron 2020-07-04 14:56 ` Clément Péron 2020-08-03 7:54 ` Clément Péron 2020-08-03 7:54 ` Clément Péron 2020-08-24 13:11 ` Maxime Ripard 2020-08-24 13:11 ` Maxime Ripard 2020-08-28 12:16 ` Clément Péron 2020-08-28 12:16 ` Clément Péron 2020-08-28 12:21 ` Ondřej Jirman 2020-08-28 12:21 ` Ondřej Jirman 2020-08-28 13:01 ` [linux-sunxi] " Jernej Škrabec 2020-08-28 13:01 ` Jernej Škrabec 2020-07-04 10:25 ` [PATCH v2 14/14] [DO NOT MERGE] arm64: dts: allwinner: force GPU regulator to be always Clément Péron 2020-07-04 10:25 ` Clément Péron 2020-07-04 10:30 ` Clément Péron 2020-07-04 10:30 ` Clément Péron 2020-07-04 10:28 ` [PATCH v2 00/14] Add regulator devfreq support to Panfrost Clément Péron 2020-07-04 10:28 ` Clément Péron 2020-07-06 13:26 ` Alyssa Rosenzweig 2020-07-06 13:26 ` Alyssa Rosenzweig 2020-07-07 0:16 ` Ondřej Jirman 2020-07-07 0:16 ` Ondřej Jirman
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200704102535.189647-10-peron.clem@gmail.com \ --to=peron.clem@gmail.com \ --cc=alyssa.rosenzweig@collabora.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mripard@kernel.org \ --cc=nm@ti.com \ --cc=robh@kernel.org \ --cc=sboyd@kernel.org \ --cc=steven.price@arm.com \ --cc=tomeu.vizoso@collabora.com \ --cc=vireshk@kernel.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.