summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-04-21 00:38:44 +0000
committerDave Airlie <airlied@linux.ie>2006-04-21 00:38:44 +0000
commita66145bc9d487f7e19237cf292f12750cb959f61 (patch)
tree96cd85631dcb3ed960de01e0a44823181151a5dc /src
parentf1f057df9aaba42986d9e20afe6f609a90318333 (diff)
Bugzilla 6672: fix interrupts on radeon since memmap changes
Diffstat (limited to 'src')
-rw-r--r--src/radeon_driver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 5d173070..2e70c58c 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.110 2006/04/01 23:02:40 agd5f Exp $ */
+/* $XdotOrg: driver/xf86-video-ati/src/radeon_driver.c,v 1.111 2006/04/21 00:34:43 airlied Exp $ */
/*
* Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
* VA Linux Systems Inc., Fremont, California.
@@ -7007,7 +7007,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);
@@ -7026,7 +7026,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);