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

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



 ChangeLog                                |  762 +++
 configure.ac                             |  167 
 debian/changelog                         |   14 
 debian/control                           |    4 
 debian/xserver-xorg-video-radeon.install |    1 
 man/radeon.man                           |  511 --
 src/AtomBios/CD_Operations.c             |  983 ----
 src/AtomBios/Decoder.c                   |  258 -
 src/AtomBios/hwserv_drv.c                |  354 -
 src/AtomBios/includes/CD_Common_Types.h  |  172 
 src/AtomBios/includes/CD_Definitions.h   |   50 
 src/AtomBios/includes/CD_Opcodes.h       |  181 
 src/AtomBios/includes/CD_Structs.h       |  486 --
 src/AtomBios/includes/CD_binding.h       |   46 
 src/AtomBios/includes/CD_hw_services.h   |  318 -
 src/AtomBios/includes/Decoder.h          |  107 
 src/AtomBios/includes/ObjectID.h         |  643 ---
 src/AtomBios/includes/atombios.h         | 6137 -----------------------------
 src/AtomBios/includes/regsdef.h          |   25 
 src/Makefile.am                          |   94 
 src/ati_pciids_gen.h                     |   62 
 src/atombios_crtc.c                      | 1541 -------
 src/atombios_output.c                    | 2775 -------------
 src/cayman_accel.c                       |    3 
 src/cayman_shader.c                      |   40 
 src/compat-api.h                         |   94 
 src/drmmode_display.c                    |  134 
 src/drmmode_display.h                    |    6 
 src/evergreen_accel.c                    |   39 
 src/evergreen_exa.c                      |   75 
 src/evergreen_shader.c                   |   40 
 src/evergreen_state.h                    |    4 
 src/evergreen_textured_videofuncs.c      |   79 
 src/generic_bus.h                        |   36 
 src/legacy_crtc.c                        | 1898 ---------
 src/legacy_output.c                      | 2102 ----------
 src/pcidb/ati_pciids.csv                 |   62 
 src/pcidb/parse_pci_ids.pl               |    4 
 src/r600_exa.c                           |  740 ---
 src/r600_shader.c                        |   34 
 src/r600_state.h                         |  136 
 src/r600_textured_videofuncs.c           |  125 
 src/r6xx_accel.c                         |  720 +--
 src/radeon.h                             | 1244 ------
 src/radeon_accel.c                       | 2021 +++------
 src/radeon_accelfuncs.c                  | 1385 ------
 src/radeon_atombios.c                    | 3019 --------------
 src/radeon_atombios.h                    |  292 -
 src/radeon_atomwrapper.c                 |  102 
 src/radeon_atomwrapper.h                 |   31 
 src/radeon_bios.c                        | 2052 ---------
 src/radeon_bo_helper.c                   |  177 
 src/radeon_bo_helper.h                   |   31 
 src/radeon_chipinfo_gen.h                |   62 
 src/radeon_chipset_gen.h                 |   64 
 src/radeon_commonfuncs.c                 | 1037 -----
 src/radeon_crtc.c                        | 1128 -----
 src/radeon_cursor.c                      |  449 --
 src/radeon_dri.c                         | 2347 -----------
 src/radeon_dri.h                         |   91 
 src/radeon_dri2.c                        |  288 -
 src/radeon_dri2.h                        |   46 
 src/radeon_driver.c                      | 6415 -------------------------------
 src/radeon_dummy_bufmgr.h                |   62 
 src/radeon_exa.c                         |  543 --
 src/radeon_exa_funcs.c                   |  510 --
 src/radeon_exa_render.c                  |  611 +-
 src/radeon_exa_shared.c                  |   93 
 src/radeon_exa_shared.h                  |    2 
 src/radeon_glamor.c                      |  350 +
 src/radeon_glamor.h                      |   98 
 src/radeon_glamor_wrappers.c             | 1870 +++++++++
 src/radeon_glamor_wrappers.h             |  179 
 src/radeon_kms.c                         |  458 +-
 src/radeon_legacy_memory.c               |  143 
 src/radeon_macros.h                      |  209 -
 src/radeon_mm_i2c.c                      |  642 ---
 src/radeon_modes.c                       |  542 --
 src/radeon_output.c                      | 3135 ---------------
 src/radeon_pci_chipset_gen.h             |   64 
 src/radeon_pci_device_match_gen.h        |   62 
 src/radeon_pm.c                          |  886 ----
 src/radeon_probe.c                       |   68 
 src/radeon_probe.h                       |  667 ---
 src/radeon_render.c                      | 1060 -----
 src/radeon_textured_video.c              |  390 -
 src/radeon_textured_videofuncs.c         | 1838 +++-----
 src/radeon_tv.c                          | 1283 ------
 src/radeon_tv.h                          |   62 
 src/radeon_vbo.c                         |    3 
 src/radeon_vbo.h                         |   10 
 src/radeon_version.h                     |    1 
 src/radeon_video.c                       | 3826 ------------------
 src/radeon_video.h                       |   85 
 src/radeon_vip.c                         |  362 -
 src/radeon_xvmc.c                        |    5 
 src/theatre.c                            | 2211 ----------
 src/theatre.h                            |   71 
 src/theatre200.c                         | 2275 ----------
 src/theatre200.h                         |  140 
 src/theatre200_module.c                  |   33 
 src/theatre_detect.c                     |  130 
 src/theatre_detect.h                     |   46 
 src/theatre_detect_module.c              |   37 
 src/theatre_module.c                     |   33 
 src/theatre_reg.h                        |  876 ----
 106 files changed, 7696 insertions(+), 62618 deletions(-)

