aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2007-10-31 11:21:05 +1100
committerDave Airlie <airlied@redhat.com>2007-10-31 11:21:05 +1100
commitc106a7d8b9ddc1f6da3d462e3114af2ca72b3b46 (patch)
treeaa490f9551d2a4639620f7cd1bf35a2a550b79ac
parent79744d730c90019edd367eee4a8ec1fa22d53402 (diff)
drm: call driver load after initing agp subsystem
-rw-r--r--linux-core/drm_stub.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index 1d88d375..dabd174b 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -111,10 +111,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
dev->driver = driver;
- if (dev->driver->load)
- if ((retcode = dev->driver->load(dev, ent->driver_data)))
- goto error_out_unreg;
-
if (drm_core_has_AGP(dev)) {
if (drm_device_is_agp(dev))
dev->agp = drm_agp_init(dev);
@@ -134,6 +130,11 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev,
}
}
+ if (dev->driver->load)
+ if ((retcode = dev->driver->load(dev, ent->driver_data)))
+ goto error_out_unreg;
+
+
retcode = drm_ctxbitmap_init(dev);
if (retcode) {
DRM_ERROR("Cannot allocate memory for context bitmap.\n");