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_state.c | |
| parent | 02a841d434513c7b3620250271c372fabce56de5 (diff) | |
| download | blackbird-op-linux-aa4cc5d274c09909fe32861825c2377d0ccb3bfd.tar.gz blackbird-op-linux-aa4cc5d274c09909fe32861825c2377d0ccb3bfd.zip | |
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_state.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 0e8f325c709c..31c570c2bc36 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -34,6 +34,7 @@ #include "nouveau_drv.h" #include "nouveau_drm.h" +#include "nouveau_agp.h" #include "nouveau_fbcon.h" #include <core/ramht.h> #include <subdev/gpio.h> @@ -547,6 +548,9 @@ nouveau_card_init(struct drm_device *dev) spin_lock_init(&dev_priv->context_switch_lock); spin_lock_init(&dev_priv->vm_lock); + /* Make sure the AGP controller is in a consistent state */ + nouveau_agp_reset(dev); + /* Make the CRTCs and I2C buses accessible */ ret = engine->display.early_init(dev); if (ret) |