New commits:
commit 7e4f07f3490372aaa85f710563884c3e698dab4a
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 15:33:07 2012 +0200

    bump changelog

diff --git a/ChangeLog b/ChangeLog
index db00375..c9af4a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,765 @@
+commit 6ef1ad6a46348d3aecd8d1f5e94431ca2298853c
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Fri Jul 13 11:15:25 2012 +0200
+
+    Deal more gracefully with DRI2 being unavailable at build or run time.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit ef8a404391036d8aa814dbda2407c789b8a64b92
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Thu Jul 5 20:14:48 2012 +0200
+
+    Initial SI support.
+    
+    Defaults to shadowfb. 3D acceleration is available with glamor. 2D
+    acceleration is disabled until the radeonsi driver can handle glamor's
+    shaders.
+    
+    v2: add chip flags (Alex Deucher)
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit e9edd2f5002c642b59f028b3ec076d604ae8ce9d
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jun 20 08:40:07 2012 +0200
+
+    Initial glamor support.
+    
+    Enable at build time with --enable-glamor and runtime with
+    
+    	Option	"AccelMethod" "glamor"
+    
+    The most notable lack of functionality is XVideo. Use something like VDPAU for
+    now.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 9eac8021f3d33a63156f9f5d43a220e88bb3f8db
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jun 27 14:48:47 2012 +0200
+
+    EXA: Factor out pixmap BO allocation into a helper function.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 060c7836e7f7777bacca4e23f57c5985beab33bc
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jul 4 11:49:18 2012 +0200
+
+    Some cosmetic fixups for the radeon manpage.
+    
+    ATI -> ATI/AMD
+    PCIE -> PCIe
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit c3a9f64fe40c78331b9340c3832d344f38b11564
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jul 4 11:46:30 2012 +0200
+
+    Drop UMS specific parts from the radeon manpage.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 5ebebfdb4fadada157d1369f35a8610c0fa72e02
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 15:03:43 2012 +0100
+
+    radeon: fix conflict with fix in master.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit ff12ddf613ad42e4566d6e10fc6cf33a4e445736
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 15:00:44 2012 +0100
+
+    configure: bump to 6.99.99
+    
+    this is in prep for 7.0 release.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 50689ec8dbd4a68527b2ac16cecac298b8d441d0
+Merge: 6a60fcd ae682a6
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 14:59:47 2012 +0100
+
+    Merge remote-tracking branch 'origin/kms-only'
+    
+    This merges the removal of the UMS code and subsequent simplifications.
+    
+    Hell yes.
+    
+    * origin/kms-only: (24 commits)
+      radeon: fix radeonchipsets properly
+      radeon: fix RADEONChipsets
+      radeon: migrate remainder of radeon_driver.c to rest of driver
+      radeon: avoid including large static struct twice.
+      radeon: drop some more unused macros/inlines
+      radeon: drop another unused struct member.
+      radeon: more unused stuff
+      radeon: drop cardType shouldn't matter to userspace.
+      radeon: drop radeonGetPixmapOffset
+      radeon: move more functions into texture video
+      radeon: drop legacy memory, merge into radeon video
+      radeon: drop unused txoffset vars.
+      radeon: drop vb_mc_addr, not needed anymore
+      radeon: drop offset member of r600 accel object
+      radeon: move macros into radeon.h
+      radeon: drop more wrapper macros.
+      radeon: further macro cleanups.
+      radeon: make exa copy funcs static.
+      radeon: drop FUNC_NAME macro and ONCE_ONLY stuff
+      radeon: drop radeon_commonfuncs.
+      ...
+    
+    Conflicts:
+    	configure.ac
+
+commit 6a60fcdf060a0f553d8d4f7939c2a05aa04bedfa
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 14:57:58 2012 +0100
+
+    configure: bump version after release.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 008eb209d506ed7195fd544dfa91be9783946fd5
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 14:46:55 2012 +0100
+
+    configure: bump version number to 6.14.6 pre-release
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 72fea2635a56c4f572c07fc50fc58f703a21eb4f
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 29 14:46:17 2012 +0100
+
+    radeon: require libdrm 2.4.36 for KMS support.
+    
+    This is due to some commits to the surface manager that fix bugs.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 179b035835bfa99283d44ba2d5ee17e686196535
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jun 27 19:26:51 2012 +0200
+
+    Fix up displayWidth vs. virtualX confusion in radeon_setup_kernel_mem().
+    
+    It was using the pitch (displayWidth) for the virtual width (virtualX). This
+    prevented using page flipping in some cases, as displayWidth was already
+    overaligned for virtualX, so the DRI2 front and back buffers ended up having
+    a different pitch.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+    Reviewed-by: Jerome Glisse <jglisse@redhat.com>
+
+commit 5dc5012320536f7b1e86a81ed3b823e3626828e1
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Jun 25 09:23:04 2012 +0100
+
+    radeon: dixPrivateKeyRegistered is only in server 1.9
+    
+    just fallback to the old behaviour on older servers.
+    
+    should fix: https://bugs.freedesktop.org/show_bug.cgi?id=51388
+    Review-over-irc: Michel Dänzer <michel.daenzer@amd.com>
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit ae682a6a1781ab023ab36e3154d6b3e88da63d64
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Jun 18 13:11:31 2012 +0100
+
+    radeon: fix radeonchipsets properly
+
+commit 6514bcdc0fc199b4f3a8b4273bd29e0fe255d232
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Mon Jun 18 13:02:03 2012 +0100
+
+    radeon: fix RADEONChipsets
+    
+    reported on irc by okias.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit dd4ab5aba9047d522dbcfe8a341c368312e1a471
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Sat Jun 16 08:47:32 2012 +0100
+
+    radeon: migrate remainder of radeon_driver.c to rest of driver
+    
+    This helps make a few more things static and the driver generally
+    smaller.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit a19237fad2492d70777167c631f4e6e1fae0e908
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Sat Jun 16 08:19:35 2012 +0100
+
+    radeon: avoid including large static struct twice.
+    
+    Just extern this in the one file that needs access.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c8a5c5a0dd9adc46b03b898c9c1719dbbde05ba1
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 19:52:14 2012 +0100
+
+    radeon: drop some more unused macros/inlines
+    
+    These are no longer used anywhere.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 3097f273443b5b8fce097e2b1e09a17b02d06a40
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 19:45:15 2012 +0100
+
+    radeon: drop another unused struct member.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit cb97e75acab84b67b7b7358860788638efc9b344
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 19:38:45 2012 +0100
+
+    radeon: more unused stuff
+    
+    Remove all CurrentLayout stuff.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 81593e7deb688fa3108a0589c1418459ec0df4de
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 18:52:52 2012 +0100
+
+    radeon: drop cardType shouldn't matter to userspace.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 997b0dddfeb180043ece5eff0ac0d6a1a751f9b5
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 18:43:01 2012 +0100
+
+    radeon: drop radeonGetPixmapOffset
+    
+    no longer needed.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 639061edb3ac35a24e4d6633c9b6384434dcac64
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 18:38:48 2012 +0100
+
+    radeon: move more functions into texture video
+    
+    make more thing static.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 85711a0a6a553232b603dbbb2b2d234c35391578
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 17:26:50 2012 +0100
+
+    radeon: drop legacy memory, merge into radeon video
+    
+    This merges these two functions into textured video code.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 445ca1d66ce7b37762731fe67407cc1b978bb129
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 17:13:48 2012 +0100
+
+    radeon: drop unused txoffset vars.
+    
+    These vars aren't being used anymore.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 832244de9e6d7aa1b8fbeb29c9a6a86923744d60
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 17:09:00 2012 +0100
+
+    radeon: drop vb_mc_addr, not needed anymore
+    
+    This field is totally unused now, so drop it.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 6559b6e28bf111b64c3aeb5ec1260acfeb3e0b7f
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 17:05:54 2012 +0100
+
+    radeon: drop offset member of r600 accel object
+    
+    This is always 0 now.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 857179e538c9752fab239a21312d0fcc80022151
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:55:23 2012 +0100
+
+    radeon: move macros into radeon.h
+    
+    Drop separate header file, there isn't many separate macros now.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 148e889149f5ecc3dc2473f2a9e01572eeb037d3
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:52:24 2012 +0100
+
+    radeon: drop more wrapper macros.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit ad8629e3323efe484dd1421d94dd934e1bfafe56
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:49:13 2012 +0100
+
+    radeon: further macro cleanups.
+    
+    drop some more of the wrapper macros.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 96644f96f1a2df1d7d1ca8cbdc9a105affdb4f32
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:34:53 2012 +0100
+
+    radeon: make exa copy funcs static.
+    
+    These are no longer used outside this area.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 83904b820b81d226940ec6d663246f243f92e7ba
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:30:41 2012 +0100
+
+    radeon: drop FUNC_NAME macro and ONCE_ONLY stuff
+    
+    Drop all the CP vs MMIO macros that name functions.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit b422d8085aab4e01a1ac4ffb247c73fe51aafa0d
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:14:54 2012 +0100
+
+    radeon: drop radeon_commonfuncs.
+    
+    modify all the macros and drop it into radeon_accel.c
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 29dd3f84eecd2892a438f004403521de8986a91d
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:11:03 2012 +0100
+
+    radeon: misc cleanups.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 678c1f3425c0fa7e98795c8e351da77d04652e02
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:06:27 2012 +0100
+
+    make pci chipsets static
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 95cbbe999418c72dc407069d31e759d70f49ab16
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 16:01:53 2012 +0100
+
+    drop RING_LOCALS/ACCEL_PREAMBLE
+    
+    these were unused now.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 18d5ae3bd9075ac1a2ee21b071ac133e2e634b62
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 15 10:05:03 2012 +0100
+
+    radeon: drop all UMS/DRI1/XAA/overlay support.
+    
+    This overhauls the radeon driver and removes all the old UMS-only code,
+    it drops all the UMS, DRI1, XAA, overlay Xv, video capture, tv tuners
+    
+    There are probably a lot more cleanups that will fall out of this afterwards.
+    
+    So far this is compile/build tested.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 248e912c487636d7352cfad43c03fc9f19fc2215
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Fri Jun 8 12:18:48 2012 +0200
+
+    UMS: Fix CRTC DPMS state check.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 58883711136fa6671d4f3250d4ee973e2953ebb4
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Jun 7 11:47:21 2012 -0400
+
+    configure: bump version post release
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 3a9103f855c67bbcd7b97ee2e96836353e0d789d
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Jun 7 11:27:08 2012 -0400
+
+    configure: bump for release
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit f1693ee09e9b251eb75e3e5fe0ee7699fec6fb98
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Jun 7 11:23:31 2012 -0400
+
+    configure: bump libdrm_radeon requirement
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 77a056c1725c9c44a328ed324687bdf35144e9e2
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jun 6 12:29:37 2012 +0200
+
+    Don't page-flip or wait on a CRTC while we're VT-switched away.
+    
+    We don't know what the CRTC state is.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 1d9f1eb7e65c57c52759ccbfa51e8bdd5a10acac
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed Jun 6 12:16:08 2012 +0200
+
+    Don't wait on a CRTC which has been disabled via DPMS (bug #49761).
+    
+    Fixes https://bugs.freedesktop.org/show_bug.cgi?id=49761 .
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 4603285aa8efaf2614f15a38254465cec2075f11
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Tue Jun 5 09:48:59 2012 -0400
+
+    radeon: add new PCI ids
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 9307609420b4b209767d2057b4803bcb16cc1455
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Sat Jun 2 17:16:34 2012 +0100
+
+    radeon: improve smooth startup fallbacks.
+    
+    If we can't handover the framebuffer, memset it to black.
+    
+    mostly ported from nouveau.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 89a4c79a43a2b6963e41d7812e8fe5beedb556af
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Sat Jun 2 17:14:14 2012 +0100
+
+    radeon: fix smooth startup with tiling enabled.
+    
+    We need to use the surface we worked out when we allocated the front bo,
+    not work out a new surface from scratch.
+    
+    This fixes smooth handover from plymouth to gdm on F17.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c1b9b2c9d71a87a0b98ccdb542da8a30c8c4d99a
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 1 12:22:06 2012 +0100
+
+    radeon: fix compat api for newest planned API.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 68c51d148b22ee8cbe98b5d5441e3494804ee808
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Fri Jun 1 12:21:34 2012 +0100
+
+    drmmode: drop flags arg to adjust frame.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit b1e9c3081d2b975682a62389aa29063b79f9655c
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu May 24 17:54:41 2012 +0100
+
+    radeon: move include down further
+    
+    fixes tinderbox build.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 5ed959585f35a4eff2cd803ae222b46d164f210d
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu May 24 08:17:11 2012 +0100
+
+    radeon: update compat-api.h for block handler + enable/disable fb.
+    
+    This updates the compat stuff for the latest block handler code,
+    and the enable/disable interface.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 2de17efdcb502f91fb145130c12be3cb164f03c5
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu May 24 08:16:39 2012 +0100
+
+    radeon/xvmc: fix build with new API.
+    
+    This was missing the compat include.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit a1f47768309aa8b14b13f05ba01bb490024c4cbc
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Thu May 24 07:55:14 2012 +0100
+
+    radeon: fix a few more RHDAtomBiosFunc uses
+    
+    I missed these in my initial search/replace for some reason.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit c26e40cf60eb6a2bffb5ec7cba1f1bbffcbf1d53
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 23 12:12:54 2012 +0100
+
+    radeon/atombios: rewrite atombios parser code to not use xf86Screens.
+    
+    Just pass the ScrnInfoPtr around instead.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 14122214edabd2a574b66577289a7c8732f4e953
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 23 11:57:35 2012 +0100
+
+    radeon/generic_bus: stop passing scrnIndex
+    
+    Just pass a pointer to the screen, removes usage of xf86Screens lookup
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 2101e485480e3ffd6a17ed12f5287b8b1e4e0223
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Tue May 22 16:17:55 2012 +0100
+
+    compat for new server API
+
+commit 9d2549057ffced996bfaeb8df4901ef57da636c7
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 16 15:45:53 2012 +0100
+
+    ati: convert to new screen conversion APIs
+    
+    The compat header takes care of the old server vs new server.
+    
+    this commit was autogenerated from util/modular/x-driver-screen-scrn-conv.sh
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 80a45bfc26e20d1d481f13cb15c0720d165a8306
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 16 15:42:59 2012 +0100
+
+    radeon: add compat-api.h
+
+commit 84c3900b5179a8d2cc5f925e94ed5b2bbdee1ad9
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed May 23 08:49:45 2012 +0100
+
+    radeon/xaa: drop scrnIndex parameter to some functions
+    
+    This isn't needed, and makes api changes later easier.
+    
+    Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 3fb694b308ebadd1b849836059b6b56bb19385f7
+Author: Thierry Vignaud <thierry.vignaud@gmail.com>
+Date:   Wed May 16 14:43:53 2012 +0200
+
+    UMS/EXA: Add reminder for potential solid picture performance issue.
+
+commit 4b9bad959438725e4434e2aa4f142542d8dcc260
+Author: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
+Date:   Fri May 11 05:25:32 2012 +0200
+
+    radeon: use GB_GR and BG_RG formats for packed yuv video for r600+
+    
+    Those formats were invented for exactly that purpose so use them.
+    This saves some code and also some hw resources (only need one
+    sampler instead of two for packed yuv).
+    Only tested on EG.
+
+commit 37786e9027b8c8d1f9ec9928915784dd28853766
+Author: Roland Scheidegger <rscheidegger_lists@hispeed.ch>
+Date:   Fri May 11 05:25:33 2012 +0200
+
+    radeon: avoid rounding errors in texture coords for textured xv on EG+
+    
+    make sure the division is done with floats, otherwise the coordinate
+    can be wrong up to 1 texel.
+    Particularly visible with clipping and small source scaled up (since one
+    texel can be a shift of several pixels) but could be seen even unscaled.
+    Should provide more accurate coords without clipping too depending on the
+    scale factor probably.
+    This is a straight port of 688c8a54a00b01e73a11970ad2abe858f8c7c5c4
+    when I apparently forgot the eg code...
+
+commit faea3aafa8c9a7c1bc866ffcd847972c5569c8bc
+Author: Anisse Astier <anisse@astier.eu>
+Date:   Thu May 10 17:22:59 2012 +0200
+
+    Fail more gracefully when drm surface manager can't be initialized
+    
+    Should make bugs like https://bugs.freedesktop.org/show_bug.cgi?id=48138
+    easier to diagnose.
+    
+    [ Michel Dänzer: Appended newline to error message. ]
+    
+    Signed-off-by: Anisse Astier <anisse@astier.eu>
+    Singed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit b0b7d8d26fd107df342b5c87b0a38e5bb08101a9
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Wed May 9 11:08:49 2012 +0200
+
+    EXA/UMS: Synchronize to the GPU before writing solid colour to scratch pixmap.
+    
+    UMS doesn't do this automagically. It's a big hammer that will probably suck
+    for performance, but I don't have any better ideas right now.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 6bda7ceda645e838723883d133d614def1511d16
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Thu May 3 15:07:30 2012 +0200
+
+    EXA: Attempt to fix solid picture acceleration with UMS.
+    
+    Only compile tested, but should fix
+    https://bugs.freedesktop.org/show_bug.cgi?id=49182 .
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit b33cf9cf9dce5add8aaccab10ba5aaa64247c8ce
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Wed May 2 09:55:16 2012 -0400
+
+    radeon: add MacModel entry for SAM440ep embedded board
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
+commit 0bda305f7ab2a4720b3fea3f318ab2a73be151e5
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date:   Fri Apr 13 13:28:10 2012 -0400
+
+    EXA: Support acceleration of solid pictures on R2xx.
+    
+    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit a7754b076e355fef3aea082b6e2d3aefbb8e7a9b
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date:   Fri Apr 13 13:24:46 2012 -0400
+
+    EXA: Support acceleration of solid pictures on R1xx.
+    
+    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit cac2d7ed54918579418fc762558497d3ec547fad
+Author: Alex Deucher <alexander.deucher@amd.com>
+Date:   Sat Apr 14 08:53:39 2012 -0400
+
+    EXA: Support acceleration of solid pictures on Evergreen/NI.
+    
+    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+    Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit d88b9700137ee407c483f263bb55c77cd6f92fef
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Fri Apr 13 09:35:38 2012 +0200
+
+    EXA: Support acceleration of solid pictures on R3xx-R7xx.
+    
+    Allocate 1x1 scratch pixmaps to hold the solid picture colours.
+    
+    This works around https://bugs.freedesktop.org/show_bug.cgi?id=47266 and might
+    improve performance in other cases as well.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit 66b586b9b9cdaf70f0fcd547b5a04f044d848d44
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Mon Apr 16 15:33:36 2012 +0200
+
+    RADEONCopySwap: Fix RADEON_HOST_DATA_SWAP_16BIT case.
+    
+    It was the same code as for RADEON_HOST_DATA_SWAP_32BIT. This caused bus errors
+    on FreeBSD/PPC, but I'm not sure how it could not cause problems anywhere...
+    
+    Reported-by: Andreas Tobler <andreast@fgznet.ch>
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+
+commit 1e656cd5973bbcf85b63406638ede0bccd65e28f
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Mon Apr 16 15:44:01 2012 +0200
+
+    Make radeon_setup_kernel_mem failures more graceful and verbose.
+    
+    So that bugs like https://bugs.freedesktop.org/show_bug.cgi?id=48138 can be
+    diagnosed more easily.
+    
+    Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+
+commit d282719a9c2fb0ee32830aa75b8dfbb9392954ed
+Author: Jerome Glisse <jglisse@redhat.com>
+Date:   Wed Apr 4 17:08:30 2012 -0400
+
+    r6xx-r9xx: force 1D tiling for buffer with height < 64
+    
+    Due to some old kernel issue, height is 8 aligned insided the ddx
+    For buffer with height btw 57 & 63 this lead ddx to believe it can
+    allocate a 2D tiled surface while mesa will not align height and
+    will assume 1D tiled leading to disagreement and rendering issue.
+    This patch force buffer with height < 64 to be 1D tiled.
+    
+    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
+
+commit de2419e5509398328903ca61f4ea80852cba6bc4
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Mar 29 00:28:39 2012 -0400
+
+    configure: bump version post release
+    
+    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
+
 commit 9425c50e93903fb64d9e569cfdc1e2c35d16ce25
 Author: Alex Deucher <alexdeucher@gmail.com>
 Date:   Thu Mar 29 00:19:12 2012 -0400

