tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 186837ca 4cecd935

+2 -2
unified split
+2 -2
drivers/gpu/drm/drm_stub.c
··· 516 } 517 driver = dev->driver; 518 519 - drm_vblank_cleanup(dev); 520 - 521 drm_lastclose(dev); 522 523 if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && ··· 534 kfree(dev->agp); 535 dev->agp = NULL; 536 } 537 538 list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) 539 drm_rmmap(dev, r_list->map);
··· 516 } 517 driver = dev->driver; 518 519 drm_lastclose(dev); 520 521 if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && ··· 536 kfree(dev->agp); 537 dev->agp = NULL; 538 } 539 + 540 + drm_vblank_cleanup(dev); 541 542 list_for_each_entry_safe(r_list, list_temp, &dev->maplist, head) 543 drm_rmmap(dev, r_list->map);