From: Arto Merilainen <amerilainen@nvidia.com>
To: tbergstrom@nvidia.com, treding@nvidia.com
Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org, amerilainen@nvidia.com,
mkulkarni@nvidia.com
Subject: [PATCHv3 3/4] drm/tegra: Add runtime pm support for dc
Date: Tue, 24 Sep 2013 15:05:24 +0300 [thread overview]
Message-ID: <1380024325-18280-4-git-send-email-amerilainen@nvidia.com> (raw)
In-Reply-To: <1380024325-18280-1-git-send-email-amerilainen@nvidia.com>
From: Mayuresh Kulkarni <mkulkarni@nvidia.com>
This patch adds initial runtime pm support for Tegra display
controller. As of now, the dc clock is enabled in device probe via
runtime pm and disabled in device remove. In case pm runtime is not
configured, we simply enable the clock in device probe (..and disable
it in remove).
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
---
drivers/gpu/host1x/drm/dc.c | 58 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 53 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
index b1a05ad..6d1d5fc 100644
--- a/drivers/gpu/host1x/drm/dc.c
+++ b/drivers/gpu/host1x/drm/dc.c
@@ -13,6 +13,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/clk/tegra.h>
+#include <linux/pm_runtime.h>
#include "host1x_client.h"
#include "dc.h"
@@ -24,6 +25,9 @@ struct tegra_plane {
unsigned int index;
};
+static int tegra_dc_runtime_suspend(struct device *dev);
+static int tegra_dc_runtime_resume(struct device *dev);
+
static inline struct tegra_plane *to_tegra_plane(struct drm_plane *plane)
{
return container_of(plane, struct tegra_plane, base);
@@ -1128,9 +1132,7 @@ static int tegra_dc_probe(struct platform_device *pdev)
return PTR_ERR(dc->clk);
}
- err = clk_prepare_enable(dc->clk);
- if (err < 0)
- return err;
+ platform_set_drvdata(pdev, dc);
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
dc->regs = devm_ioremap_resource(&pdev->dev, regs);
@@ -1147,6 +1149,15 @@ static int tegra_dc_probe(struct platform_device *pdev)
dc->client.ops = &dc_client_ops;
dc->client.dev = &pdev->dev;
+ pm_runtime_enable(&pdev->dev);
+ if (!pm_runtime_enabled(&pdev->dev)) {
+ err = tegra_dc_runtime_resume(&pdev->dev);
+ if (err < 0)
+ return err;
+ }
+
+ pm_runtime_get_sync(&pdev->dev);
+
err = tegra_dc_rgb_probe(dc);
if (err < 0 && err != -ENODEV) {
dev_err(&pdev->dev, "failed to probe RGB output: %d\n", err);
@@ -1160,8 +1171,6 @@ static int tegra_dc_probe(struct platform_device *pdev)
return err;
}
- platform_set_drvdata(pdev, dc);
-
return 0;
}
@@ -1178,11 +1187,49 @@ static int tegra_dc_remove(struct platform_device *pdev)
return err;
}
+ pm_runtime_put(&pdev->dev);
+ if (pm_runtime_enabled(&pdev->dev))
+ pm_runtime_disable(&pdev->dev);
+ else
+ tegra_dc_runtime_suspend(&pdev->dev);
+
+ return 0;
+}
+
+static int tegra_dc_runtime_suspend(struct device *dev)
+{
+ struct tegra_dc *dc;
+
+ dc = dev_get_drvdata(dev);
+ if (!dc)
+ return -EINVAL;
+
clk_disable_unprepare(dc->clk);
return 0;
}
+static int tegra_dc_runtime_resume(struct device *dev)
+{
+ int err = 0;
+ struct tegra_dc *dc;
+
+ dc = dev_get_drvdata(dev);
+ if (!dc)
+ return -EINVAL;
+
+ err = clk_prepare_enable(dc->clk);
+ if (err < 0)
+ dev_err(dev, "failed to enable clock\n");
+
+ return err;
+}
+
+static const struct dev_pm_ops tegra_dc_pm_ops = {
+ SET_RUNTIME_PM_OPS(tegra_dc_runtime_suspend,
+ tegra_dc_runtime_resume, NULL)
+};
+
static struct of_device_id tegra_dc_of_match[] = {
{ .compatible = "nvidia,tegra30-dc", },
{ .compatible = "nvidia,tegra20-dc", },
@@ -1194,6 +1241,7 @@ struct platform_driver tegra_dc_driver = {
.name = "tegra-dc",
.owner = THIS_MODULE,
.of_match_table = tegra_dc_of_match,
+ .pm = &tegra_dc_pm_ops,
},
.probe = tegra_dc_probe,
.remove = tegra_dc_remove,
--
1.8.1.5
next prev parent reply other threads:[~2013-09-24 12:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-24 12:05 [PATCHv3 0/4] gpu: host1x: Add runtime pm support Arto Merilainen
[not found] ` <1380024325-18280-1-git-send-email-amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-09-24 12:05 ` [PATCHv3 1/4] gpu: host1x: shuffle job APIs Arto Merilainen
2013-09-24 12:05 ` [PATCHv3 2/4] drm/tegra: Add runtime pm support for gr2d Arto Merilainen
[not found] ` <1380024325-18280-3-git-send-email-amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-10-01 18:14 ` Stephen Warren
[not found] ` <524B10F0.7000301-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-10-02 5:40 ` Arto Merilainen
2013-09-24 12:05 ` Arto Merilainen [this message]
2013-09-24 12:05 ` [PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x Arto Merilainen
[not found] ` <1380024325-18280-5-git-send-email-amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-10-01 18:17 ` Stephen Warren
[not found] ` <524B11AA.30400-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-10-02 5:40 ` Arto Merilainen
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=1380024325-18280-4-git-send-email-amerilainen@nvidia.com \
--to=amerilainen@nvidia.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mkulkarni@nvidia.com \
--cc=tbergstrom@nvidia.com \
--cc=treding@nvidia.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).