diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-05 21:36:32 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:43 +1000 |
| commit | aa4cc5d274c09909fe32861825c2377d0ccb3bfd (patch) | |
| tree | a8ed856b236dbbe6289f09e24555579052f170a5 /drivers/gpu/drm/nouveau/nouveau_drv.c | |
| parent | 02a841d434513c7b3620250271c372fabce56de5 (diff) | |
| download | op-kernel-dev-aa4cc5d274c09909fe32861825c2377d0ccb3bfd.zip op-kernel-dev-aa4cc5d274c09909fe32861825c2377d0ccb3bfd.tar.gz | |
drm/nouveau/agp: move all agp stuff into its own source file
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 74c2265..33dd955e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -29,6 +29,7 @@ #include "drm.h" #include "drm_crtc_helper.h" #include "nouveau_drv.h" +#include "nouveau_agp.h" #include "nouveau_abi16.h" #include "nouveau_hw.h" #include "nouveau_fb.h" @@ -39,10 +40,6 @@ #include "drm_pciids.h" -MODULE_PARM_DESC(agpmode, "AGP mode (0 to disable AGP)"); -int nouveau_agpmode = -1; -module_param_named(agpmode, nouveau_agpmode, int, 0400); - MODULE_PARM_DESC(modeset, "Enable kernel modesetting"); int nouveau_modeset = -1; module_param_named(modeset, nouveau_modeset, int, 0400); @@ -248,6 +245,8 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) goto out_abort; } + nouveau_agp_fini(dev); + NV_INFO(dev, "And we're gone!\n"); pci_save_state(pdev); if (pm_state.event == PM_EVENT_SUSPEND) { @@ -287,8 +286,7 @@ nouveau_pci_resume(struct pci_dev *pdev) pci_set_master(dev->pdev); /* Make sure the AGP controller is in a consistent state */ - if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) - nouveau_mem_reset_agp(dev); + nouveau_agp_reset(dev); /* Make the CRTCs accessible */ engine->display.early_init(dev); @@ -298,13 +296,7 @@ nouveau_pci_resume(struct pci_dev *pdev) if (ret) return ret; - if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) { - ret = nouveau_mem_init_agp(dev); - if (ret) { - NV_ERROR(dev, "error reinitialising AGP: %d\n", ret); - return ret; - } - } + nouveau_agp_init(dev); NV_INFO(dev, "Restoring GPU objects...\n"); nouveau_gpuobj_resume(dev); |
