aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2015-12-21 19:11:44 -0500
committerEric Anholt <eric@anholt.net>2016-01-19 16:16:31 -0500
commit8483d152db61c5baf5452b844ef65b96ee9a6cfb (patch)
tree7e5c6b319c107de6cafab5de931a89a300d39224
parent1df59b8497f47495e873c23abd6d3d290c730505 (diff)
drm/vc4: Remove broken attempt at GPU reset using genpd.
I've tested and confirmed that it doesn't actually work. We'll need to sort out how to do this properly later, but for now just remove it since it also caused build breakage due to using CONFIG_PM_SLEEP functions without our Kconfig depending on PM_SLEEP. Signed-off-by: Eric Anholt <eric@anholt.net> Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
-rw-r--r--drivers/gpu/drm/vc4/vc4_v3d.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c
index 424d515ffcda..314ff71db978 100644
--- a/drivers/gpu/drm/vc4/vc4_v3d.c
+++ b/drivers/gpu/drm/vc4/vc4_v3d.c
@@ -144,19 +144,16 @@ int vc4_v3d_debugfs_ident(struct seq_file *m, void *unused)
144} 144}
145#endif /* CONFIG_DEBUG_FS */ 145#endif /* CONFIG_DEBUG_FS */
146 146
147/*
148 * Asks the firmware to turn on power to the V3D engine.
149 *
150 * This may be doable with just the clocks interface, though this
151 * packet does some other register setup from the firmware, too.
152 */
153int 147int
154vc4_v3d_set_power(struct vc4_dev *vc4, bool on) 148vc4_v3d_set_power(struct vc4_dev *vc4, bool on)
155{ 149{
156 if (on) 150 /* XXX: This interface is needed for GPU reset, and the way to
157 return pm_generic_poweroff(&vc4->v3d->pdev->dev); 151 * do it is to turn our power domain off and back on. We
158 else 152 * can't just reset from within the driver, because the reset
159 return pm_generic_resume(&vc4->v3d->pdev->dev); 153 * bits are in the power domain's register area, and get set
154 * during the poweron process.
155 */
156 return 0;
160} 157}
161 158
162static void vc4_v3d_init_hw(struct drm_device *dev) 159static void vc4_v3d_init_hw(struct drm_device *dev)