diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/radeon_driver.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,5 +1,10 @@ 2006-04-21 Dave Airlie <airlied@linux.ie> + * src/radeon_driver.c: (RADEONRestoreMode): + Bugzilla 6672: fix interrupts on radeon since memmap changes + +2006-04-21 Dave Airlie <airlied@linux.ie> + * src/radeon.h: * src/radeon_dri.c: (RADEONDRICloseScreen), (RADEONDRIAllocatePCIGARTTable): diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 3ee8d65b..a4951775 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.92.2.14 2006/03/27 06:24:34 benh Exp $ */ +/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.92.2.15 2006/04/21 00:44:58 airlied Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and * VA Linux Systems Inc., Fremont, California. @@ -6977,7 +6977,7 @@ static void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore) */ if (info->IsSecondary) { RADEONRestoreMemMapRegisters(pScrn, restore); - RADEONRestoreCommonRegisters(pScrn, &restore0); + RADEONRestoreCommonRegisters(pScrn, restore); RADEONRestoreCrtc2Registers(pScrn, restore); RADEONRestorePLL2Registers(pScrn, restore); @@ -6996,7 +6996,7 @@ static void RADEONRestoreMode(ScrnInfoPtr pScrn, RADEONSavePtr restore) } } else { RADEONRestoreMemMapRegisters(pScrn, restore); - RADEONRestoreCommonRegisters(pScrn, &restore0); + RADEONRestoreCommonRegisters(pScrn, restore); if (info->MergedFB) { RADEONRestoreCrtc2Registers(pScrn, restore); RADEONRestorePLL2Registers(pScrn, restore); |