diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-01-29 10:02:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-01-29 10:02:35 +1000 |
| commit | 2ad14a6ca2f5d6e73e58c463e1b9dacffda3387a (patch) | |
| tree | 26c5e2287b04c71c0d179ed4234a1cf9c1e84f96 | |
| parent | 2081e78a5cb2e14e4980a8aaddd8e4899cc7557b (diff) | |
| parent | 8483d152db61c5baf5452b844ef65b96ee9a6cfb (diff) | |
| download | linux-2ad14a6ca2f5d6e73e58c463e1b9dacffda3387a.tar.bz2 | |
Merge tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux into drm-fixes
This pull request just includes the !CONFIG_PM_SLEEP build fix for
vc4.
* tag 'drm-vc4-fixes-2015-01-19' of http://github.com/anholt/linux:
drm/vc4: Remove broken attempt at GPU reset using genpd.
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_v3d.c | 17 |
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) } #endif /* CONFIG_DEBUG_FS */ -/* - * Asks the firmware to turn on power to the V3D engine. - * - * This may be doable with just the clocks interface, though this - * packet does some other register setup from the firmware, too. - */ int vc4_v3d_set_power(struct vc4_dev *vc4, bool on) { - if (on) - return pm_generic_poweroff(&vc4->v3d->pdev->dev); - else - return pm_generic_resume(&vc4->v3d->pdev->dev); + /* XXX: This interface is needed for GPU reset, and the way to + * do it is to turn our power domain off and back on. We + * can't just reset from within the driver, because the reset + * bits are in the power domain's register area, and get set + * during the poweron process. + */ + return 0; } static void vc4_v3d_init_hw(struct drm_device *dev) |