On Thu, Jan 16, 2020 at 04:39:37PM +0000, Sasha Levin wrote:
From: Steven Price steven.price@arm.com
[ Upstream commit 52282163dfa651849e905886845bcf6850dd83c2 ]
This commit is effectively already in 5.4. Confusingly there were two versions of this upstream:
52282163dfa6 ("drm/panfrost: Add missing check for pfdev->regulator") c90f30812a79 ("drm/panfrost: Add missing check for pfdev->regulator")
It got merged both through a -fixes branch and through the normal merge window. The two copies caused a bad merge in mainline and this was effectively reverted in commit 603e398a3db2 ("drm/panfrost: Remove NULL check for regulator").
c90f30812a79 is included in v5.4 so should already be in any v5.4.y release.
Steve
When modifying panfrost_devfreq_target() to support a device without a regulator defined I missed the check on the error path. Let's add it.
Reported-by: Dan Carpenter dan.carpenter@oracle.com Fixes: e21dd290881b ("drm/panfrost: Enable devfreq to work without regulator") Signed-off-by: Steven Price steven.price@arm.com Signed-off-by: Rob Herring robh@kernel.org Link: https://patchwork.freedesktop.org/patch/msgid/20190822093218.26014-1-steven.... Signed-off-by: Sasha Levin sashal@kernel.org
drivers/gpu/drm/panfrost/panfrost_devfreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/panfrost/panfrost_devfreq.c b/drivers/gpu/drm/panfrost/panfrost_devfreq.c index 12ff77dacc95..c1eb8cfe6aeb 100644 --- a/drivers/gpu/drm/panfrost/panfrost_devfreq.c +++ b/drivers/gpu/drm/panfrost/panfrost_devfreq.c @@ -53,8 +53,10 @@ static int panfrost_devfreq_target(struct device *dev, unsigned long *freq, if (err) { dev_err(dev, "Cannot set frequency %lu (%d)\n", target_rate, err);
regulator_set_voltage(pfdev->regulator, pfdev->devfreq.cur_volt,pfdev->devfreq.cur_volt);
if (pfdev->regulator)regulator_set_voltage(pfdev->regulator,pfdev->devfreq.cur_volt,pfdev->devfreq.cur_volt);2.20.1