From: Mayuresh Kulkarni <mkulkarni@nvidia.com>
To: tbergstrom@nvidia.com, amerilainen@nvidia.com,
thierry.reding@avionic-design.de, airlied@redhat.com,
dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Mayuresh Kulkarni <mkulkarni@nvidia.com>
Subject: [PATCH v2 3/4] gpu: host1x: add runtime pm support for dc
Date: Thu, 13 Jun 2013 15:23:37 +0530 [thread overview]
Message-ID: <1371117218-2326-4-git-send-email-mkulkarni@nvidia.com> (raw)
In-Reply-To: <1371117218-2326-1-git-send-email-mkulkarni@nvidia.com>
As of now, the dc clock is enabled in its .probe via
runtime pm and disabled in .remove
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
---
drivers/gpu/host1x/drm/dc.c | 60 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 55 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
index 5360e5a..8e669a9 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"
@@ -1128,9 +1129,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 +1146,15 @@ static int tegra_dc_probe(struct platform_device *pdev)
dc->client.ops = &dc_client_ops;
dc->client.dev = &pdev->dev;
+#ifdef CONFIG_PM_RUNTIME
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_get_sync(&pdev->dev);
+#else
+ err = clk_prepare_enable(dc->clk);
+ if (err < 0)
+ return err;
+#endif
+
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 +1168,6 @@ static int tegra_dc_probe(struct platform_device *pdev)
return err;
}
- platform_set_drvdata(pdev, dc);
-
return 0;
}
@@ -1178,11 +1184,52 @@ static int tegra_dc_remove(struct platform_device *pdev)
return err;
}
+#ifdef CONFIG_PM_RUNTIME
+ pm_runtime_put(&pdev->dev);
+ pm_runtime_disable(&pdev->dev);
+#endif
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_RUNTIME
+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;
+}
+#endif /* CONFIG_PM_RUNTIME */
+
+#ifdef CONFIG_PM
+static const struct dev_pm_ops tegra_dc_pm_ops = {
+ SET_RUNTIME_PM_OPS(tegra_dc_runtime_suspend,
+ tegra_dc_runtime_resume, NULL)
+};
+#endif
+
static struct of_device_id tegra_dc_of_match[] = {
{ .compatible = "nvidia,tegra30-dc", },
{ .compatible = "nvidia,tegra20-dc", },
@@ -1194,6 +1241,9 @@ struct platform_driver tegra_dc_driver = {
.name = "tegra-dc",
.owner = THIS_MODULE,
.of_match_table = tegra_dc_of_match,
+#ifdef CONFIG_PM
+ .pm = &tegra_dc_pm_ops,
+#endif
},
.probe = tegra_dc_probe,
.remove = tegra_dc_remove,
--
1.8.1.5
next prev parent reply other threads:[~2013-06-13 9:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 9:53 [PATCH v2 0/4] gpu: host1x: add runtime pm support Mayuresh Kulkarni
[not found] ` <1371117218-2326-1-git-send-email-mkulkarni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-13 9:53 ` [PATCH v2 1/4] gpu: host1x: shuffle job APIs Mayuresh Kulkarni
2013-06-13 9:53 ` [PATCH v2 2/4] gpu: host1x: add runtime pm support for gr2d Mayuresh Kulkarni
[not found] ` <1371117218-2326-3-git-send-email-mkulkarni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-13 15:14 ` Stephen Warren
[not found] ` <51B9E1F2.3090404-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-06-14 14:45 ` Mayuresh Kulkarni
2013-06-13 9:53 ` Mayuresh Kulkarni [this message]
[not found] ` <1371117218-2326-4-git-send-email-mkulkarni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-06-13 18:49 ` [PATCH v2 3/4] gpu: host1x: add runtime pm support for dc Thierry Reding
2013-06-13 19:09 ` Stephen Warren
[not found] ` <51BA18EF.4090302-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2013-06-14 14:48 ` Mayuresh Kulkarni
2013-06-13 9:53 ` [PATCH v2 4/4] gpu: host1x: add runtime pm support for host1x Mayuresh Kulkarni
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=1371117218-2326-4-git-send-email-mkulkarni@nvidia.com \
--to=mkulkarni@nvidia.com \
--cc=airlied@redhat.com \
--cc=amerilainen@nvidia.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=tbergstrom@nvidia.com \
--cc=thierry.reding@avionic-design.de \
/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).