xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_driver.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3a6e958c59b4b44fe620c8abe760ed1abf0007b1
Author: airlied <airlied at roo.(none)>
Date:   Fri Jan 30 07:56:14 2009 +1000

    rs780: include RS780 in the InitMemory to leave alone
    
    This stops the MC_FB_LOCATION getting reassigned to 0, which
    is really bad thing to happen.
    
    I've had reported memory corruption on these cards so hopefully this
    fixes it.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 22b2e4c..eda7b77 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -1293,7 +1293,8 @@ static void RADEONInitMemoryMap(ScrnInfoPtr pScrn)
 
     if ((info->ChipFamily != CHIP_FAMILY_RS600) &&
 	(info->ChipFamily != CHIP_FAMILY_RS690) &&
-	(info->ChipFamily != CHIP_FAMILY_RS740)) {
+	(info->ChipFamily != CHIP_FAMILY_RS740) &&
+	(info->ChipFamily != CHIP_FAMILY_RS780)) {
 	if (info->IsIGP)
 	    info->mc_fb_location = INREG(RADEON_NB_TOM);
 	else