summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:20:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 09:20:11 -0700
commit186837ca3a6dd6b422a5ea316ed38eea183dca5d (patch)
treee21e6d9e763cbe4ad4efd770c141f189488a5475 /drivers/gpu
parent4cecd935f67bf46a9fe8037c710dd86651fcafe4 (diff)
parentb78315f051de8d207bead90470aa216c0617572b (diff)
downloadlinux-3.10-186837ca3a6dd6b422a5ea316ed38eea183dca5d.tar.gz
linux-3.10-186837ca3a6dd6b422a5ea316ed38eea183dca5d.tar.bz2
linux-3.10-186837ca3a6dd6b422a5ea316ed38eea183dca5d.zip
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: delay vblank cleanup until after driver unload
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_stub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index b743411d814..a0c365f2e52 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -516,8 +516,6 @@ void drm_put_dev(struct drm_device *dev)
}
driver = dev->driver;
- drm_vblank_cleanup(dev);
-
drm_lastclose(dev);
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
@@ -537,6 +535,8 @@ void drm_put_dev(struct drm_device *dev)
dev->agp = NULL;
}
+ drm_vblank_cleanup(dev);
+
list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head)
drm_rmmap(dev, r_list->map);
drm_ht_remove(&dev->map_hash);