Update to 6.12.2. Upstream changelogs:

Changes in 6.12.2:

xf86-video-ati 6.12.2 highlights
- - lots of bug fixes
- - r2xx/r3xx textured video improvements from Roland

Alex Deucher (27):
      bump version post release
      Add new pci ids
      R6xx/R7xx EXA: fix maxPitchBytes
      DCE3.2: use RMX for for non-native modes on DVI
      radeon: add new chip ids
      R4xx ATOM: fix crtc routing for CRT1
      R6xx/R7xx: clean up bool const code
      R6xx/R7xx: clean up logic in EXA Comp PS setup
      R6xx/R7xx EXA: rework composite pixel shader
      radeon: re-enable r/g/b intensity attributes for overlay
      mac mini: fix connector setup regression
      r1xx-r3xx TV: fix white noise
      Mac mini: fix connector setup for real
      mac mini: 3rd time's the charm
      COMBIOS: fix default sclk/mclk from bios
      COMBIS: Clarify case 0 for LCD DDC table
      Unify mc_idle()
      Add PCIE register accessors
      Add RV790 (HD 4890) support
      DCE3/3.2: fix up transmitter/encoder setup
      DCE3/3.2: cleanup dpms after previous changes
      radeon: fix Xv vsync for multi-head
      Fix missing ')' in PCIE macro
      Cast info->sclk to int
      DCE3/3.2: further fixes
      ATOM: code cleanup
      Bump for release

Eduard Fuchs (1):
      Enable byte swapping for r6xx/r7xx Hardware

Roland Scheidegger (4):
      clip fixes
      don't convert planar yuv to packed for r300
      don't convert planar yuv to packed for r200
      fix textured video allocation bug

Changes in 6.12.1:

Fix some fall out from the r6xx/r7xx merge
and fix load detection on avivo chips.

Alex Deucher (9):
      Bump post-release
      radeon: fix typo in bios scratch reg setup
      atom: fix up bios scartch register usage
      Fix fallout from r6xx/r7xx EXA merge in IB handling
      radeon: add another AGP quirk
      AVIVO: Fix dac load detection
      R6xx/R7xx AGP: disable gart data transfers
      ATOM: fix up tv-out support
      bump for release

Fabio (2):
      man page updates
      man page update

Changes in 6.12.0:

Big changes here are EXA and Xv support for
R6xx/R7xx chips.  Requires an updated drm.
Other than that, mostly bug fixes.

Adam Jackson (3):
      output: Allow for multiple DisplayPort outputs.
      Add some more cases to the DVI single-link checks.
      uniphy: start adding DisplayPort setup

Alex Deucher (81):
      Initial R6xx/R7xx EXA and textured video support
      Allow rotation on r6xx/r7xx
      EXA: fix and re-enable Solid() on R7xx
      r6xx/r7xx EXA: cleanup overlapping copy
      R6xx/R7xx EXA: improve overlapping copy performance
      r6xx/r7xx EXA: fix corruption when doing sw access
      Revert "R6xx/R7xx EXA: improve overlapping copy performance"
      R6xx/R7xx EXA: add accelerated UTS/DFS hooks
      Revert "r6xx/r7xx EXA: Optimize overlapping copy"
      R6xx/R7xx EXA: fallback on overlapping blits for now
      R6xx/R7xx EXA: Fix typo in DFS
      R6xx/R7xx Xv: fix typos in cache flushing commands
      R6xx/R7xx UTS: move actual upload to separate function
      R6xx/R7xx Xv: implement native shader for planar formats
      R6xx/R7xx Xv: add accelerated uploads for planar formats
      R6xx/R7xx Xv: fix cache flush buffer size for planar
      R6xx/R7xx: Add checks to make sure we don't overrun VB space
      R6xx/R7xx Xv: Add native support for packed formats
      R6xx/R7xx Xv: add support for packed uploads
      adjust alignment
      R6xx/R7xx: Move engine idle to sync functions
      R6xx/R7xx: be more verbose about what function ran out of VB space
      R6xx/R7xx: handle running out of vertex buffer space
      R6xx/R7xx Xv: switch packed over to Yang's new shader code
      Revert "R6xx/R7xx: handle running out of vertex buffer space"
      R6xx/R7xx EXA: properly handle non repeat cases in the texture setup
      R6xx/R7xx EXA: handle running out of vertex space in the copy path
      R6xx/R7xx: switch to drm for wait for idle
      R6xx/R7xx EXA: switch to surface sync packet
      Bump version post release
      R6xx/R7xx: fixup accel paths
      R6xx/R7xx: reset 3D state after VT switch
      R6xx/R7xx EXA/Xv: properly deal with running out of vertex buffer space
      R6xx/R7xx Xv: fix some missing bits from last commit
      R6xx/R7xx: wait for MC idle when changing the MC
      Fix MC setup on systems with more than 512 MB of VRAM
      R6xx/R7xx: fix up a few more paths
      radeon: one more 32 -> 64 just to be safe
      Don't write new HDP location until we've written the new FB location
      RBBM_GUICNTL is pre-r6xx only
      R6xx/R7xx: add wait for idle MMIO path
      RS600: fix up MC setup
      radeon: re-enable load detection output attribute for TV/CV
      RS600: fix MC addr mask
      R6xx/R7xx EXA: Optimize temp surface for overlapping copies
      R6xx/R7xx EXA: init copy_area to NULL
      R6xx/R7xx EXA: same surface and same coords equals nop
      RS600: enable the DRI by default
      R6xx/R7xx: use shadowfb if DRI is disabled
      DCE3.2: fix up Save()/Restore()
      R300: Add AGP quirk
      Print a message when we have a shared DDC line
      R6xx/R7xx: switch emit functions to macros
      R6xx/R7xx: write vertexes directly to the IB
      R6xx/R7xx: code cleanups
      R6xx/R7xx Xv: combine packed and planar shaders
      R6xx/R7xx EXA: combine composite mask/non-mask VS
      R6xx/R7xx EXA: cleanup composite texture setup
      R6xx/r7xx: remove some unneeded code I missed in the last commit
      Rotation: don't rotate if acceleration is not active
      AVIVO: add aspect scaling mode
      radeon: adjust LVDS so that default modes get added
      Revert "radeon: adjust LVDS so that default modes get added"
      radeon: just add some common modes for LVDS
      ATOM: don't use fixed ref div for LVDS
      RN50: fix up cloning on servers
      R6xx/R7xx: disable XV_BICUBIC attribute
      R6xx/R7xx: wire up DMAForXv option like older asics
      radeon: add a few more default common modes for lvds
      AVIVO: fix panning
      R6xx/r7xx: clarify EXA message
      R4xx: add R4xxATOM option
      radeon: clean more thoroughly in RADEONFreeRec()
      RS600: fix page table size for rs600 as well
      R6xx/r7xx: clarify accel messages
      R6xx/R7xx: return in RADEONWaitForIdleMMIO() if accel is off
      R6xx/R7xx: fix up vline stuff along the lines of previous chips
      R6xx/R7xx: EXA VSync Option not supported yet
      radeon: add support for 30 bit LUTs
      radeon: man page updates
      bump for release

