aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_state.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_state.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index be859604cf64..18c4a8a85940 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -36,6 +36,7 @@
36#include "nouveau_drm.h" 36#include "nouveau_drm.h"
37#include "nouveau_fbcon.h" 37#include "nouveau_fbcon.h"
38#include "nouveau_ramht.h" 38#include "nouveau_ramht.h"
39#include "nouveau_pm.h"
39#include "nv50_display.h" 40#include "nv50_display.h"
40 41
41static void nouveau_stub_takedown(struct drm_device *dev) {} 42static void nouveau_stub_takedown(struct drm_device *dev) {}
@@ -527,6 +528,8 @@ nouveau_card_init(struct drm_device *dev)
527 if (ret) 528 if (ret)
528 goto out_display_early; 529 goto out_display_early;
529 530
531 nouveau_pm_init(dev);
532
530 ret = nouveau_mem_vram_init(dev); 533 ret = nouveau_mem_vram_init(dev);
531 if (ret) 534 if (ret)
532 goto out_bios; 535 goto out_bios;
@@ -635,6 +638,7 @@ out_gpuobj:
635out_vram: 638out_vram:
636 nouveau_mem_vram_fini(dev); 639 nouveau_mem_vram_fini(dev);
637out_bios: 640out_bios:
641 nouveau_pm_fini(dev);
638 nouveau_bios_takedown(dev); 642 nouveau_bios_takedown(dev);
639out_display_early: 643out_display_early:
640 engine->display.late_takedown(dev); 644 engine->display.late_takedown(dev);
@@ -677,6 +681,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
677 681
678 drm_irq_uninstall(dev); 682 drm_irq_uninstall(dev);
679 683
684 nouveau_pm_fini(dev);
680 nouveau_bios_takedown(dev); 685 nouveau_bios_takedown(dev);
681 686
682 vga_client_register(dev->pdev, NULL, NULL, NULL); 687 vga_client_register(dev->pdev, NULL, NULL, NULL);