drm: fix ordering of driver unload vs agp unload.

For KMS drivers, we really need to cleanup the driver before disabling
the AGP subsystem.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index febb517ee679255a7e3ea694f8b68225118b95f0..5ff88d952226c70317472281c7e412022abdb431 100644 (file)
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -314,14 +314,14 @@ static void drm_cleanup(struct drm_device * dev)
                DRM_DEBUG("mtrr_del=%d\n", retval);
        }
 
+       if (dev->driver->unload)
+               dev->driver->unload(dev);
+
        if (drm_core_has_AGP(dev) && dev->agp) {
                drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
                dev->agp = NULL;
        }
 
-       if (dev->driver->unload)
-               dev->driver->unload(dev);
-
        drm_ht_remove(&dev->map_hash);
        drm_ctxbitmap_cleanup(dev);