Bryce Harrington (1):
      Quirk for RV280 on 82865G/PE/P DRAM Controller/Host-Hub

Christian Koenig (1):
      R6xx/R7xx: move shaders to r600_shader.c and fixup Xv PS

Cooper Yuan (1):
      radeon: save bios scratch registers in Preinit()

Dave Airlie (3):
      r600: enable DRI by default
      r600: fix sizing of PCI GART table for r600
      r600: reload shaders into VRAM on resume

Mark van Doesburg (1):
      R6xx/R7xx EXA: use a temp surface for overlapping copy

Michel Dänzer (6):
      Fix compile warning when building without EXA.
      Only call RADEONWaitForVLine if it might actually do anything useful.
      EXA: Pass pScrn and info into RadeonCompositeTile.
      EXA: Adapt to EXA changes in xserver Git.
      Revert "EXA: Adapt to EXA changes in xserver Git."
      EXA: Make sure Prepare/FinishAccess hooks can handle
EXA_PREPARE_AUX* indices.

Pierre Ossman (2):
      Fix bad range adjustment in VLINE code.
      Xv vsync support on r6xx/r7xx cards.

Tormod Volden (3):
      Janitor: cosmetic clean-up of AGPMode quirk table
      M9+: Add AGP quirk for Sony Vaio
      RV350: Add AGPMode quirk for Thinkpad

Yang Zhao (5):
      r6xx/r7xx EXA: Optimize overlapping copy
      R6xx/R7xx EXA: Optimize overlapping copy
      R6xx/R7xx Xv: Planar - Properly scale Y'CbCr values before
converting to RGB
      R6xx/R7xx EXA: Further optimizations to overlapping copy
      R6xx/R7xx shader: Fix OFFSET_[XYZ] macro for TEX_DWORD2 to accept floats

root (2):
      atom: Enable DisplayPort source to DVI/HDMI sink
      output: Filter out dual-link modes from DP->DVI connections

???(Yu-yeon Oh) (1):
      radeon_driver.c small memory bug

2 files changed, 6 insertions, 7 deletions

diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index e9bf8c74ad1..497f7ee4881 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2009/06/07 11:24:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2009/06/09 05:35:10 hasso Exp $
 
-DISTNAME=	xf86-video-ati-6.11.0
-PKGREVISION=	1
+DISTNAME=	xf86-video-ati-6.12.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index 098e36f33b3..1d9f92cea48 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/02/25 23:29:11 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/06/09 05:35:10 hasso Exp $
 
-SHA1 (xf86-video-ati-6.11.0.tar.bz2) = fbcba3a7c495e0d08e3a43a05c3277666206ff7b
-RMD160 (xf86-video-ati-6.11.0.tar.bz2) = e8ff02eb3730ea127d2dbafb65138ec73f1044df
-Size (xf86-video-ati-6.11.0.tar.bz2) = 833773 bytes
+SHA1 (xf86-video-ati-6.12.2.tar.bz2) = a09a579ece160e714774d3a54da3e1f2bc48ec36
+RMD160 (xf86-video-ati-6.12.2.tar.bz2) = 79f6be946e121a9a27240f1a6b05b7dce0714a2f
+Size (xf86-video-ati-6.12.2.tar.bz2) = 902480 bytes
 SHA1 (patch-ac) = 605892e355f028d83b5db112f5c68a72bcc5e4b0