diff options
| author | Michel Daenzer <michel@daenzer.net> | 2006-04-29 20:34:57 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2006-04-29 20:34:57 +0000 |
| commit | 30f3ce5c5ba205a23748def11de019ee727897f3 (patch) | |
| tree | 7a135eea0ac258570fdce3f47610982de0e9172e | |
| parent | d705429c230c9cc1645ae540a51dba62cae9f23e (diff) | |
Properly de-initialize EXA driver data, so EXA can be initialized again in
the next generation.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/radeon_driver.c | 7 |
2 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2006-04-29 Michel Dänzer <michel@daenzer.net> + * src/radeon_driver.c: (RADEONCloseScreen): + Properly de-initialize EXA driver data, so EXA can be initialized again + in the next generation. + +2006-04-29 Michel Dänzer <michel@daenzer.net> + * src/radeon_dri.c: (RADEONDRITransitionTo3d), (RADEONDRITransitionTo2d): Fix tests for (un)forcing HW cursor. The broken tests caused problems diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 6e3fa393..47c50271 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1,5 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v 1.117 2004/02/19 22:38:12 tsi Exp $ */ -/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.113 2006/04/24 07:44:52 benh Exp $ */ +/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.114 2006/04/26 08:38:47 airlied Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -9114,8 +9114,11 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen) RADEONTRACE(("Disposing accel...\n")); #ifdef USE_EXA - if (info->useEXA && info->accelOn) + if (info->exa) { exaDriverFini(pScreen); + xfree(info->exa); + info->exa = NULL; + } #endif /* USE_EXA */ #ifdef USE_XAA if (!info->useEXA) { |