diff options
author | Dave Airlie <airlied@linux.ie> | 2007-11-22 03:23:13 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 00:09:39 -0500 |
commit | 2716a02f607c964ccaa6fa7266abd3acd73d9033 (patch) | |
tree | 1ef38bd7fa979131294603fc75413eba6d2993b6 /drivers/char | |
parent | 7ffa05e0518ebc055ef8f68d7d53e5f7d2ba3428 (diff) |
drm: call driver load function after initialising AGP
needed to intel chipset flushing
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/drm/drm_stub.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c index 2ed7a5c67906..def072df9028 100644 --- a/drivers/char/drm/drm_stub.c +++ b/drivers/char/drm/drm_stub.c | |||
@@ -98,10 +98,6 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, | |||
98 | 98 | ||
99 | dev->driver = driver; | 99 | dev->driver = driver; |
100 | 100 | ||
101 | if (dev->driver->load) | ||
102 | if ((retcode = dev->driver->load(dev, ent->driver_data))) | ||
103 | goto error_out_unreg; | ||
104 | |||
105 | if (drm_core_has_AGP(dev)) { | 101 | if (drm_core_has_AGP(dev)) { |
106 | if (drm_device_is_agp(dev)) | 102 | if (drm_device_is_agp(dev)) |
107 | dev->agp = drm_agp_init(dev); | 103 | dev->agp = drm_agp_init(dev); |
@@ -120,6 +116,10 @@ static int drm_fill_in_dev(struct drm_device * dev, struct pci_dev *pdev, | |||
120 | } | 116 | } |
121 | } | 117 | } |
122 | 118 | ||
119 | if (dev->driver->load) | ||
120 | if ((retcode = dev->driver->load(dev, ent->driver_data))) | ||
121 | goto error_out_unreg; | ||
122 | |||
123 | retcode = drm_ctxbitmap_init(dev); | 123 | retcode = drm_ctxbitmap_init(dev); |
124 | if (retcode) { | 124 | if (retcode) { |
125 | DRM_ERROR("Cannot allocate memory for context bitmap.\n"); | 125 | DRM_ERROR("Cannot allocate memory for context bitmap.\n"); |