xf86-video-ati: Branch 'atombios-support'

[Dave Airlie]

 src/radeon_driver.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit febdcc2dccd42acbcd68ae630b7811cae5c58e8a
Author: Dave Airlie <airlied at linux.ie>
Date:   Wed Nov 28 05:10:57 2007 +1000

    legacy: fix fb/agp read/writes

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index cb77283..2e49d81 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -817,8 +817,10 @@ void radeon_write_mc_fb_agp_location(ScrnInfoPtr pScrn, int mask, CARD32 fb_loc,
 	    OUTMC(pScrn, R520_MC_AGP_LOCATION, agp_loc);
 	(void)INMC(pScrn, R520_MC_FB_LOCATION);
     } else {
-	  OUTREG(RADEON_MC_FB_LOCATION, fb_loc);
-	  OUTREG(RADEON_MC_AGP_LOCATION, agp_loc);
+	if (mask & LOC_FB)
+	    OUTREG(RADEON_MC_FB_LOCATION, fb_loc);
+	if (mask & LOC_AGP)
+	    OUTREG(RADEON_MC_AGP_LOCATION, agp_loc);
     }
 }
 
@@ -849,8 +851,10 @@ void radeon_read_mc_fb_agp_location(ScrnInfoPtr pScrn, int mask, CARD32 *fb_loc,
 	    *agp_loc_hi = 0;
 	}
     } else {
-	*fb_loc = INREG(RADEON_MC_FB_LOCATION);
-	*agp_loc = INREG(RADEON_MC_AGP_LOCATION);
+	if (mask & LOC_FB)
+	    *fb_loc = INREG(RADEON_MC_FB_LOCATION);
+	if (mask & LOC_AGP)
+	    *agp_loc = INREG(RADEON_MC_AGP_LOCATION);
     }
 }