diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-11 10:44:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:12:47 +1000 |
| commit | cb75d97e9c77743ecfcc43375be135a55a4d9b25 (patch) | |
| tree | e7903f00db28b25a88d295dcc863f14b3d3bd707 /drivers/gpu/drm/nouveau/nouveau_state.c | |
| parent | 70790f4f819875e8f390871fd15bbbf823f28e1b (diff) | |
| download | op-kernel-dev-cb75d97e9c77743ecfcc43375be135a55a4d9b25.zip op-kernel-dev-cb75d97e9c77743ecfcc43375be135a55a4d9b25.tar.gz | |
drm/nouveau: implement devinit subdev, and new init table parser
v2:
- make sure not to execute display scripts unless resuming
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, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index 84e0379..1a07655 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -34,7 +34,6 @@ #include "nouveau_drv.h" #include <nouveau_drm.h> -#include "nouveau_agp.h" #include "nouveau_fbcon.h" #include <core/ramht.h> #include "nouveau_pm.h" @@ -516,9 +515,6 @@ 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) |
