diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-10-15 09:44:02 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-08 15:40:00 +1000 |
| commit | b9ed919f1c8f18f419ca6159fdfec656690800b6 (patch) | |
| tree | 3f164ae0b0c38ec61c5658de034b38d7d863243a /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | c52f4fa61d7504bacd94fd54f43fd0b5bdf74bbc (diff) | |
| download | linux-b9ed919f1c8f18f419ca6159fdfec656690800b6.tar.gz linux-b9ed919f1c8f18f419ca6159fdfec656690800b6.tar.xz | |
drm/nouveau/drm/pm: remove everything except the hwmon interfaces to THERM
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 265e77ccab1c..9b3231459c7d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -46,7 +46,7 @@ #include "nouveau_gem.h" #include "nouveau_agp.h" #include "nouveau_vga.h" -#include "nouveau_pm.h" +#include "nouveau_hwmon.h" #include "nouveau_acpi.h" #include "nouveau_bios.h" #include "nouveau_ioctl.h" @@ -384,8 +384,7 @@ nouveau_drm_load(struct drm_device *dev, unsigned long flags) goto fail_dispinit; } - nouveau_pm_init(dev); - + nouveau_hwmon_init(dev); nouveau_accel_init(drm); nouveau_fbcon_init(dev); @@ -421,8 +420,7 @@ nouveau_drm_unload(struct drm_device *dev) pm_runtime_get_sync(dev->dev); nouveau_fbcon_fini(dev); nouveau_accel_fini(drm); - - nouveau_pm_fini(dev); + nouveau_hwmon_fini(dev); if (dev->mode_config.num_crtc) nouveau_display_fini(dev); @@ -562,7 +560,6 @@ nouveau_do_resume(struct drm_device *dev) } nouveau_run_vbios_init(dev); - nouveau_pm_resume(dev); if (dev->mode_config.num_crtc) { NV_INFO(drm, "resuming display...\n"); |