commit a2f2796b1c1c231c869296107f22f4a61339dfb5
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 15:12:29 2012 +0200

    Require libdrm 2.6.36

diff --git a/debian/changelog b/debian/changelog
index 2218e01..cd3cc18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-ati (1:6.99.99-1) UNRELEASED; urgency=low
 
   * KMS-only release, only works with linux-any now.
   * Bump to build against xserver 1.13rc1
+  * Require libdrm 2.6.36
 
  -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Mon, 16 Jul 2012 14:29:26 +0200
 
diff --git a/debian/control b/debian/control
index e82806f..fb51a82 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  x11proto-fonts-dev,
  x11proto-randr-dev (>= 1.2),
  x11proto-render-dev,
- libdrm-dev (>= 2.4.33) [!hurd-i386],
+ libdrm-dev (>= 2.4.36) [!hurd-i386],
  x11proto-dri2-dev,
  x11proto-xf86dri-dev,
  libudev-dev [linux-any],

commit e836ee5471aadb5166cc8c0f8d0073c29298dc91
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 15:10:11 2012 +0200

    Fix things that are no longer built

diff --git a/debian/xserver-xorg-video-radeon.install b/debian/xserver-xorg-video-radeon.install
index 6b0d0fb..a10d00d 100644
--- a/debian/xserver-xorg-video-radeon.install
+++ b/debian/xserver-xorg-video-radeon.install
@@ -1,3 +1,2 @@
 usr/lib/xorg/modules/drivers/radeon_drv.so
