On Thu, 2006-11-23 at 20:17 -0800, Alex Roitman wrote:
>
> Attached are the xorg.conf and the log files for three cases:
Thanks.
> 6.6.3-1 with UseFBDev (works fine)
You seem to have gotten lucky there, it's the other way around for most
people.
> 6.6.3-2 without UseFBDev (works in 640x480)
That's probably related to
https://bugs.freedesktop.org/show_bug.cgi?id=7243 , try disabling
MergedFB.
> 6.6.3-2 with UseFBDev (freezes)
Does it work with the attached patch?
--
Earthling Michel Dänzer | http://tungstengraphics.com
Libre software enthusiast | Debian, X and DRI developer
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index f5a8421..6cb2e02 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -4344,13 +4344,11 @@ static void RADEONAdjustMemMapRegisters(
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,
@@ -4369,9 +4367,8 @@ static void RADEONAdjustMemMapRegisters(
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
