projects/linux·commit 186837ca

Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

186837ca · Linus Torvalds <[email protected]> · 2010-04-20 09:20:11 -07:00

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: delay vblank cleanup until after driver unload
Commit
186837ca3a6dd6b422a5ea316ed38eea183dca5d
Parents
4cecd935 · b78315f0

Merge commit. Changes below are compared with the first parent: 4cecd935.

Changes

1 files changed · +2 −2

FileStatusAddDelContent
drivers/gpu/drm/drm_stub.cmodified+2−2View file

drivers/gpu/drm/drm_stub.c

View file
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index b743411..a0c365f 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);