Re: [PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x

2013-10-01 Thread Stephen Warren
On 09/24/2013 06:05 AM, Arto Merilainen wrote:
 From: Mayuresh Kulkarni mkulka...@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.

 diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c

 +static int host1x_runtime_suspend(struct device *dev);
 +static int host1x_runtime_resume(struct device *dev);

You could avoid having these prototypes by simply putting the function
bodies earlier on in the file, somewhere before they're used. I don't
care much either way, but I've certainly seen some people care about
this and ask for them to be moved.
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


Re: [PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x

2013-10-01 Thread Arto Merilainen

On 10/01/2013 09:17 PM, Stephen Warren wrote:

On 09/24/2013 06:05 AM, Arto Merilainen wrote:

From: Mayuresh Kulkarni mkulka...@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.



diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c



+static int host1x_runtime_suspend(struct device *dev);
+static int host1x_runtime_resume(struct device *dev);


You could avoid having these prototypes by simply putting the function
bodies earlier on in the file, somewhere before they're used. I don't
care much either way, but I've certainly seen some people care about
this and ask for them to be moved.


Will fix.

- Arto

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel


[PATCHv3 4/4] gpu: host1x: Add runtime pm support for host1x

2013-09-24 Thread Arto Merilainen
From: Mayuresh Kulkarni mkulka...@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 mkulka...@nvidia.com
Signed-off-by: Arto Merilainen amerilai...@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

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel