aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_drv.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-03 12:54:45 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-03 12:54:45 +0100
commitc36910c147fd7b129a8f1269c76b9767c99de5cd (patch)
tree29403cd341b62581718f6b34944271980fb133e6 /drivers/gpu/drm/drm_drv.c
parentx86: fix broken flushing in GART nofullflush path (diff)
parentAMD IOMMU: fix possible race while accessing iommu->need_sync (diff)
downloadlinux-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.tar.xz
linux-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.zip
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'drivers/gpu/drm/drm_drv.c')
-rw-r--r--drivers/gpu/drm/drm_drv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 3ab1e9cc4692..996097acb5e7 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -305,6 +305,8 @@ static void drm_cleanup(struct drm_device * dev)
return;
}
+ drm_vblank_cleanup(dev);
+
drm_lastclose(dev);
if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&