-usr/lib/xorg/modules/multimedia/*.so
 usr/share/man/man4/radeon.4

commit 9ad5d4e3b410cc9664d24685bc4b5a68f9cc5929
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 15:06:26 2012 +0200

    KMS-only release, only works with linux-any now.

diff --git a/debian/changelog b/debian/changelog
index 91e3226..2218e01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xserver-xorg-video-ati (1:6.14.6-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.99.99-1) UNRELEASED; urgency=low
 
-  * New upstream release, last one with UMS support.
+  * KMS-only release, only works with linux-any now.
   * Bump to build against xserver 1.13rc1
 
  -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Mon, 16 Jul 2012 14:29:26 +0200

commit 6dddee56c0ebe9e2042e738cadf5991b2be75cb6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 15:04:21 2012 +0200

    New upstream release, last one with UMS support.

diff --git a/debian/changelog b/debian/changelog
index 1af49cb..91e3226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-video-ati (1:6.14.4-6) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.14.6-1) UNRELEASED; urgency=low
 
+  * New upstream release, last one with UMS support.
   * Bump to build against xserver 1.13rc1
 
  -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Mon, 16 Jul 2012 14:29:26 +0200

commit 73017fe11c9397e52c64f47b76f18bdf582df481
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Mon Jul 16 14:32:02 2012 +0200

    Bump to build against xserver 1.13rc1

diff --git a/debian/changelog b/debian/changelog
index 0d27730..1af49cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.14.4-6) UNRELEASED; urgency=low
+
+  * Bump to build against xserver 1.13rc1
+
+ -- Maarten Lankhorst <maarten.lankhorst@canonical.com>  Mon, 16 Jul 2012 14:29:26 +0200
+
 xserver-xorg-video-ati (1:6.14.4-5) unstable; urgency=low
 
   * Update radeon's long description to list the chips mentioned in the
diff --git a/debian/control b/debian/control
index da9d1cb..e82806f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  dh-autoreconf,
  quilt,
  pkg-config,


Reply to: