diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-22 09:23:13 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 06:09:39 +0100 |
| commit | 2716a02f607c964ccaa6fa7266abd3acd73d9033 (patch) | |
| tree | 1ef38bd7fa979131294603fc75413eba6d2993b6 /drivers/char/drm | |
| parent | drm: Fix ioc32 compat layer (diff) | |
| download | linux-2716a02f607c964ccaa6fa7266abd3acd73d9033.tar.xz linux-2716a02f607c964ccaa6fa7266abd3acd73d9033.zip | |
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/drm')
| -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, 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); @@ -120,6 +116,10 @@ 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"); |