20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
69 lines
1.7 KiB
Diff
69 lines
1.7 KiB
Diff
From 9d058ec3839e19637efc1957cdbbdafd69878acb Mon Sep 17 00:00:00 2001
|
|
From: Eric Anholt <eric@anholt.net>
|
|
Date: Mon, 14 Jan 2019 14:47:57 -0800
|
|
Subject: [PATCH] drm/v3d: Hook up the runtime PM ops.
|
|
|
|
In translating the runtime PM code from vc4, I missed the ".pm"
|
|
assignment to actually connect them up. Fixes missing MMU setup if
|
|
runtime PM resets V3D.
|
|
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
|
(cherry picked from commit ca197699af29baa8236c74c53d4904ca8957ee06)
|
|
---
|
|
drivers/gpu/drm/v3d/v3d_drv.c | 37 +++++++++++++++++++++++++++++++++++
|
|
1 file changed, 37 insertions(+)
|
|
|
|
--- a/drivers/gpu/drm/v3d/v3d_drv.c
|
|
+++ b/drivers/gpu/drm/v3d/v3d_drv.c
|
|
@@ -38,6 +38,42 @@
|
|
#define DRIVER_MINOR 0
|
|
#define DRIVER_PATCHLEVEL 0
|
|
|
|
+#ifdef CONFIG_PM
|
|
+static int v3d_runtime_suspend(struct device *dev)
|
|
+{
|
|
+ struct drm_device *drm = dev_get_drvdata(dev);
|
|
+ struct v3d_dev *v3d = to_v3d_dev(drm);
|
|
+
|
|
+ v3d_irq_disable(v3d);
|
|
+
|
|
+ clk_disable_unprepare(v3d->clk);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int v3d_runtime_resume(struct device *dev)
|
|
+{
|
|
+ struct drm_device *drm = dev_get_drvdata(dev);
|
|
+ struct v3d_dev *v3d = to_v3d_dev(drm);
|
|
+ int ret;
|
|
+
|
|
+ ret = clk_prepare_enable(v3d->clk);
|
|
+ if (ret != 0)
|
|
+ return ret;
|
|
+
|
|
+ /* XXX: VPM base */
|
|
+
|
|
+ v3d_mmu_set_page_table(v3d);
|
|
+ v3d_irq_enable(v3d);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif
|
|
+
|
|
+static const struct dev_pm_ops v3d_pm_ops = {
|
|
+ SET_RUNTIME_PM_OPS(v3d_runtime_suspend, v3d_runtime_resume, NULL)
|
|
+};
|
|
+
|
|
static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
|
|
struct drm_file *file_priv)
|
|
{
|
|
@@ -332,6 +368,7 @@ static struct platform_driver v3d_platfo
|
|
.driver = {
|
|
.name = "v3d",
|
|
.of_match_table = v3d_of_match,
|
|
+ .pm = &v3d_pm_ops,
|
|
},
|
|
};
|
|
|