[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-video-ati: Changes to 'ubuntu'



 COPYING                              |  133 ++++++
 ChangeLog                            |  673 +++++++++++++++++++++++++++++++++++
 configure.ac                         |    9 
 debian/changelog                     |   29 +
 debian/control                       |    3 
 debian/patches/102-no-xv-rn50.patch  |   30 -
 debian/patches/103_new_pci_ids.patch |  314 ----------------
 debian/patches/series                |    2 
 man/radeon.man                       |    2 
 src/Makefile.am                      |    5 
 src/ati_pciids_gen.h                 |    7 
 src/atombios_crtc.c                  |   22 +
 src/atombios_output.c                |    8 
 src/drmmode_display.c                |  152 +++++++
 src/drmmode_display.h                |   16 
 src/legacy_crtc.c                    |   28 +
 src/legacy_output.c                  |    6 
 src/pcidb/ati_pciids.csv             |    7 
 src/r600_exa.c                       |    2 
 src/r600_shader.c                    |    2 
 src/r600_state.h                     |    6 
 src/r6xx_accel.c                     |  383 ++++++++-----------
 src/radeon.h                         |   15 
 src/radeon_accel.c                   |   22 -
 src/radeon_accelfuncs.c              |    2 
 src/radeon_atombios.c                |   59 +--
 src/radeon_bios.c                    |   19 
 src/radeon_chipinfo_gen.h            |    7 
 src/radeon_chipset_gen.h             |    7 
 src/radeon_commonfuncs.c             |   15 
 src/radeon_crtc.c                    |   67 +--
 src/radeon_cursor.c                  |    4 
 src/radeon_dri.c                     |  135 ++-----
 src/radeon_dri.h                     |    4 
 src/radeon_dri2.c                    |  493 ++++++++++++++++++++++++-
 src/radeon_dri2.h                    |    6 
 src/radeon_driver.c                  |  104 +++--
 src/radeon_exa.c                     |   51 ++
 src/radeon_exa_funcs.c               |    2 
 src/radeon_exa_render.c              |   46 ++
 src/radeon_kms.c                     |   72 ++-
 src/radeon_output.c                  |    4 
 src/radeon_pci_chipset_gen.h         |    7 
 src/radeon_pci_device_match_gen.h    |    7 
 src/radeon_probe.c                   |    8 
 src/radeon_probe.h                   |    9 
 src/radeon_textured_video.c          |    6 
 src/radeon_textured_videofuncs.c     |  504 ++++++++++++++++++--------
 src/radeon_vbo.c                     |   12 
 src/radeon_video.c                   |   42 +-
 src/radeon_video.h                   |    2 
 src/radeon_vip.c                     |    2 
 src/theatre200.c                     |    8 
 53 files changed, 2468 insertions(+), 1112 deletions(-)

New commits:
commit bbe4eb47e17f29282f6ba820092df6e5018ead64
Author: Robert Hooker <sarvatt@ubuntu.com>
Date:   Thu Jul 8 16:49:16 2010 -0400

    Drop upstream patches, update changelog.

diff --git a/debian/changelog b/debian/changelog
index 221385c..a57af39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xserver-xorg-video-ati (1:6.13.1-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian Unstable. Remainning Ubuntu changes:
+    + debian/control:
+      - Add quilt to build-depends for Ubuntu patches
+    + 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.
+    + debian/xserver-xorg-video-ati.{pre,post}inst.in:
+      - Clean existing /etc/modprobe.d/radeon-kms.conf on install.
+        At best this does nothing (KMS is the default for our kernel)
+        and at worst it makes it harder to disable KMS.
+  * Add debian/gbp.conf pointing to Ubuntu branch to make git-buildpackage
+    less narky.
+  * Drop 102-no-xv-rn50.patch and 103_new_pci_ids.patch from previous
+    Ubuntu releases, they are upstream now.
+
+ -- Robert Hooker <sarvatt@ubuntu.com>  Thu, 08 Jul 2010 16:45:59 -0400
+
 xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/102-no-xv-rn50.patch b/debian/patches/102-no-xv-rn50.patch
deleted file mode 100644
index 6a31701..0000000
--- a/debian/patches/102-no-xv-rn50.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From eb5665688ef9b52f03f61546351d0848cab54740 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher@gmail.com>
-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
deleted file mode 100644
index d910674..0000000
--- a/debian/patches/103_new_pci_ids.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From 276fe739f1caa95778213054375a65288b80f320 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher@gmail.com>
-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
diff --git a/debian/patches/series b/debian/patches/series
index 2772981..1503711 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 100_radeon-6.9.0-bgnr-enable.patch
-102-no-xv-rn50.patch
-103_new_pci_ids.patch

commit caf5bcd7614ffc117f4251ef0f6f418af450bb5b
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Jul 7 20:43:57 2010 +0200

    Prepare changelog for upload

diff --git a/debian/changelog b/debian/changelog
index 9a588c6..c73349f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-ati (1:6.13.1-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.13.1-1) unstable; urgency=low
 
   * New upstream release.
     + Add libudev-dev to build dependencies.
   * Bump Standards-Version to 3.9.0, no changes needed.
 
- -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:43:12 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:43:53 +0200
 
 xserver-xorg-video-ati (1:6.13.0-2) unstable; urgency=medium
 

commit 57214d6d8b9d139e0e5df445ffb272e7dee05ec1
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Jul 7 20:43:50 2010 +0200

    Bump Standards-Version to 3.9.0

diff --git a/debian/changelog b/debian/changelog
index d65baf4..9a588c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-video-ati (1:6.13.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
     + Add libudev-dev to build dependencies.
+  * Bump Standards-Version to 3.9.0, no changes needed.
 
- -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:30:49 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:43:12 +0200
 
 xserver-xorg-video-ati (1:6.13.0-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index aea7288..57cdbf6 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ati
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
 

commit 0075682f7330f35906ab383450b3840e9f77bdbb
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Jul 7 20:31:33 2010 +0200

    Build depend on libudev-dev

diff --git a/debian/changelog b/debian/changelog
index 04a798e..d65baf4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xserver-xorg-video-ati (1:6.13.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + Add libudev-dev to build dependencies.
 
- -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:20:48 +0200
+ -- Brice Goglin <bgoglin@debian.org>  Wed, 07 Jul 2010 20:30:49 +0200
 
 xserver-xorg-video-ati (1:6.13.0-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index dd9ff44..aea7288 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
  libdrm-dev (>= 2.4.17) [!hurd-i386],
  x11proto-dri2-dev,
  x11proto-xf86dri-dev,
+ libudev-dev,
  dpkg-dev (>= 1.14.17),
  automake,
  libtool,

commit 25daf9b51c899ef9366fff5c18275e1c881daf10
Author: Brice Goglin <bgoglin@debian.org>
Date:   Wed Jul 7 20:21:11 2010 +0200

    New upstream release

diff --git a/ChangeLog b/ChangeLog
index d798dd2..e66c79d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,676 @@
+commit ad999e633ff41d27eed9d2c6535e163a7181b0bd
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed Jul 7 10:49:22 2010 +1000
+
+    set version for release
+
+commit 37b348059b1c15d7b381cd3df3db52bd9ee6613e
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jun 30 12:56:48 2010 -0400
+
+    remove rv100 quirk
+    
+    Some RV100 cards with 2 VGA ports show up with DVI+VGA, however
+    some boards with DVI+VGA have the same subsystem ids. Better
+    to have a VGA port show up as DVI than having a non-useable
+    DVI port.
+    
+    reported by DHR in irc.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit c8ea942bd0e9d1c055d50b94440aa4dae425f20b
+Author: Cooper Yuan <cooperyuan@gmail.com>
+Date:   Tue Jun 29 20:34:57 2010 +0800
+
+    Remove HDP_SOFT_RESET function, there is no need to reset HDP block.
+    
+    This commit can fix an issue reported on DELL server, system gets hang
+    during soft resetting while another application tries to access PCI
+    configuration space.
+
+commit 139b38bf67ec10d876cc56df833541d497ae4fa4
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Jun 24 14:55:09 2010 -0400
+
+    r6xx shader: use ADDR() for CF_DWORD0
+    
+    no change in functionality
+
+commit 801e83227a59a29eea425ea612083bbf2b536c30
+Author: Wolfram <bugzilla1@malloc.de>
+Date:   Mon Jun 21 18:59:19 2010 -0400
+
+    r6xx/r7xx: fix ums cmd buffer leak
+    
+    Fixes:
+    https://bugs.freedesktop.org/show_bug.cgi?id=27957
+
+commit b13d719080b75fc6db4d15d2d323b8fce8b7ad06
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Mon Jun 21 18:49:44 2010 -0400
+
+    r6xx/r7xx: fix miscount in state emit
+
+commit c3c5c8e2cc91b51a24effdffb85281216eed731d
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Mon Jun 21 14:30:17 2010 -0400
+
+    r6xx/r7xx accel: add back some additional default state
+    
+    This adds back everything removed in c29157bbf5b0dd26857675282ab094082fbaed0d
+    except CB_FOG_*, CB_CLEAR_* and the VPORT transforms.  Those shouldn't
+    be needed as we aren't using fog or viewport transforms.  We probably don't
+    need all the state that was added back either but I can't reproduce any
+    problems here, so it's hard to say which parts are problematic.
+    
+    Should fix:
+    https://bugs.freedesktop.org/show_bug.cgi?id=28629
+    and several corruption reports on #radeon.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 800cb2088fec698d0626063a9ab198ff534938c0
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Mon Jun 21 08:15:14 2010 +0200
+
+    DRI2: Fix up confusion between windows and pixmaps.
+    
+    Fixes crashes with xserver master, where looking up a pixmap private on a
+    window no longer happens to work.
+
+commit f7a91ece264af9f3fd2fc18e99aefcda93ce9f5c
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Mon Jun 14 08:52:16 2010 +0200
+
+    Convert x(c)alloc/xfree to m/calloc/free.
+    
+    Fixes deprecation warnings with xserver master and should also work with older
+    xservers.
+
+commit ea37d24b1b6d4cbcf73e680846de25b72af216e3
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Jun 21 13:55:15 2010 +1000
+
+    radeon: fix support for 1.9 server master.
+    
+    This moves pixmap and mode set into CSR where its allowed. Should work fine on
+    old servers also.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit fdd8ecafd054f65842351aee6ee6fba7af6613b2
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jun 16 19:02:10 2010 -0400
+
+    r6xx/r7xx: macro safety fixes
+
+commit 4651d77211b508cb6b76931807780e317f232220
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jun 16 12:28:36 2010 -0400
+
+    radeon: fix depth 16 with ums
+    
+    Fixes:
+    https://bugs.freedesktop.org/show_bug.cgi?id=28494
+    https://bugzilla.redhat.com/show_bug.cgi?id=554967
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 1e1d6a515428b6884fea586d180346fc74ef75a1
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed Jun 16 12:20:03 2010 -0400
+
+    r3xx-r5xx Xv: disable bicubic filtering by default
+    
+    - makes Xv more consistent with r1xx/r2xx/r6xx/r7xx
+    - Xv attributes like brightness, contrast, hue, etc. only work
+    when bicubic is disabled.
+    - avoids performance issues on some systems when sampling from textures
+    in GART with kms.
+    - It can be re-enabled with using xvattr
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit c29157bbf5b0dd26857675282ab094082fbaed0d
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue Jun 15 19:39:42 2010 -0400
+
+    r6xx/r7xx: remove unnecessary state emit
+    
+    No need to emit state that doesn't impact that we use for EXA/Xv.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 35280545fcfb911f189d7657bd1040a28450fe7b
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue Jun 15 19:21:32 2010 -0400
+
+    r6xx/r7xx: reorg default and clipping state emit
+    
+    Group ordered registers to save command buffer space.
+    Reduces the default and clipping state from 256 to 160 dwords.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit a2528a734c1d4e8639c49e5d222e3630a93ffbfd
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue Jun 15 17:00:34 2010 -0400
+
+    r6xx/r7xx accel: remove some duplicate emits and minor clean up
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 5f093357f18eb9bea641394ab86a92a1766d8f2e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date:   Sat Jun 12 15:11:46 2010 -0400
+
+    COPYING: replace stub file with actual copyright notices
+    
+    Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0c2118586d3edeecc2473b5d685472df4b5e70fa
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 11 15:53:18 2010 +1000
+
+    radeon: fixup last fix, use CURSOR_WIDTH not RADEON_CURSOR_WIDTH.
+
+commit 9a117f768cb8261327fd3c324da9c98875785cc1
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 11 14:28:24 2010 +1000
+
+    radeon: set proper stride for cursor in tiling flags.
+    
+    definitely incorrect, but hope it doesn't break anything.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit b6346ede94f0d0b11ee04770cf52508cb0a5e6c6
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu Jun 10 20:13:58 2010 -0400
+
+    drmmode: fix big endian issue with properties.
+    
+    On a power machine with an rn50, this was causing load detection to be turned off after the first X run, subsequent X runs would find nothing connected.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 1971dc6d758dea13b9fb6d1c8f516c165628b5e5
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue Jun 8 11:18:28 2010 -0400
+
+    radeon: fix rn50 cloning with kms
+    
+    Since they only have one crtc sometimes the xserver doesn't assign
+    a crtc to one of the outputs even though both outputs have common modes
+    which results in only one monitor being enabled. Assign a crtc in
+    preinit so that both outputs light up.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 426114b4a99d37b394efe3336968bb0ab9b6e9ae
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue Jun 8 11:34:35 2010 +1000
+
+    xv: fix Xv on M6/RV100 under KMS.
+    
+    pRADEONEnt->HasCRTC2 wasn't setup under KMS.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit f64bf0de8e2de7c1bf9cc0c614603dd23c9060ad
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Jun 3 14:48:21 2010 -0400
+
+    evergreen: explicitly disable accel on evergreen
+    
+    Previously we relied on the drm not having accel enabled
+    to make sure evergreen used shadowfb, now we when we enable
+    accel in the drm, we need to make sure the ddx doesn't try
+    and use it until it's implemented.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 428125c095b18c2a2864c1aef24ac0f384b6be54
+Author: Marek Olšák <maraeo@gmail.com>
+Date:   Sun May 16 20:11:17 2010 +0000
+
+    r3xx-r5xx: enable color tiling by default on KMS
+    
+    Signed-off-by: Marek Olšák <maraeo@gmail.com>
+
+commit 6712ce4f4715c8ce7c2fcddb52ca9b103bdd634c
+Author: Marek Olšák <maraeo@gmail.com>
+Date:   Sun May 16 20:09:31 2010 +0000
+
+    rs740: follow macro-switch too
+    
+    Signed-off-by: Marek Olšák <maraeo@gmail.com>
+
+commit 842fa162e9d3bbad2bc44d3732bbc8e5a54402ea
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue May 18 11:21:01 2010 -0400
+
+    dri2: use radeon_pick_best_crtc()
+    
+    It's already exposed and used by exa and Xv and has
+    the same functionality.  radeon_covering_crtc() can
+    be dropped eventually.
+
+commit 64e6858aaf5d0e39ecc9f9804689012f3a38660a
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Mon May 17 12:50:44 2010 -0400
+
+    r2xx exa: fix typo in 27c3326863deae36bc35e2c3b73fffd400208ff1
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 27c3326863deae36bc35e2c3b73fffd400208ff1
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Mon May 17 09:53:32 2010 -0400
+
+    r1xx/r2xx EXA: handle RepeatNone properly with transforms
+    
+    Fallback with unsupported ops like r3xx, r6xx.
+    
+    Should fix fdo bug 28142.
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 30591320ec46e491ba20904cc64f3405b51c6505
+Author: Jerome Glisse <jglisse@redhat.com>
+Date:   Fri May 7 17:35:09 2010 +0200
+
+    kms: add support for the MSC swap & sync API
+    
+    This patch is mostly a port over of Intel ddx code for
+    MSC support. It needs a radeon KMS module with version
+    2.4 which has the query for hw crtc id.
+    
+    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+
+commit 766024dcc61c83490540910ce752f9bfe6dddba4
+Author: Marek Olšák <maraeo@gmail.com>
+Date:   Mon May 3 22:56:27 2010 +0200
+
+    r3xx-r5xx: fix texturing with small macrotiled pixmaps
+    
+    Pixmaps smaller than a macrotile cannot be used as textures because hardware
+    automatically switches to macro-linear and therefore sampled pixels are
+    messed up. This behavior is known as MACRO_SWITCH.
+    
+    The only sane workaround seems to be not using macrotiling for small pixmaps.
+    
+    The function RADEONMacroSwitch has been ported from r300g and implements
+    MACRO_SWITCH the same way it's implemented in hardware. It's been well tested
+    in r300g.
+    
+    This commit also fixes blit-based framebuffer reads, which are used for tiled
+    surfaces in r300g, when ColorTiling is enabled.
+    
+    Signed-off-by: Marek Olšák <maraeo@gmail.com>
+
+commit 6aedd57f6c2f08d0151a8bd1c5893d40d3db709a
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue May 4 14:30:52 2010 -0400
+
+    radeon: fix pll_out_min default for pre-avivo
+    
+    Fixes fdo bug 27960
+
+commit b2ecd1bb507ed4e0d9ba6ebd498c51da2e8136fa
+Author: Michel Dänzer <daenzer@vmware.com>
+Date:   Fri Apr 23 18:28:22 2010 +0200
+
+    FB/MMIO_cnt should be ints, not pointers.
+    
+    Pointed out by compiler warnings.
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=27817
+
+commit 1ad41054989f7c3edec373ccf09dceda6d7c94b4
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Apr 22 16:48:21 2010 -0400
+
+    r3xx: fix gb pipe setup for SE cards
+    
+    Noticed by Tormod Volden
+
+commit 59e287d7c484b4addd4a06d013670577639c7ae2
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Apr 22 02:05:40 2010 -0400
+
+    r3xx-r5xx: fix vertex units
+    
+    Noticed by Tormod Volden.
+    
+    RV3xx is 2, RV560,RV570 is 8
+
+commit 2a6b409496f26da0436972b5feae6ea035dde08d
+Author: Owain Ainsworth <zerooa@googlemail.com>
+Date:   Mon Apr 19 14:37:33 2010 +0100
+
+    Reference count shared driver mappings.
+    
+    With MMIO it wasn't *such* a bit deal if we leaked the smallish mapping.
+    with FB it could be a larger deal. So instead of worrying about this,
+    reference count the mappings in the entity structure and unmap them when
+    no one cares anymore.
+    
+    Prompted by a discussion with airlied
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 761f0de5556e46f166280476185977f720efe586
+Author: Owain G. Ainsworth <zerooa@googlemail.com>
+Date:   Mon Apr 19 04:05:36 2010 +0100
+
+    Make consistent use of fbOffset and share fb mappings.
+    
+    What we were doing previously was mapping the framebuffer for zaphod for
+    only this driver instances chunk, however, fbOffset was (rightly) set to
+    the offset into the whole framebuffer we were using.
+    
+    Since in some cases we did operations on the FB virtual address +
+    fbOffset (for example zeroing the framebuffer on entervt) we were
+    actually pissing all over ourselves in those cases.
+    
+    Fix this by implementing shared fb mappings like we do for MMIO already,
+    and whenever we wish to refer to our area of FB space we always use
+    fbOffset. Fixes zaphod for some users on r600 chipsets, my 4870 is still
+    behaving strangely on screen 0, but I suspect that is another bug.
+    
+    Once calculation (in PreInitAccel) is now wrong because of this, however
+    dri on zaphod does now happen so this is irrelavent, add a comment to
+    that effect.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 2059d628c5fb03222a62502cc1b5724bf296a7b3
+Author: Owain G. Ainsworth <zerooa@googlemail.com>
+Date:   Mon Apr 19 04:05:35 2010 +0100
+
+    Kill per-context SAREA support.
+    
+    It has never been used, and since the world is changing it almost
+    certainly never will be. Good riddance.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c4b46f56279cc18c8114235ca41cfb41ffede67f
+Author: Owain G. Ainsworth <zerooa@googlemail.com>
+Date:   Mon Apr 19 04:05:34 2010 +0100
+
+    Remove remnants of the ShowCache option.
+    
+    The rest of it died a long time ago.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 03b34c5fb12c4df180d4df113d2b654f6afd7230
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Apr 19 17:58:07 2010 +1000
+
+    radeon: add FireMV 2400 pci id.
+    
+    From RH#581927 - thanks to Carsten Clasohm
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 6c07816025f70e522986614c29c300ea13e5d932
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Fri Apr 16 18:50:17 2010 -0400
+
+    r5xx texvid: deal with large numbers of verts
+    
+    should fix fdo bug 25884
+
+commit 5ee320a6b1b4c65fe592c8ac4d1981799242d59e
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Fri Apr 16 18:42:56 2010 -0400
+
+    r3xx texvid: deal with large numbers of verts
+    
+    should fix fdo bug 25884
+
+commit 47af3f4f266232517486238917d82fc5ca9c82e6
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Fri Apr 16 20:50:18 2010 -0400
+


Reply to: