Rebased ref, commits from common ancestor:
commit caa6e278b0282b79d549ee2f5876c83486d5e75e
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Mar 27 06:56:34 2011 +0200
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 91d3a4f..3236748 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-video-ati (1:6.14.1-1+exp1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.14.1-1+exp1) experimental; urgency=low
* Rebuild against Xserver 1.10 rc3.
- -- Cyril Brulebois <k...@debian.org> Sun, 27 Mar 2011 06:53:15 +0200
+ -- Cyril Brulebois <k...@debian.org> Sun, 27 Mar 2011 06:56:28 +0200
xserver-xorg-video-ati (1:6.14.1-1) UNRELEASED; urgency=low
commit 01b24773a6d84d14ca6c9ad066993f258dc42ba9
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Mar 27 06:56:08 2011 +0200
Rebuild against Xserver 1.10 rc3.
Do not fake an upload of 1:6.14.1-1 to unstable, which might only happen
once xorg-server 1.9.x reaches testing. So keep both last entries as
UNRELEASED.
diff --git a/debian/changelog b/debian/changelog
index d361ed6..91d3a4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.14.1-1+exp1) UNRELEASED; urgency=low
+
+ * Rebuild against Xserver 1.10 rc3.
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 27 Mar 2011 06:53:15 +0200
+
xserver-xorg-video-ati (1:6.14.1-1) UNRELEASED; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index ee34eca..419a7bf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.9.4),
+ xserver-xorg-dev (>= 2:1.9.99.903),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
commit 9fc66f46db2adba37ec6d4a5ff6066d2bb964b95
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Mar 27 06:46:13 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 60277a1..cba0e56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,488 @@
+commit 38d9368e59b2990bf32a028ece2132451b402350
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Mar 17 18:59:55 2011 -0400
+
+ bump for release
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit cdfc007eccc9b130fc08012deef304488eb6e469
+Author: Dave Airlie <airl...@redhat.com>
+Date: Wed Mar 16 10:40:42 2011 +1000
+
+ radeon/exa: correct function name
+
+ this corrects the function name so it matches the contents.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit b93d7658f669f6dc1cfacebcfe955a1e113a537c
+Author: Dave Airlie <airl...@redhat.com>
+Date: Wed Mar 16 10:37:22 2011 +1000
+
+ radeon/exa: fix scaling check
+
+ This caused a regression in firefox, as these numbers are xFixed
+ values hence 1 is actually 65536.
+
+ Should fix: https://bugzilla.redhat.com/show_bug.cgi?id=685084
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 8567b8cd9e136ef69906e02286b3752db2404741
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Tue Mar 15 13:13:06 2011 -0400
+
+ APU: no tiling yet
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 4d350497012fa31a417ada662006e2d64db2a4b5
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Mar 15 10:32:19 2011 +1000
+
+ radeon: exa shaders don't handle scaling either.
+
+ rendercheck tsrccoords test fails.
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit 6319a33cb7bd8dba1eaf47bee1e2608cee5d7600
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Mar 2 19:38:04 2011 -0500
+
+ kms: add cayman pci ids
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit fd65def45a57e3242596274d270791df8abc8e29
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Jan 13 17:02:31 2011 -0500
+
+ kms: no accel yet for cayman
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 585e2a3b803b6d3e070f2427e9cb49bab0949239
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Jan 13 16:58:01 2011 -0500
+
+ kms: add cayman chip family
+
+ KMS only. No UMS support for cayman.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 6835e22256ba7a74c02504383f63baaba7e87156
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Mar 2 12:20:45 2011 -0500
+
+ r6xx+: truncate point sampled coordinates
+
+ By default the hardware rounds texcoords. However,
+ for point sampled textures, the expected behavior is
+ to truncate. When we have point sampled textures,
+ set the truncate bit in the sampler.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 8a8862e4165dc5be779bce5e327a31da4826db3b
+Author: Sedat Dilek <sedat.di...@googlemail.com>
+Date: Sat Feb 26 21:04:22 2011 +0100
+
+ kms: Fix warning XNFprintf is deprecated (v2)
+
+ The first take of my patch missed the breakage against pre-1.10
+ xservers and now I know XNFasprintf() is not a 1:1 replacement
+ for XNFprintf().
+ The idea for the fix seemed to be so obvious, but as usual "really"
+ test the patch you are sending to any ML.
+ I am awfully sorry for the overhasty bad hack.
+ Thanks to Alan and Alex for the help to fix it correctly, now.
+
+ Tested-By: Sedat Dilek <sedat.di...@gmail.com>
+ Signed-off-by: Sedat Dilek <sedat.di...@gmail.com>
+
+commit 88304fe9c0ce69012d44a77a5368c35236511dac
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Mon Feb 28 11:29:19 2011 -0500
+
+ kms: don't rotate if acceleration is not enabled
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 99141761e947e2153ed1a3bc485dc5716a22acb1
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Mon Feb 28 11:20:44 2011 -0500
+
+ kms: don't enable tiling if accel is off
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 7928c120fb629a782846bcd5734d9fa14cbb099d
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Feb 28 14:11:57 2011 +1000
+
+ xv: fix height alignments for U/V planes
+
+ The kernel CS checks showed we were incorrectly aligning the
+ U/V allocations for when we used them as texture sources.
+
+ This should fix
+ https://bugs.freedesktop.org/show_bug.cgi?id=34567
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit e55520c0e582f2a500b3b01c2cb78750e15256ca
+Author: Michel Dänzer <daen...@vmware.com>
+Date: Sat Feb 26 15:27:59 2011 +0100
+
+ Revert "kms: Fix warning XNFprintf is deprecated"
+
+ This reverts commit cb4dc7ab66016d0c980800f8dbf71bbe993889d3.
+
+ Looks like this caused
https://bugs.freedesktop.org/attachment.cgi?id=43852 ,
+ but even if it didn't, the following needs to be addressed first:
+
+ cc1: warnings being treated as errors
+ ../../src/radeon_kms.c: In function ‘radeon_open_drm_master’:
+ ../../src/radeon_kms.c:413: error: passing argument 1 of ‘XNFasprintf’
from incompatible pointer type
+ /usr/local/include/xorg/Xprintf.h:57: note: expected ‘char **’ but
argument is of type ‘char *’
+ ../../src/radeon_kms.c:413: error: passing argument 2 of ‘XNFasprintf’
makes pointer from integer without a cast
+ /usr/local/include/xorg/Xprintf.h:57: note: expected ‘const char *
restrict’ but argument is of type ‘uint16_t’
+ ../../src/radeon_kms.c:413: error: assignment makes pointer from integer
without a cast
+ make[2]: *** [radeon_kms.lo] Error 1
+
+commit cb4dc7ab66016d0c980800f8dbf71bbe993889d3
+Author: Sedat Dilek <sedat.di...@gmail.com>
+Date: Fri Feb 25 17:21:52 2011 -0500
+
+ kms: Fix warning XNFprintf is deprecated
+
+ Noticed when building ati/radeon ddx against xserver 1.10-rc3.
+
+ [ build.log ]
+ ../../src/radeon_kms.c:412:5: warning: 'XNFprintf' is deprecated (declared
at /usr/include/xorg/os.h:273)
+
+ agd5f: don't break the build against pre-1.10 xservers.
+
+ Signed-off-by: Sedat Dilek <sedat.di...@gmail.com>
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit ecfdb209afe2aafc378baab8c511f5df7b000270
+Author: Sedat Dilek <sedat.di...@googlemail.com>
+Date: Fri Feb 25 21:48:14 2011 +0100
+
+ UMS: Fix build against xserver 1.10-rc3
+
+ This issue was introduced due to last minute backout of RandR-1.4
+ in xserver 1.10-rc3.
+
+ Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard.
+ See also
<http://lists.x.org/archives/xorg-devel/2011-February/019643.html>.
+
+ Note:
+ The ddx needs a rebuild as the X video driver ABI changed to version 10.0.
+
+ Reported-by: Alex Deucher <alexdeuc...@gmail.com>
+ CC: Keith Packard <kei...@keithp.com>
+ Signed-off-by: Sedat Dilek <sedat.di...@gmail.com>
+
+commit 04293a3a84acd96ccdf8e5e865cf973325ca43a1
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 24 02:33:41 2011 -0500
+
+ dri2: disable pageflipping for transformed displays
+
+ Based on Ben's nouveau patch.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 91070cfd75d5607c4a72ace780f830f0ddb40e84
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Feb 23 00:55:28 2011 -0500
+
+ Xv: use aligned height to calculate Xv buffer size
+
+ Make sure it's large enough for the tiling mode so the
+ CS checker doesn't complain. Should fix:
+ https://bugs.freedesktop.org/show_bug.cgi?id=34567
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit acd54a48a6680956ed903fc890204c0c910b6712
+Author: Mark Kettenis <kette...@openbsd.org>
+Date: Sun Feb 20 22:51:04 2011 +0100
+
+ Properly restore CLOCK_CNTL_INDEX register
+
+ RADEONRestore() restores the CLOCK_CNTL_INDEX register before calling
+ RADEONRestorePLLRegisters(), which modifies the CLOCK_CNTL_INDEX register
+ to access the PLL registers. As a result we may end up with the wrong
clock
+ being selected when exiting X. This happens on platforms where the driver
+ doesn't save and restore the VGA state.
+
+ Signed-off-by: Mark Kettenis <kette...@openbsd.org>
+
+commit d7c2ba4286ea32401c0026cb92ec167f7b5753d8
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Feb 16 18:30:34 2011 -0500
+
+ man: add btc chips to the list
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit d0f8bffbbc26818eccdd305ef142387dc4975bba
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Feb 16 15:09:20 2011 -0500
+
+ kms: add tiling support for evergreen/NI
+
+ - requires 2.6.37 or newer
+ - 1D only at the moment
+ - disabled by default
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 0471d8412acd82e281a35fc4c6bb2d53b1ff5802
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Feb 16 15:07:35 2011 -0500
+
+ kms: EXA/Xv tiling fixes
+
+ - properly set tiling flags for temp surfaces
+ - fix CB non_disp_tiling bits on evergreen
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 4d7e1498f7d9eb50e2eddabca193fc27bde24f0e
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Tue Feb 15 11:24:23 2011 -0500
+
+ fix Xv on pre-r6xx asics
+
+ broken by:
+ a9c1358099:"Xv: fix textured video alignment"
+
+ Reported by:
+ Artur Skawina <art.08...@gmail.com>
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit a9a59717d11af37a2dda5555f6a83c5b65449527
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sat Feb 12 05:34:50 2011 -0500
+
+ kms: use worst case base/pitch align if we don't have drm tiling info
+
+ To avoid CS rejection.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 5f9b7fdb4ce27f8c6a64134bb4d5ebeb1c958cca
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sat Feb 12 05:19:12 2011 -0500
+
+ kms: always get the tiling info even if we aren't tiling
+
+ We need the proper group size to calculate alignment so the
+ ddx and drm agree.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 355f0f7a67ce239b7fd2f2e81bcaaa88b2a09f03
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sat Feb 12 04:52:52 2011 -0500
+
+ kms: fix rotate pitch align
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit f1dc419c989addc4737aed06ec8b8acdb4d40063
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 17:21:10 2011 -0500
+
+ kms: evergreen/ni big endian accel support
+
+ Based on 6xx/7xx patches from Cédric Cano.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit e8dc728a549323f1babe337b9d42ad504af1ca39
+Author: Cédric Cano <cc...@interfaceconcept.com>
+Date: Fri Feb 11 17:06:47 2011 -0500
+
+ ums: atombios endian fixes
+
+ agd5f: fix a few more cases.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 48ffad957f1dbca909515ffa00629f4caa68706b
+Author: Cédric Cano <cc...@interfaceconcept.com>
+Date: Fri Feb 11 17:00:31 2011 -0500
+
+ kms: 6xx/7xx big endian accel support
+
+ agd5f: minor cleanups
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 151b22bd7c3b1002a7261538611fb2b468815c86
+Author: Cédric Cano <cc...@interfaceconcept.com>
+Date: Fri Feb 11 16:33:16 2011 -0500
+
+ kms/6xx+: endian swap cursor uploads
+
+ agd5f: remove kms surface for cursor since
+ we now do the swap in the cursor load to avoid
+ breaking pre-6xx cards with BE.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 309fac041f998e20338d320aabaeda5cc1bb6348
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 14:32:45 2011 -0500
+
+ kms/exa/xv: fix alignment checking in accel state setup
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 25fe3ec4c6dfcdf6ba72a032bc9cb2c84d84029a
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 14:03:56 2011 -0500
+
+ kms/exa: UTS/DFS base alignment fixes
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 3d10278ce511f5dabb68ed86ee43eaaf43585983
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 13:51:11 2011 -0500
+
+ Xv: fix textured video alignment harder
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit a9c135809945fb372ce390f06918b9fd8e455b3f
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 13:21:43 2011 -0500
+
+ Xv: fix textured video alignment
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit e5bd99faa3b6629a55168386d5dfa936ee4e97ae
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 12:14:55 2011 -0500
+
+ kms: remove RADEON_TILING_SURFACE flag on front bo
+
+ Should have been removed in:
+ ef9bfb262db7004bef3704e5d914687e50d3fca4
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 92ffce1892d24a98d789aad57a4230cadb0c812a
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Fri Feb 11 03:12:43 2011 -0500
+
+ EXA/r6xx+: properly account for height alignment in copy temp buffer
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 39104c6e8461cf49c1bb03a18858ad75a9d98b46
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 14:31:43 2011 -0500
+
+ remove EVERGREENSetAccelState()
+
+ It was a duplicate of the R600 variant.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 7ac3a2e0bcdadff7c7172a9f833f526b526da16b
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 14:24:50 2011 -0500
+
+ 6xx+: switch to linear aligned rather than linear general
+
+ linear aligned is supposedly more performant, but more
+ importantly, linear general only works on the CB without
+ slices. The texture blocks technically don't support
+ linear general although, I think linear general gets
+ upgraded to linear aligned in the hw which is why it
+ currently works.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit e3145801b80fd4be4cf770128876e86e89bda66f
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 14:14:55 2011 -0500
+
+ evergreen/NI: consolidate spi setup
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit be67ded05621aff9c85525372fd119071d3278ec
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 14:06:38 2011 -0500
+
+ 6xx/7xx: consolidate spi setup
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 2c5ae1724307e0dba5d0306fe27c1e15a7390a2f
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 13:47:53 2011 -0500
+
+ evergreen/ni: consolidate CB state handling
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit c52d817b51e13447802fe338be2d247ffba2a669
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 13:35:02 2011 -0500
+
+ 6xx/7xx: consolidate remaining CB state
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 5f9bc127d302404432b631e3e774192950f57b42
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 10 03:28:01 2011 -0500
+
+ kms/r6xx+: clean up pitch/height alignment in EXA UTS/DFS
+
+commit a4899db96029acde6cd400fc0541693a487898e7
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sat Feb 5 14:11:42 2011 -0500
+
+ UMS: fix spelling in error message
+
+ Noticed by: Warren Block <wbl...@wonkity.com>
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit 84450ea9221f32296c1f786a6aa126a08bb9756f
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sat Feb 5 14:05:48 2011 -0500
+
+ UMS/DCE3.2: fix segfault
+
+ atombios_pick_dig_encoder() needs to be called
+ with a valid crtc assigned.
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
+commit a27b5dbd9fba689f1814c0888d1b7459b6c6b1a1
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Thu Feb 3 19:06:22 2011 -0500
+
+ Bump version post release
+
+ Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
+
commit 0a1a0513a61f392580bde39cca4880f2c19abc8d
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Thu Feb 3 18:09:17 2011 -0500
diff --git a/debian/changelog b/debian/changelog
index 250f262..d361ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.14.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 27 Mar 2011 06:45:12 +0200
+
xserver-xorg-video-ati (1:6.14.0-1) unstable; urgency=low
* New upstream release:
commit 38d9368e59b2990bf32a028ece2132451b402350
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Thu Mar 17 18:59:55 2011 -0400
bump for release
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/configure.ac b/configure.ac
index ec54478..6f72c2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-ati],
- [6.14.99],
+ [6.14.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-ati])
commit cdfc007eccc9b130fc08012deef304488eb6e469
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Mar 16 10:40:42 2011 +1000
radeon/exa: correct function name
this corrects the function name so it matches the contents.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index 553f05e..ae73e38 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -731,7 +731,7 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB
source\n"));
}
- if (!radeon_transform_is_affine(pPict->transform))
+ if (!radeon_transform_is_affine_or_scaled(pPict->transform))
RADEON_FALLBACK(("non-affine transforms not supported\n"));
return TRUE;
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 57e5c0f..0ed0ced 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -910,7 +910,7 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB
source\n"));
}
- if (!radeon_transform_is_affine(pPict->transform))
+ if (!radeon_transform_is_affine_or_scaled(pPict->transform))
RADEON_FALLBACK(("non-affine transforms not supported\n"));
return TRUE;
diff --git a/src/radeon.h b/src/radeon.h
index 4f5095d..a6d20d7 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -1290,7 +1290,7 @@ extern void RADEONPMFini(ScrnInfoPtr pScrn);
#ifdef USE_EXA
/* radeon_exa.c */
extern Bool RADEONSetupMemEXA(ScreenPtr pScreen);
-extern Bool radeon_transform_is_affine(PictTransformPtr t);
+extern Bool radeon_transform_is_affine_or_scaled(PictTransformPtr t);
/* radeon_exa_funcs.c */
extern void RADEONCopyCP(PixmapPtr pDst, int srcX, int srcY, int dstX,
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 4f31b82..1c647b9 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -179,7 +179,7 @@ Bool RADEONGetPixmapOffsetPitch(PixmapPtr pPix, uint32_t
*pitch_offset)
*
* transform may be null.
*/
-Bool radeon_transform_is_affine(PictTransformPtr t)
+Bool radeon_transform_is_affine_or_scaled(PictTransformPtr t)
{
if (t == NULL)
return TRUE;
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 2e13b00..43d3555 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -379,7 +379,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB
source\n"));
}
- if (!radeon_transform_is_affine(pPict->transform))
+ if (!radeon_transform_is_affine_or_scaled(pPict->transform))
RADEON_FALLBACK(("non-affine transforms not supported\n"));
return TRUE;
@@ -781,7 +781,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB
source\n"));
}
- if (!radeon_transform_is_affine(pPict->transform))
+ if (!radeon_transform_is_affine_or_scaled(pPict->transform))
RADEON_FALLBACK(("non-affine transforms not supported\n"));
return TRUE;
@@ -1168,7 +1168,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB
source\n"));
}
- if (!radeon_transform_is_affine(pPict->transform))
+ if (!radeon_transform_is_affine_or_scaled(pPict->transform))
RADEON_FALLBACK(("non-affine transforms not supported\n"));
return TRUE;
commit b93d7658f669f6dc1cfacebcfe955a1e113a537c
Author: Dave Airlie <airl...@redhat.com>
Date: Wed Mar 16 10:37:22 2011 +1000
radeon/exa: fix scaling check
This caused a regression in firefox, as these numbers are xFixed
values hence 1 is actually 65536.
Should fix: https://bugzilla.redhat.com/show_bug.cgi?id=685084
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index aa3d55e..4f31b82 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -184,7 +184,7 @@ Bool radeon_transform_is_affine(PictTransformPtr t)
if (t == NULL)
return TRUE;
/* the shaders don't handle scaling either */
- return t->matrix[2][0] == 0 && t->matrix[2][1] == 0 && t->matrix[2][2]
== 1;
+ return t->matrix[2][0] == 0 && t->matrix[2][1] == 0 && t->matrix[2][2]
== IntToxFixed(1);
}
#if X_BYTE_ORDER == X_BIG_ENDIAN
commit 8567b8cd9e136ef69906e02286b3752db2404741
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Tue Mar 15 13:13:06 2011 -0400
APU: no tiling yet
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 125a132..0760170 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -651,6 +651,10 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
} else
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"R6xx+ KMS Color Tiling requires radeon drm 2.6.0 or
newer\n");
+
+ /* don't support tiling on APUs yet */
+ if (info->ChipFamily == CHIP_FAMILY_PALM)
+ info->allowColorTiling = FALSE;
} else
info->allowColorTiling = xf86ReturnOptValBool(info->Options,
OPTION_COLOR_TILING,
colorTilingDefault);
commit 4d350497012fa31a417ada662006e2d64db2a4b5
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Mar 15 10:32:19 2011 +1000
radeon: exa shaders don't handle scaling either.
rendercheck tsrccoords test fails.
Signed-off-by: Dave Airlie <airl...@redhat.com>
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 3dbdcae..aa3d55e 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -183,7 +183,8 @@ Bool radeon_transform_is_affine(PictTransformPtr t)
{
if (t == NULL)
return TRUE;
- return t->matrix[2][0] == 0 && t->matrix[2][1] == 0;
+ /* the shaders don't handle scaling either */
+ return t->matrix[2][0] == 0 && t->matrix[2][1] == 0 && t->matrix[2][2]
== 1;
}
#if X_BYTE_ORDER == X_BIG_ENDIAN
commit 6319a33cb7bd8dba1eaf47bee1e2608cee5d7600
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Wed Mar 2 19:38:04 2011 -0500
kms: add cayman pci ids
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/src/ati_pciids_gen.h b/src/ati_pciids_gen.h
index f7b7569..598dd72 100644
--- a/src/ati_pciids_gen.h
+++ b/src/ati_pciids_gen.h
@@ -500,6 +500,20 @@
#define PCI_CHIP_CEDAR_68F8 0x68F8
#define PCI_CHIP_CEDAR_68F9 0x68F9
#define PCI_CHIP_CEDAR_68FE 0x68FE
+#define PCI_CHIP_CAYMAN_6700 0x6700
+#define PCI_CHIP_CAYMAN_6701 0x6701
+#define PCI_CHIP_CAYMAN_6702 0x6702
+#define PCI_CHIP_CAYMAN_6703 0x6703
+#define PCI_CHIP_CAYMAN_6704 0x6704
+#define PCI_CHIP_CAYMAN_6705 0x6705
+#define PCI_CHIP_CAYMAN_6706 0x6706
+#define PCI_CHIP_CAYMAN_6707 0x6707
+#define PCI_CHIP_CAYMAN_6708 0x6708
+#define PCI_CHIP_CAYMAN_6709 0x6709
+#define PCI_CHIP_CAYMAN_6718 0x6718
+#define PCI_CHIP_CAYMAN_6719 0x6719
+#define PCI_CHIP_CAYMAN_671C 0x671C
+#define PCI_CHIP_CAYMAN_671D 0x671D
#define PCI_CHIP_BARTS_6720 0x6720
#define PCI_CHIP_BARTS_6721 0x6721
#define PCI_CHIP_BARTS_6722 0x6722
diff --git a/src/pcidb/ati_pciids.csv b/src/pcidb/ati_pciids.csv
index e8bfb4c..07454af 100644
--- a/src/pcidb/ati_pciids.csv
+++ b/src/pcidb/ati_pciids.csv
@@ -501,6 +501,20 @@
"0x68F8","CEDAR_68F8","CEDAR",,,,,,"CEDAR"
"0x68F9","CEDAR_68F9","CEDAR",,,,,,"ATI Radeon HD 5450"
"0x68FE","CEDAR_68FE","CEDAR",,,,,,"CEDAR"
+"0x6700","CAYMAN_6700","CAYMAN",,,,,,"CAYMAN"
+"0x6701","CAYMAN_6701","CAYMAN",,,,,,"CAYMAN"
+"0x6702","CAYMAN_6702","CAYMAN",,,,,,"CAYMAN"
+"0x6703","CAYMAN_6703","CAYMAN",,,,,,"CAYMAN"
+"0x6704","CAYMAN_6704","CAYMAN",,,,,,"CAYMAN"
+"0x6705","CAYMAN_6705","CAYMAN",,,,,,"CAYMAN"
+"0x6706","CAYMAN_6706","CAYMAN",,,,,,"CAYMAN"
+"0x6707","CAYMAN_6707","CAYMAN",,,,,,"CAYMAN"
+"0x6708","CAYMAN_6708","CAYMAN",,,,,,"CAYMAN"
+"0x6709","CAYMAN_6709","CAYMAN",,,,,,"CAYMAN"
+"0x6718","CAYMAN_6718","CAYMAN",,,,,,"AMD Radeon HD 6900 Series"
+"0x6719","CAYMAN_6719","CAYMAN",,,,,,"AMD Radeon HD 6900 Series"
+"0x671C","CAYMAN_671C","CAYMAN",,,,,,"CAYMAN"
+"0x671D","CAYMAN_671D","CAYMAN",,,,,,"CAYMAN"
"0x6720","BARTS_6720","BARTS",1,,,,,"AMD Radeon HD 6900M Series"
"0x6721","BARTS_6721","BARTS",1,,,,,"Mobility Radeon HD 6000 Series"
"0x6722","BARTS_6722","BARTS",,,,,,"BARTS"
diff --git a/src/radeon_chipinfo_gen.h b/src/radeon_chipinfo_gen.h
index a90fae7..2caeed9 100644
--- a/src/radeon_chipinfo_gen.h
+++ b/src/radeon_chipinfo_gen.h
@@ -420,6 +420,20 @@ static RADEONCardInfo RADEONCards[] = {
{ 0x68F8, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68F9, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
{ 0x68FE, CHIP_FAMILY_CEDAR, 0, 0, 0, 0, 0 },
+ { 0x6700, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6701, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6702, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6703, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6704, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6705, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6706, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6707, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6708, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6709, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6718, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x6719, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x671C, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
+ { 0x671D, CHIP_FAMILY_CAYMAN, 0, 0, 0, 0, 0 },
{ 0x6720, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
{ 0x6721, CHIP_FAMILY_BARTS, 1, 0, 0, 0, 0 },
{ 0x6722, CHIP_FAMILY_BARTS, 0, 0, 0, 0, 0 },
diff --git a/src/radeon_chipset_gen.h b/src/radeon_chipset_gen.h
index 2af046c..e4c38f0 100644
--- a/src/radeon_chipset_gen.h
+++ b/src/radeon_chipset_gen.h
@@ -420,6 +420,20 @@ static SymTabRec RADEONChipsets[] = {
{ PCI_CHIP_CEDAR_68F8, "CEDAR" },
{ PCI_CHIP_CEDAR_68F9, "ATI Radeon HD 5450" },
{ PCI_CHIP_CEDAR_68FE, "CEDAR" },
+ { PCI_CHIP_CAYMAN_6700, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6701, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6702, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6703, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6704, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6705, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6706, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6707, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6708, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6709, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_6718, "AMD Radeon HD 6900 Series" },
+ { PCI_CHIP_CAYMAN_6719, "AMD Radeon HD 6900 Series" },
+ { PCI_CHIP_CAYMAN_671C, "CAYMAN" },
+ { PCI_CHIP_CAYMAN_671D, "CAYMAN" },
{ PCI_CHIP_BARTS_6720, "AMD Radeon HD 6900M Series" },
{ PCI_CHIP_BARTS_6721, "Mobility Radeon HD 6000 Series" },
{ PCI_CHIP_BARTS_6722, "BARTS" },
diff --git a/src/radeon_pci_chipset_gen.h b/src/radeon_pci_chipset_gen.h
index b4b2a79..1165049 100644
--- a/src/radeon_pci_chipset_gen.h
+++ b/src/radeon_pci_chipset_gen.h
@@ -420,6 +420,20 @@ PciChipsets RADEONPciChipsets[] = {
{ PCI_CHIP_CEDAR_68F8, PCI_CHIP_CEDAR_68F8, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68F9, PCI_CHIP_CEDAR_68F9, RES_SHARED_VGA },
{ PCI_CHIP_CEDAR_68FE, PCI_CHIP_CEDAR_68FE, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6700, PCI_CHIP_CAYMAN_6700, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6701, PCI_CHIP_CAYMAN_6701, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6702, PCI_CHIP_CAYMAN_6702, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6703, PCI_CHIP_CAYMAN_6703, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6704, PCI_CHIP_CAYMAN_6704, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6705, PCI_CHIP_CAYMAN_6705, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6706, PCI_CHIP_CAYMAN_6706, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6707, PCI_CHIP_CAYMAN_6707, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6708, PCI_CHIP_CAYMAN_6708, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6709, PCI_CHIP_CAYMAN_6709, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6718, PCI_CHIP_CAYMAN_6718, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_6719, PCI_CHIP_CAYMAN_6719, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_671C, PCI_CHIP_CAYMAN_671C, RES_SHARED_VGA },
+ { PCI_CHIP_CAYMAN_671D, PCI_CHIP_CAYMAN_671D, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6720, PCI_CHIP_BARTS_6720, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6721, PCI_CHIP_BARTS_6721, RES_SHARED_VGA },
{ PCI_CHIP_BARTS_6722, PCI_CHIP_BARTS_6722, RES_SHARED_VGA },
diff --git a/src/radeon_pci_device_match_gen.h
b/src/radeon_pci_device_match_gen.h
index aa50306..4bebfeb 100644
--- a/src/radeon_pci_device_match_gen.h
+++ b/src/radeon_pci_device_match_gen.h
@@ -420,6 +420,20 @@ static const struct pci_id_match radeon_device_match[] = {
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F8, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68F9, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_CEDAR_68FE, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6700, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6701, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6702, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6703, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6704, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6705, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6706, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6707, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6708, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6709, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6718, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_6719, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671C, 0 ),
+ ATI_DEVICE_MATCH( PCI_CHIP_CAYMAN_671D, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6720, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6721, 0 ),
ATI_DEVICE_MATCH( PCI_CHIP_BARTS_6722, 0 ),
commit fd65def45a57e3242596274d270791df8abc8e29
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Thu Jan 13 17:02:31 2011 -0500
kms: no accel yet for cayman
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index b618045..125a132 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -258,6 +258,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
}
if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE) ||
+ (info->ChipFamily >= CHIP_FAMILY_CAYMAN) ||
(!RADEONIsAccelWorking(pScrn))) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"GPU accel disabled or not working, using shadowfb for
KMS\n");
commit 585e2a3b803b6d3e070f2427e9cb49bab0949239
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Thu Jan 13 16:58:01 2011 -0500
kms: add cayman chip family
KMS only. No UMS support for cayman.
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/src/radeon.h b/src/radeon.h
index 4c43717..4f5095d 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -363,6 +363,7 @@ typedef enum {
CHIP_FAMILY_BARTS,
CHIP_FAMILY_TURKS,
CHIP_FAMILY_CAICOS,
+ CHIP_FAMILY_CAYMAN,
CHIP_FAMILY_LAST
} RADEONChipFamily;
commit 6835e22256ba7a74c02504383f63baaba7e87156
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Wed Mar 2 12:20:45 2011 -0500
r6xx+: truncate point sampled coordinates
By default the hardware rounds texcoords. However,
for point sampled textures, the expected behavior is
to truncate. When we have point sampled textures,
set the truncate bit in the sampler.
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index e5e7559..553f05e 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -325,6 +325,7 @@ EVERGREENDoPrepareCopy(ScrnInfoPtr pScrn)
tex_samp.clamp_z = SQ_TEX_WRAP;
tex_samp.xy_mag_filter = SQ_TEX_XY_FILTER_POINT;
tex_samp.xy_min_filter = SQ_TEX_XY_FILTER_POINT;
+ tex_samp.mc_coord_truncate = 1;
tex_samp.z_filter = SQ_TEX_Z_FILTER_NONE;
tex_samp.mip_filter = 0; /* no mipmap */
evergreen_set_tex_sampler (pScrn, &tex_samp);
@@ -973,6 +974,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict,
PixmapPtr pPix,
case PictFilterNearest:
tex_samp.xy_mag_filter = SQ_TEX_XY_FILTER_POINT;
tex_samp.xy_min_filter = SQ_TEX_XY_FILTER_POINT;
+ tex_samp.mc_coord_truncate = 1;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q3ib3-0003bt...@alioth.debian.org
