diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2007-08-23 12:10:33 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-08-23 12:10:33 +0200 |
| commit | 7b527054a7c81d1d1dbc79d41b9e53064dab68cb (patch) | |
| tree | 034051170b607854577f035e7225352fcda4ed5f | |
| parent | d7ba9f001c0ab645984526afd0e64d1c6a6d654a (diff) | |
radeon: Restore memmap registers even if only AGP location changed.
| -rw-r--r-- | src/radeon_driver.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/radeon_driver.c b/src/radeon_driver.c index 1d5cc362..87f14056 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -3982,13 +3982,11 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) RADEONInfoPtr info = RADEONPTR(pScrn); unsigned char *RADEONMMIO = info->MMIO; CARD32 fb, agp; - int fb_loc_changed; fb = INREG(RADEON_MC_FB_LOCATION); agp = INREG(RADEON_MC_AGP_LOCATION); - fb_loc_changed = (fb != info->mc_fb_location); - if (fb_loc_changed || agp != info->mc_agp_location) { + if (fb != info->mc_fb_location || agp != info->mc_agp_location) { xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "DRI init changed memory map, adjusting ...\n"); xf86DrvMsg(pScrn->scrnIndex, X_WARNING, @@ -4007,9 +4005,8 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save) RADEONInitMemMapRegisters(pScrn, save, info); - /* If MC_FB_LOCATION was changed, adjust the various offsets */ - if (fb_loc_changed) - RADEONRestoreMemMapRegisters(pScrn, save); + /* Adjust the various offsets */ + RADEONRestoreMemMapRegisters(pScrn, save); } #ifdef USE_EXA |