dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
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 4/4] gpu: host1x: Add runtime pm support for host1x
Date: Tue, 24 Sep 2013 15:05:25 +0300	[thread overview]
Message-ID: <1380024325-18280-5-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 runtime pm support for host1x hardware unit. This
allows host1x clock to be turned off when it is idle. If pm runtime
is not configured, we enable host1x 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/dev.c | 57 ++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 4716302..5f0b91e 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -23,6 +23,7 @@
 #include <linux/of_device.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/pm_runtime.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/host1x.h>
@@ -34,6 +35,9 @@
 #include "hw/host1x01.h"
 #include "host1x_client.h"
 
+static int host1x_runtime_suspend(struct device *dev);
+static int host1x_runtime_resume(struct device *dev);
+
 void host1x_set_drm_data(struct device *dev, void *data)
 {
 	struct host1x *host1x = dev_get_drvdata(dev);
@@ -143,12 +147,15 @@ static int host1x_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	err = clk_prepare_enable(host->clk);
-	if (err < 0) {
-		dev_err(&pdev->dev, "failed to enable clock\n");
-		return err;
+	pm_runtime_enable(&pdev->dev);
+	if (!pm_runtime_enabled(&pdev->dev)) {
+		err = host1x_runtime_resume(&pdev->dev);
+		if (err < 0)
+			return err;
 	}
 
+	pm_runtime_get_sync(&pdev->dev);
+
 	err = host1x_syncpt_init(host);
 	if (err) {
 		dev_err(&pdev->dev, "failed to initialize syncpts\n");
@@ -165,10 +172,14 @@ static int host1x_probe(struct platform_device *pdev)
 
 	host1x_drm_alloc(pdev);
 
+	pm_runtime_put(&pdev->dev);
+
 	return 0;
 
 fail_deinit_syncpt:
 	host1x_syncpt_deinit(host);
+	pm_runtime_put(&pdev->dev);
+	pm_runtime_disable(&pdev->dev);
 	return err;
 }
 
@@ -178,11 +189,48 @@ static int __exit host1x_remove(struct platform_device *pdev)
 
 	host1x_intr_deinit(host);
 	host1x_syncpt_deinit(host);
+
+	if (pm_runtime_enabled(&pdev->dev))
+		pm_runtime_disable(&pdev->dev);
+	else
+		host1x_runtime_suspend(&pdev->dev);
+
+	return 0;
+}
+
+static int host1x_runtime_suspend(struct device *dev)
+{
+	struct host1x *host;
+
+	host = dev_get_drvdata(dev);
+	if (!host)
+		return -EINVAL;
+
 	clk_disable_unprepare(host->clk);
 
 	return 0;
 }
 
+static int host1x_runtime_resume(struct device *dev)
+{
+	int err = 0;
+	struct host1x *host;
+
+	host = dev_get_drvdata(dev);
+	if (!host)
+		return -EINVAL;
+
+	err = clk_prepare_enable(host->clk);
+	if (err < 0)
+		dev_err(dev, "failed to enable clock\n");
+
+	return err;
+}
+
+static const struct dev_pm_ops host1x_pm_ops = {
+	SET_RUNTIME_PM_OPS(host1x_runtime_suspend, host1x_runtime_resume, NULL)
+};
+
 static struct platform_driver tegra_host1x_driver = {
 	.probe = host1x_probe,
 	.remove = __exit_p(host1x_remove),
@@ -190,6 +238,7 @@ static struct platform_driver tegra_host1x_driver = {
 		.owner = THIS_MODULE,
 		.name = "tegra-host1x",
 		.of_match_table = host1x_of_match,
+		.pm = &host1x_pm_ops,
 	},
 };
 
-- 
1.8.1.5

  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 ` [PATCHv3 3/4] drm/tegra: Add runtime pm support for dc Arto Merilainen
2013-09-24 12:05 ` Arto Merilainen [this message]
     [not found]   ` <1380024325-18280-5-git-send-email-amerilainen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2013-10-01 18:17     ` [PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x 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-5-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).