diff options
| author | Eric Anholt <eric@anholt.net> | 2006-12-05 15:28:21 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-12-05 15:28:21 -0800 |
| commit | 58c247c6de56508b00eadf77b4c145c94134270d (patch) | |
| tree | 317861b6798008bc21b22a4231b768c70a71f0fb /src/i830_driver.c | |
| parent | 0b4c3e7bff790e1e99ace5036a41e96046335b04 (diff) | |
| parent | 2e8c927f9308069a82f25b65bb0c62bc5a156832 (diff) | |
Merge branch 'modesetting-origin' into modesetting
Conflicts:
src/i830_display.c
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 8f017ab2..b638ae43 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -3792,6 +3792,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) DPRINTF(PFX, "\nUnmapping memory\n"); I830UnmapMem(pScrn); vgaHWUnmapMem(pScrn); + xf86CrtcCloseScreen (pScreen); if (pI830->ScanlineColorExpandBuffers) { xfree(pI830->ScanlineColorExpandBuffers); |