xf86-video-ati: Branch 'r3xx-render' - 5 commits

[Alex Deucher]

 src/pcidb/ati_pciids.csv  |    2 +-
 src/radeon_chipinfo_gen.h |    2 +-
 src/radeon_driver.c       |    9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit bed9754ad21d6c0a7f61067b04ba31c430a7cecb
Merge: 55e446b... f71ac0e...
Author: Alex Deucher <alex at samba.(none)>
Date:   Wed Mar 19 16:06:41 2008 -0400

    Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati into r3xx-render

commit f71ac0e40b9d950bcb3bba42a75d41f45b6ed1bf
Author: Alban Browaeys <prahal at yahoo.com>
Date:   Mon Mar 17 20:48:48 2008 -0400

    RADEON: Revert to old behavior when resetting the memmap on VT switch
    
    Not sure why this needs to be done twice.  Should fix bug 14980
    Probably needs more investigation.

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 65f6485..bf7ef8c 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -5208,6 +5208,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 
     pScrn->vtSema = TRUE;
 
+    RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
     RADEONRestoreSurfaces(pScrn, info->ModeReg);
 
     if (!xf86SetDesiredModes(pScrn))
@@ -5227,10 +5228,8 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
 	RADEONDRIResume(pScrn->pScreen);
 	RADEONAdjustMemMapRegisters(pScrn, info->ModeReg);
 
-    } else
+    }
 #endif
-	RADEONRestoreMemMapRegisters(pScrn, info->ModeReg);
-
 
     /* this will get XVideo going again, but only if XVideo was initialised
        during server startup (hence the info->adaptor if). */
commit 29ea5bfc0eb3194e2454fc3ee863df54f0300880
Author: Alex Deucher <alex at cube.(none)>
Date:   Mon Mar 17 16:41:57 2008 -0400

    RADEON: fix typo in RADEONAdjustMemMapRegisters()

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b93c074..65f6485 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3753,7 +3753,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
     radeon_read_mc_fb_agp_location(pScrn, LOC_FB | LOC_AGP, &fb, &agp, &agp_hi);
 
     if (fb != save->mc_fb_location || agp != save->mc_agp_location ||
-	agp_hi || save->mc_agp_location_hi)
+	agp_hi != save->mc_agp_location_hi)
 	changed = 1;
 
     if (changed) {
commit ab317e85c5ab1a249a510c34aeb3a908be1a66fc
Author: Alex Deucher <alex at cube.(none)>
Date:   Mon Mar 17 15:28:09 2008 -0400

    RADEON: make sure var is initialized properly in RADEONAdjustMemMapRegisters()

diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 42324b1..b93c074 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3745,7 +3745,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
 {
     RADEONInfoPtr  info   = RADEONPTR(pScrn);
     CARD32 fb, agp, agp_hi;
-    int changed;
+    int changed = 0;
 
     if (info->IsSecondary)
       return;
commit 208d307227e15f37a6af5194398ed23266ff743a
Author: Dave Airlie <airlied at linux.ie>
Date:   Sun Mar 16 19:39:23 2008 +1000

    radeon: the 0x5974 appears to be a mobility chip...
    
    After debugging with partymola on #radeon, adding this allowed his
    Dell Vostro 1000 to work properly

diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index 6ea41ec..fc340e7 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -187,7 +187,7 @@
 "0x5964","RV280_5964","RV280",,,,,,"ATI Radeon 9200SE 5964 (AGP)"
 "0x5965","RV280_5965","RV280",,,,,,"ATI FireMV 2200 (PCI)"
 "0x5969","RN50_5969","RV100",,,1,,,"ATI ES1000 5969 (PCI)"
-"0x5974","RS482_5974","RS400",,1,,,1,"ATI Radeon XPRESS 200 5974 (PCIE)"
+"0x5974","RS482_5974","RS400",1,1,,,1,"ATI Radeon XPRESS 200 5974 (PCIE)"
 "0x5975","RS485_5975","RS400",1,1,,,1,"ATI Radeon XPRESS 200M 5975 (PCIE)"
 "0x5A41","RS400_5A41","RS400",,1,,,1,"ATI Radeon XPRESS 200 5A41 (PCIE)"
 "0x5A42","RS400_5A42","RS400",1,1,,,1,"ATI Radeon XPRESS 200M 5A42 (PCIE)"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index f9f1e06..de1d109 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -106,7 +106,7 @@ RADEONCardInfo RADEONCards[] = {
  { 0x5964, CHIP_FAMILY_RV280, 0, 0, 0, 0, 0 },
  { 0x5965, CHIP_FAMILY_RV280, 0, 0, 0, 0, 0 },
  { 0x5969, CHIP_FAMILY_RV100, 0, 0, 1, 0, 0 },
- { 0x5974, CHIP_FAMILY_RS400, 0, 1, 0, 0, 1 },
+ { 0x5974, CHIP_FAMILY_RS400, 1, 1, 0, 0, 1 },
  { 0x5975, CHIP_FAMILY_RS400, 1, 1, 0, 0, 1 },
  { 0x5A41, CHIP_FAMILY_RS400, 0, 1, 0, 0, 1 },
  { 0x5A42, CHIP_FAMILY_RS400, 1, 1, 0, 0, 1 },