summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rwxr-xr-xconvert/merge2pcitable.pl1
-rw-r--r--lst/Cards+17
-rw-r--r--lst/pcitable6
4 files changed, 13 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index 975c7b95..1b4cedef 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
- add support for QXL virtual video card
- disable nvidia96xx (not compatible with x.org server 1.10)
- prefer amd74xx module for nForce MCP51 IDE (mga#933ch mdv49957)
+- switch 1002:9610 back to ati driver (mga #1267)
+- make the names of the last two Cards using radeonhd/fglrx more specific
Version 0.1.291 - 22 March 2011
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 15ca92b9..bb04875b 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -79,7 +79,6 @@ if ($0 =~ /merge2pcitable/)
}
} elsif (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa, $ati_rhd_only)) && $d_in->{$_}) {
# support added for pre-existing entry, handle:
- next if $_ eq "10029610ffffffff"; # see Cards+ and #49824
if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa))) {
$d_pci->{$_}[0] = $ati_driver;
} elsif ($d_pci->{$_}[0] eq $ati_rhd_only) {
diff --git a/lst/Cards+ b/lst/Cards+
index 85e5c621..37891b62 100644
--- a/lst/Cards+
+++ b/lst/Cards+
@@ -174,10 +174,14 @@ SEE ATI Radeon HD 2000 and later (radeon/fglrx)
# Radeon cards supported by proprietary driver and free 'radeonhd'
# driver, but not free 'radeon' driver.
-# Additionally, it is used for following cards that are supported but
-# do not work correctly with the 'radeon' driver:
-# ATI Radeon HD 3200 Graphics (1002:9610)
-# - https://qa.mandriva.com/show_bug.cgi?id=49824
+NAME ATI Radeon HD 3850 X2
+DRIVER radeonhd
+DRI_GLX
+DRIVER2 fglrx
+
+NAME ATI FirePro V8700 Duo
+SEE ATI Radeon HD 3850 X2
+
NAME ATI Radeon HD 2000 and later (radeonhd/fglrx)
DRIVER radeonhd
DRI_GLX
@@ -187,11 +191,6 @@ NAME ATI Radeon HD 2000 and later (vesa/fglrx)
DRIVER vesa
DRIVER2 fglrx
-# FirePro cards as above:
-# driver: update name as support changes
-NAME ATI FirePro (radeonhd/fglrx)
-SEE ATI Radeon HD 2000 and later (radeonhd/fglrx)
-
# ARK Logic
NAME Ark Logic ARKx000-based cards
diff --git a/lst/pcitable b/lst/pcitable
index 0d85b675..2288a9e0 100644
--- a/lst/pcitable
+++ b/lst/pcitable
@@ -476,7 +476,7 @@
0x1002 0x9443 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9444 "Card:ATI FirePro (radeon/fglrx)"
0x1002 0x9446 "Card:ATI FirePro (radeon/fglrx)"
-0x1002 0x9447 "Card:ATI FirePro (radeonhd/fglrx)"
+0x1002 0x9447 "Card:ATI FirePro V8700 Duo"
0x1002 0x944a "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x944b "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x944c "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
@@ -538,7 +538,7 @@
0x1002 0x9509 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x950f "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9511 "Card:ATI r600 based FireGL"
-0x1002 0x9513 "Card:ATI Radeon HD 2000 and later (radeonhd/fglrx)"
+0x1002 0x9513 "Card:ATI Radeon HD 3850 X2"
0x1002 0x9515 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9517 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9519 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
@@ -586,7 +586,7 @@
0x1002 0x95cd "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x95ce "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x95cf "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
-0x1002 0x9610 "Card:ATI Radeon HD 2000 and later (radeonhd/fglrx)"
+0x1002 0x9610 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9611 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9612 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"
0x1002 0x9613 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)"