debian/changelog | 7 debian/patches/100_radeon-6.9.0-bgnr-enable.patch | 18 + debian/patches/102-no-xv-rn50.patch | 30 ++ debian/patches/103_new_pci_ids.patch | 314 ++++++++++++++++++++++ debian/patches/series | 9 5 files changed, 369 insertions(+), 9 deletions(-)
New commits: commit ac88a08852cb9e1d1be4ec187b6917a2684a73c2 Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 8 10:59:30 2010 +1000 Drop EXA r600 reversion series patches; these didn't fix the problem. Drop 101_man_no_pm_options_with_kms.patch; we've got a 2.6.34 kernel now. Document remaining patches in changelog diff --git a/debian/changelog b/debian/changelog index 10e97aa..099797e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,13 @@ xserver-xorg-video-ati (1:6.13.0-2ubuntu1) maverick; urgency=low * Merge from Debian Unstable. Remaining Ubuntu changes: + debian/control: - Add quilt to build-depends for Ubuntu patches + + debian/patches/103_new_pci_ids.patch: + - Add PCI IDs for some new RV7xx a Redwood + + debian/patches/102-no-xv-rn50.patch: + - Upstream backport: disable Xv on rn50 chips which have no 3D engine + or overlay. + + debian/patches/100_radeon-6.9.0-bgnr-enable.patch: + - Smooth plymouth transition enablement patch + debian/rules: - Add xsfbs patchsys - Drop /etc/modprobe.d/radeon-kms.conf install. diff --git a/debian/patches/series b/debian/patches/series index 6fb8933..2772981 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,12 +1,3 @@ -0001-Revert-r600-exa-further-cleanup-use-the-object-struc.patch -0002-Revert-r600-cleanup-wasteful-variables.patch -0003-Revert-r600-reduce-function-call-overhead.patch -0004-Revert-r6xx-EXA-fix-swapped-domains-in-kms-UTS.patch -0005-Revert-r6xx-EXA-Xv-add-a-R600SetAccelState-function.patch -0006-Revert-r6xx-EXA-always-use-a-temp-surface-for-overla.patch -0007-Revert-r6xx-EXA-always-use-the-accel_state-state-in-.patch -0008-Revert-r6xx-EXA-Xv-track-src-dst-domains.patch 100_radeon-6.9.0-bgnr-enable.patch -101_man_no_pm_options_with_kms.patch 102-no-xv-rn50.patch 103_new_pci_ids.patch commit f0a2173434d3b2007fabfff7e1013b05560c814e Author: Christopher James Halse Rogers <[email protected]> Date: Tue Jun 8 10:57:56 2010 +1000 Actually add the patches to git. Stupid .gitignore! diff --git a/debian/patches/100_radeon-6.9.0-bgnr-enable.patch b/debian/patches/100_radeon-6.9.0-bgnr-enable.patch new file mode 100644 index 0000000..eb1c135 --- /dev/null +++ b/debian/patches/100_radeon-6.9.0-bgnr-enable.patch @@ -0,0 +1,18 @@ +Description: Turn on option to allow xserver to skip drawing the root background + window for the radeon driver. This will make the boot up sequence smoother by + eliminating one flicker. + TESTERS: Watch for corruption or other ill effects during boot up. +Author: Bryce Harrington <[email protected]> + +--- xserver-xorg-video-ati-6.12.191.orig/src/radeon_kms.c 2010-03-02 01:24:11.000000000 +0100 ++++ xserver-xorg-video-ati-6.12.191/src/radeon_kms.c 2010-03-07 22:33:18.244660337 +0100 +@@ -375,6 +375,9 @@ + if (pScrn->numEntities != 1) return FALSE; + if (!RADEONGetRec(pScrn)) return FALSE; + ++ /* kms bg root enable */ ++ pScrn->canDoBGNoneRoot = 1; ++ + info = RADEONPTR(pScrn); + info->MMIO = NULL; + info->IsSecondary = FALSE; diff --git a/debian/patches/102-no-xv-rn50.patch b/debian/patches/102-no-xv-rn50.patch new file mode 100644 index 0000000..6a31701 --- /dev/null +++ b/debian/patches/102-no-xv-rn50.patch @@ -0,0 +1,30 @@ +From eb5665688ef9b52f03f61546351d0848cab54740 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <[email protected]> +Date: Thu, 08 Apr 2010 04:31:52 +0000 +Subject: radeon: don't setup Xv on rn50 + +It has no overlay or 3D engine. + +fixes fdo bug 27528 +--- +diff --git a/src/radeon_video.c b/src/radeon_video.c +index 8f0917f..5e2a723 100644 +--- a/src/radeon_video.c ++++ b/src/radeon_video.c +@@ -271,10 +271,14 @@ void RADEONInitVideo(ScreenPtr pScreen) + { + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + RADEONInfoPtr info = RADEONPTR(pScrn); ++ RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); + XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; + XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL; + int num_adaptors; + ++ /* no overlay or 3D on RN50 */ ++ if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) ++ return; + + num_adaptors = xf86XVListGenericAdaptors(pScrn, &adaptors); + newAdaptors = xalloc((num_adaptors + 2) * sizeof(XF86VideoAdaptorPtr *)); +-- +cgit v0.8.3-6-g21f6 diff --git a/debian/patches/103_new_pci_ids.patch b/debian/patches/103_new_pci_ids.patch new file mode 100644 index 0000000..d910674 --- /dev/null +++ b/debian/patches/103_new_pci_ids.patch @@ -0,0 +1,314 @@ +From 276fe739f1caa95778213054375a65288b80f320 Mon Sep 17 00:00:00 2001 +From: Alex Deucher <[email protected]> +Date: Sat, 10 Apr 2010 00:03:09 +0000 +Subject: radeon: add some new pci ids + +--- +diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h +index f88b069..347e17e 100644 +--- a/src/ati_pciids_gen.h ++++ b/src/ati_pciids_gen.h +@@ -348,6 +348,7 @@ + #define PCI_CHIP_RV770_9456 0x9456 + #define PCI_CHIP_RV770_945A 0x945A + #define PCI_CHIP_RV770_945B 0x945B ++#define PCI_CHIP_RV770_945E 0x945E + #define PCI_CHIP_RV790_9460 0x9460 + #define PCI_CHIP_RV790_9462 0x9462 + #define PCI_CHIP_RV770_946A 0x946A +@@ -358,6 +359,7 @@ + #define PCI_CHIP_RV730_9487 0x9487 + #define PCI_CHIP_RV730_9488 0x9488 + #define PCI_CHIP_RV730_9489 0x9489 ++#define PCI_CHIP_RV730_948A 0x948A + #define PCI_CHIP_RV730_948F 0x948F + #define PCI_CHIP_RV730_9490 0x9490 + #define PCI_CHIP_RV730_9491 0x9491 +@@ -401,12 +403,14 @@ + #define PCI_CHIP_RV670_9519 0x9519 + #define PCI_CHIP_RV710_9540 0x9540 + #define PCI_CHIP_RV710_9541 0x9541 ++#define PCI_CHIP_RV710_9542 0x9542 + #define PCI_CHIP_RV710_954E 0x954E + #define PCI_CHIP_RV710_954F 0x954F + #define PCI_CHIP_RV710_9552 0x9552 + #define PCI_CHIP_RV710_9553 0x9553 + #define PCI_CHIP_RV710_9555 0x9555 + #define PCI_CHIP_RV710_9557 0x9557 ++#define PCI_CHIP_RV710_955F 0x955F + #define PCI_CHIP_RV630_9580 0x9580 + #define PCI_CHIP_RV630_9581 0x9581 + #define PCI_CHIP_RV630_9583 0x9583 +@@ -420,7 +424,6 @@ + #define PCI_CHIP_RV630_958D 0x958D + #define PCI_CHIP_RV630_958E 0x958E + #define PCI_CHIP_RV630_958F 0x958F +-#define PCI_CHIP_RV710_9542 0x9542 + #define PCI_CHIP_RV620_95C0 0x95C0 + #define PCI_CHIP_RV620_95C2 0x95C2 + #define PCI_CHIP_RV620_95C4 0x95C4 +@@ -473,6 +476,7 @@ + #define PCI_CHIP_JUNIPER_68BE 0x68BE + #define PCI_CHIP_REDWOOD_68C0 0x68C0 + #define PCI_CHIP_REDWOOD_68C1 0x68C1 ++#define PCI_CHIP_REDWOOD_68C7 0x68C7 + #define PCI_CHIP_REDWOOD_68C8 0x68C8 + #define PCI_CHIP_REDWOOD_68C9 0x68C9 + #define PCI_CHIP_REDWOOD_68D8 0x68D8 +diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv +index b26cf25..e0cfb26 100644 +--- a/src/pcidb/ati_pciids.csv ++++ b/src/pcidb/ati_pciids.csv +@@ -349,6 +349,7 @@ + "0x9456","RV770_9456","RV770",,,,,,"ATI FirePro V8700 (FireGL)" + "0x945A","RV770_945A","RV770",1,,,,,"ATI Mobility RADEON HD 4870" + "0x945B","RV770_945B","RV770",1,,,,,"ATI Mobility RADEON M98" ++"0x945E","RV770_945E","RV770",1,,,,,"ATI Mobility RADEON HD 4870" + "0x9460","RV790_9460","RV770",,,,,,"ATI Radeon 4800 Series" + "0x9462","RV790_9462","RV770",,,,,,"ATI Radeon 4800 Series" + "0x946A","RV770_946A","RV770",1,,,,,"ATI FirePro M7750" +@@ -359,6 +360,7 @@ + "0x9487","RV730_9487","RV730",,,,,,"ATI Radeon RV730 (AGP)" + "0x9488","RV730_9488","RV730",1,,,,,"ATI Mobility Radeon HD 4670" + "0x9489","RV730_9489","RV730",1,,,,,"ATI FirePro M5750" ++"0x948A","RV730_948A","RV730",1,,,,,"ATI Mobility Radeon HD 4670" + "0x948F","RV730_948F","RV730",,,,,,"ATI Radeon RV730 (AGP)" + "0x9490","RV730_9490","RV730",,,,,,"ATI RV730XT [Radeon HD 4670]" + "0x9491","RV730_9491","RV730",,,,,,"ATI RADEON E4600" +@@ -402,12 +404,14 @@ + "0x9519","RV670_9519","RV670",,,,,,"AMD Firestream 9170" + "0x9540","RV710_9540","RV710",,,,,,"ATI Radeon HD 4550" + "0x9541","RV710_9541","RV710",,,,,,"ATI Radeon RV710" ++"0x9542","RV710_9542","RV710",,,,,,"ATI Radeon RV710" + "0x954E","RV710_954E","RV710",,,,,,"ATI Radeon RV710" + "0x954F","RV710_954F","RV710",,,,,,"ATI Radeon HD 4350" + "0x9552","RV710_9552","RV710",1,,,,,"ATI Mobility Radeon 4300 Series" + "0x9553","RV710_9553","RV710",1,,,,,"ATI Mobility Radeon 4500 Series" + "0x9555","RV710_9555","RV710",1,,,,,"ATI Mobility Radeon 4500 Series" + "0x9557","RV710_9557","RV710",1,,,,,"ATI FirePro RG220" ++"0x955F","RV710_955F","RV710",1,,,,,"ATI Mobility Radeon 4330" + "0x9580","RV630_9580","RV630",,,,,,"ATI RV630" + "0x9581","RV630_9581","RV630",1,,,,,"ATI Mobility Radeon HD 2600" + "0x9583","RV630_9583","RV630",1,,,,,"ATI Mobility Radeon HD 2600 XT" +@@ -421,7 +425,6 @@ + "0x958D","RV630_958D","RV630",,,,,,"ATI FireGL V3600" + "0x958E","RV630_958E","RV630",,,,,,"ATI Radeon HD 2600 LE" + "0x958F","RV630_958F","RV630",1,,,,,"ATI Mobility FireGL Graphics Processor" +-"0x9542","RV710_9542","RV710",,,,,,"ATI Radeon RV710" + "0x95C0","RV620_95C0","RV620",,,,,,"ATI Radeon HD 3470" + "0x95C2","RV620_95C2","RV620",1,,,,,"ATI Mobility Radeon HD 3430" + "0x95C4","RV620_95C4","RV620",1,,,,,"ATI Mobility Radeon HD 3400 Series" +@@ -474,6 +477,7 @@ + "0x68BE","JUNIPER_68BE","JUNIPER",,,,,,"ATI Radeon HD 5700 Series" + "0x68C0","REDWOOD_68C0","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5000 Series" + "0x68C1","REDWOOD_68C1","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5000 Series" ++"0x68C7","REDWOOD_68C7","REDWOOD",1,,,,,"ATI Mobility Radeon HD 5570" + "0x68C8","REDWOOD_68C8","REDWOOD",,,,,,"ATI FirePro (FireGL) Graphics Adapter" + "0x68C9","REDWOOD_68C9","REDWOOD",,,,,,"ATI FirePro (FireGL) Graphics Adapter" + "0x68D8","REDWOOD_68D8","REDWOOD",,,,,,"ATI Radeon HD 5670" +diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h +index 0f53790..d66f4da 100644 +--- a/src/radeon_chipinfo_gen.h ++++ b/src/radeon_chipinfo_gen.h +@@ -268,6 +268,7 @@ static RADEONCardInfo RADEONCards[] = { + { 0x9456, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 }, + { 0x945A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 }, + { 0x945B, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 }, ++ { 0x945E, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 }, + { 0x9460, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 }, + { 0x9462, CHIP_FAMILY_RV770, 0, 0, 0, 0, 0 }, + { 0x946A, CHIP_FAMILY_RV770, 1, 0, 0, 0, 0 }, +@@ -278,6 +279,7 @@ static RADEONCardInfo RADEONCards[] = { + { 0x9487, CHIP_FAMILY_RV730, 0, 0, 0, 0, 0 }, + { 0x9488, CHIP_FAMILY_RV730, 1, 0, 0, 0, 0 }, + { 0x9489, CHIP_FAMILY_RV730, 1, 0, 0, 0, 0 }, ++ { 0x948A, CHIP_FAMILY_RV730, 1, 0, 0, 0, 0 }, + { 0x948F, CHIP_FAMILY_RV730, 0, 0, 0, 0, 0 }, + { 0x9490, CHIP_FAMILY_RV730, 0, 0, 0, 0, 0 }, + { 0x9491, CHIP_FAMILY_RV730, 0, 0, 0, 0, 0 }, +@@ -321,12 +323,14 @@ static RADEONCardInfo RADEONCards[] = { + { 0x9519, CHIP_FAMILY_RV670, 0, 0, 0, 0, 0 }, + { 0x9540, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, + { 0x9541, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, ++ { 0x9542, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, + { 0x954E, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, + { 0x954F, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, + { 0x9552, CHIP_FAMILY_RV710, 1, 0, 0, 0, 0 }, + { 0x9553, CHIP_FAMILY_RV710, 1, 0, 0, 0, 0 }, + { 0x9555, CHIP_FAMILY_RV710, 1, 0, 0, 0, 0 }, + { 0x9557, CHIP_FAMILY_RV710, 1, 0, 0, 0, 0 }, ++ { 0x955F, CHIP_FAMILY_RV710, 1, 0, 0, 0, 0 }, + { 0x9580, CHIP_FAMILY_RV630, 0, 0, 0, 0, 0 }, + { 0x9581, CHIP_FAMILY_RV630, 1, 0, 0, 0, 0 }, + { 0x9583, CHIP_FAMILY_RV630, 1, 0, 0, 0, 0 }, +@@ -340,7 +344,6 @@ static RADEONCardInfo RADEONCards[] = { + { 0x958D, CHIP_FAMILY_RV630, 0, 0, 0, 0, 0 }, + { 0x958E, CHIP_FAMILY_RV630, 0, 0, 0, 0, 0 }, + { 0x958F, CHIP_FAMILY_RV630, 1, 0, 0, 0, 0 }, +- { 0x9542, CHIP_FAMILY_RV710, 0, 0, 0, 0, 0 }, + { 0x95C0, CHIP_FAMILY_RV620, 0, 0, 0, 0, 0 }, + { 0x95C2, CHIP_FAMILY_RV620, 1, 0, 0, 0, 0 }, + { 0x95C4, CHIP_FAMILY_RV620, 1, 0, 0, 0, 0 }, +@@ -393,6 +396,7 @@ static RADEONCardInfo RADEONCards[] = { + { 0x68BE, CHIP_FAMILY_JUNIPER, 0, 0, 0, 0, 0 }, + { 0x68C0, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 }, + { 0x68C1, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 }, ++ { 0x68C7, CHIP_FAMILY_REDWOOD, 1, 0, 0, 0, 0 }, + { 0x68C8, CHIP_FAMILY_REDWOOD, 0, 0, 0, 0, 0 }, + { 0x68C9, CHIP_FAMILY_REDWOOD, 0, 0, 0, 0, 0 }, + { 0x68D8, CHIP_FAMILY_REDWOOD, 0, 0, 0, 0, 0 }, +diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h +index 7b74d7e..c84ed01 100644 +--- a/src/radeon_chipset_gen.h ++++ b/src/radeon_chipset_gen.h +@@ -268,6 +268,7 @@ static SymTabRec RADEONChipsets[] = { + { PCI_CHIP_RV770_9456, "ATI FirePro V8700 (FireGL)" }, + { PCI_CHIP_RV770_945A, "ATI Mobility RADEON HD 4870" }, + { PCI_CHIP_RV770_945B, "ATI Mobility RADEON M98" }, ++ { PCI_CHIP_RV770_945E, "ATI Mobility RADEON HD 4870" }, + { PCI_CHIP_RV790_9460, "ATI Radeon 4800 Series" }, + { PCI_CHIP_RV790_9462, "ATI Radeon 4800 Series" }, + { PCI_CHIP_RV770_946A, "ATI FirePro M7750" }, +@@ -278,6 +279,7 @@ static SymTabRec RADEONChipsets[] = { + { PCI_CHIP_RV730_9487, "ATI Radeon RV730 (AGP)" }, + { PCI_CHIP_RV730_9488, "ATI Mobility Radeon HD 4670" }, + { PCI_CHIP_RV730_9489, "ATI FirePro M5750" }, ++ { PCI_CHIP_RV730_948A, "ATI Mobility Radeon HD 4670" }, + { PCI_CHIP_RV730_948F, "ATI Radeon RV730 (AGP)" }, + { PCI_CHIP_RV730_9490, "ATI RV730XT [Radeon HD 4670]" }, + { PCI_CHIP_RV730_9491, "ATI RADEON E4600" }, +@@ -321,12 +323,14 @@ static SymTabRec RADEONChipsets[] = { + { PCI_CHIP_RV670_9519, "AMD Firestream 9170" }, + { PCI_CHIP_RV710_9540, "ATI Radeon HD 4550" }, + { PCI_CHIP_RV710_9541, "ATI Radeon RV710" }, ++ { PCI_CHIP_RV710_9542, "ATI Radeon RV710" }, + { PCI_CHIP_RV710_954E, "ATI Radeon RV710" }, + { PCI_CHIP_RV710_954F, "ATI Radeon HD 4350" }, + { PCI_CHIP_RV710_9552, "ATI Mobility Radeon 4300 Series" }, + { PCI_CHIP_RV710_9553, "ATI Mobility Radeon 4500 Series" }, + { PCI_CHIP_RV710_9555, "ATI Mobility Radeon 4500 Series" }, + { PCI_CHIP_RV710_9557, "ATI FirePro RG220" }, ++ { PCI_CHIP_RV710_955F, "ATI Mobility Radeon 4330" }, + { PCI_CHIP_RV630_9580, "ATI RV630" }, + { PCI_CHIP_RV630_9581, "ATI Mobility Radeon HD 2600" }, + { PCI_CHIP_RV630_9583, "ATI Mobility Radeon HD 2600 XT" }, +@@ -340,7 +344,6 @@ static SymTabRec RADEONChipsets[] = { + { PCI_CHIP_RV630_958D, "ATI FireGL V3600" }, + { PCI_CHIP_RV630_958E, "ATI Radeon HD 2600 LE" }, + { PCI_CHIP_RV630_958F, "ATI Mobility FireGL Graphics Processor" }, +- { PCI_CHIP_RV710_9542, "ATI Radeon RV710" }, + { PCI_CHIP_RV620_95C0, "ATI Radeon HD 3470" }, + { PCI_CHIP_RV620_95C2, "ATI Mobility Radeon HD 3430" }, + { PCI_CHIP_RV620_95C4, "ATI Mobility Radeon HD 3400 Series" }, +@@ -393,6 +396,7 @@ static SymTabRec RADEONChipsets[] = { + { PCI_CHIP_JUNIPER_68BE, "ATI Radeon HD 5700 Series" }, + { PCI_CHIP_REDWOOD_68C0, "ATI Mobility Radeon HD 5000 Series" }, + { PCI_CHIP_REDWOOD_68C1, "ATI Mobility Radeon HD 5000 Series" }, ++ { PCI_CHIP_REDWOOD_68C7, "ATI Mobility Radeon HD 5570" }, + { PCI_CHIP_REDWOOD_68C8, "ATI FirePro (FireGL) Graphics Adapter" }, + { PCI_CHIP_REDWOOD_68C9, "ATI FirePro (FireGL) Graphics Adapter" }, + { PCI_CHIP_REDWOOD_68D8, "ATI Radeon HD 5670" }, +diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h +index 8afa10d..3993655 100644 +--- a/src/radeon_pci_chipset_gen.h ++++ b/src/radeon_pci_chipset_gen.h +@@ -268,6 +268,7 @@ PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_RV770_9456, PCI_CHIP_RV770_9456, RES_SHARED_VGA }, + { PCI_CHIP_RV770_945A, PCI_CHIP_RV770_945A, RES_SHARED_VGA }, + { PCI_CHIP_RV770_945B, PCI_CHIP_RV770_945B, RES_SHARED_VGA }, ++ { PCI_CHIP_RV770_945E, PCI_CHIP_RV770_945E, RES_SHARED_VGA }, + { PCI_CHIP_RV790_9460, PCI_CHIP_RV790_9460, RES_SHARED_VGA }, + { PCI_CHIP_RV790_9462, PCI_CHIP_RV790_9462, RES_SHARED_VGA }, + { PCI_CHIP_RV770_946A, PCI_CHIP_RV770_946A, RES_SHARED_VGA }, +@@ -278,6 +279,7 @@ PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_RV730_9487, PCI_CHIP_RV730_9487, RES_SHARED_VGA }, + { PCI_CHIP_RV730_9488, PCI_CHIP_RV730_9488, RES_SHARED_VGA }, + { PCI_CHIP_RV730_9489, PCI_CHIP_RV730_9489, RES_SHARED_VGA }, ++ { PCI_CHIP_RV730_948A, PCI_CHIP_RV730_948A, RES_SHARED_VGA }, + { PCI_CHIP_RV730_948F, PCI_CHIP_RV730_948F, RES_SHARED_VGA }, + { PCI_CHIP_RV730_9490, PCI_CHIP_RV730_9490, RES_SHARED_VGA }, + { PCI_CHIP_RV730_9491, PCI_CHIP_RV730_9491, RES_SHARED_VGA }, +@@ -321,12 +323,14 @@ PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_RV670_9519, PCI_CHIP_RV670_9519, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9540, PCI_CHIP_RV710_9540, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9541, PCI_CHIP_RV710_9541, RES_SHARED_VGA }, ++ { PCI_CHIP_RV710_9542, PCI_CHIP_RV710_9542, RES_SHARED_VGA }, + { PCI_CHIP_RV710_954E, PCI_CHIP_RV710_954E, RES_SHARED_VGA }, + { PCI_CHIP_RV710_954F, PCI_CHIP_RV710_954F, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9552, PCI_CHIP_RV710_9552, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9553, PCI_CHIP_RV710_9553, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9555, PCI_CHIP_RV710_9555, RES_SHARED_VGA }, + { PCI_CHIP_RV710_9557, PCI_CHIP_RV710_9557, RES_SHARED_VGA }, ++ { PCI_CHIP_RV710_955F, PCI_CHIP_RV710_955F, RES_SHARED_VGA }, + { PCI_CHIP_RV630_9580, PCI_CHIP_RV630_9580, RES_SHARED_VGA }, + { PCI_CHIP_RV630_9581, PCI_CHIP_RV630_9581, RES_SHARED_VGA }, + { PCI_CHIP_RV630_9583, PCI_CHIP_RV630_9583, RES_SHARED_VGA }, +@@ -340,7 +344,6 @@ PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_RV630_958D, PCI_CHIP_RV630_958D, RES_SHARED_VGA }, + { PCI_CHIP_RV630_958E, PCI_CHIP_RV630_958E, RES_SHARED_VGA }, + { PCI_CHIP_RV630_958F, PCI_CHIP_RV630_958F, RES_SHARED_VGA }, +- { PCI_CHIP_RV710_9542, PCI_CHIP_RV710_9542, RES_SHARED_VGA }, + { PCI_CHIP_RV620_95C0, PCI_CHIP_RV620_95C0, RES_SHARED_VGA }, + { PCI_CHIP_RV620_95C2, PCI_CHIP_RV620_95C2, RES_SHARED_VGA }, + { PCI_CHIP_RV620_95C4, PCI_CHIP_RV620_95C4, RES_SHARED_VGA }, +@@ -393,6 +396,7 @@ PciChipsets RADEONPciChipsets[] = { + { PCI_CHIP_JUNIPER_68BE, PCI_CHIP_JUNIPER_68BE, RES_SHARED_VGA }, + { PCI_CHIP_REDWOOD_68C0, PCI_CHIP_REDWOOD_68C0, RES_SHARED_VGA }, + { PCI_CHIP_REDWOOD_68C1, PCI_CHIP_REDWOOD_68C1, RES_SHARED_VGA }, ++ { PCI_CHIP_REDWOOD_68C7, PCI_CHIP_REDWOOD_68C7, RES_SHARED_VGA }, + { PCI_CHIP_REDWOOD_68C8, PCI_CHIP_REDWOOD_68C8, RES_SHARED_VGA }, + { PCI_CHIP_REDWOOD_68C9, PCI_CHIP_REDWOOD_68C9, RES_SHARED_VGA }, + { PCI_CHIP_REDWOOD_68D8, PCI_CHIP_REDWOOD_68D8, RES_SHARED_VGA }, +diff --git a/src/radeon_pci_device_match_gen.h b/src/radeon_pci_device_match_gen.h +index a09c969..fa36b69 100644 +--- a/src/radeon_pci_device_match_gen.h ++++ b/src/radeon_pci_device_match_gen.h +@@ -268,6 +268,7 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_RV770_9456, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV770_945A, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV770_945B, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_RV770_945E, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV790_9460, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV790_9462, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV770_946A, 0 ), +@@ -278,6 +279,7 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_RV730_9487, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV730_9488, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV730_9489, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_RV730_948A, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV730_948F, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV730_9490, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV730_9491, 0 ), +@@ -321,12 +323,14 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_RV670_9519, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9540, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9541, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_RV710_9542, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_954E, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_954F, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9552, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9553, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9555, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV710_9557, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_RV710_955F, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV630_9580, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV630_9581, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV630_9583, 0 ), +@@ -340,7 +344,6 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_RV630_958D, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV630_958E, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV630_958F, 0 ), +- ATI_DEVICE_MATCH( PCI_CHIP_RV710_9542, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV620_95C0, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV620_95C2, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_RV620_95C4, 0 ), +@@ -393,6 +396,7 @@ static const struct pci_id_match radeon_device_match[] = { + ATI_DEVICE_MATCH( PCI_CHIP_JUNIPER_68BE, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C0, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C1, 0 ), ++ ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C7, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C8, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68C9, 0 ), + ATI_DEVICE_MATCH( PCI_CHIP_REDWOOD_68D8, 0 ), +-- +cgit v0.8.3-6-g21f6 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
