debian/changelog | 11 +++++++++++
debian/rules | 2 ++
src/radeon_video.c | 12 ++++++++----
3 files changed, 21 insertions(+), 4 deletions(-)
New commits:
commit b387ae7ac389f3190fe9963b52c428beefdcfe21
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Nov 7 11:22:41 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 6b07b6f..3e23305 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:6.13.1-2+squeeze1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.13.1-2+squeeze1) unstable; urgency=low
* Cherry-pick upstream commit 91f707d3 to fix pixel column ordering with
Xv on big endian systems (without KMS, without DRI). Thanks to Ulrich
@@ -7,7 +7,7 @@ xserver-xorg-video-ati (1:6.13.1-2+squeeze1) UNRELEASED;
urgency=low
powerpc, KMS in squeeze means no suspend/resume, and no backlight
control, so delay this to wheezy.
- -- Cyril Brulebois <k...@debian.org> Sun, 07 Nov 2010 10:40:53 +0100
+ -- Cyril Brulebois <k...@debian.org> Sun, 07 Nov 2010 11:22:20 +0100
xserver-xorg-video-ati (1:6.13.1-2) unstable; urgency=low
commit 0afb9bf58c5f32616a00928f221336386d4f119c
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Nov 7 10:49:17 2010 +0100
Only enable KMS on x86.
At least on powerpc, KMS in squeeze means no backlight control and no
suspend/resume, so delay this to wheezy.
diff --git a/debian/changelog b/debian/changelog
index 467f840..6b07b6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ xserver-xorg-video-ati (1:6.13.1-2+squeeze1) UNRELEASED;
urgency=low
* Cherry-pick upstream commit 91f707d3 to fix pixel column ordering with
Xv on big endian systems (without KMS, without DRI). Thanks to Ulrich
Eckhardt for the report (Closes: #587999).
+ * Apply patch by Julien Cristau: Only enable KMS on x86. At least on
+ powerpc, KMS in squeeze means no suspend/resume, and no backlight
+ control, so delay this to wheezy.
-- Cyril Brulebois <k...@debian.org> Sun, 07 Nov 2010 10:40:53 +0100
diff --git a/debian/rules b/debian/rules
index 8815ada..1604ca7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,9 +90,11 @@ binary-arch: build install serverabi-ati serverabi-radeon
dh_installchangelogs ChangeLog
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=usr/share/man/man4
ifeq ($(DEB_HOST_ARCH_OS), linux)
+ifneq (, $(filter $(DEB_HOST_ARCH), i386 amd64))
install -d -m 755 debian/xserver-xorg-video-radeon/etc/modprobe.d/
install -m 644 debian/radeon-kms.conf
debian/xserver-xorg-video-radeon/etc/modprobe.d/
endif
+endif
dh_installman
dh_link
dh_strip -pxserver-xorg-video-ati
--dbg-package=xserver-xorg-video-ati-dbg
commit 17d71bf998bbcb18a7bd06d4b34192dba982f0ce
Author: Cyril Brulebois <k...@debian.org>
Date: Sun Nov 7 10:44:19 2010 +0100
Document the cherry-pick.
diff --git a/debian/changelog b/debian/changelog
index e397f1b..467f840 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-ati (1:6.13.1-2+squeeze1) UNRELEASED; urgency=low
+
+ * Cherry-pick upstream commit 91f707d3 to fix pixel column ordering with
+ Xv on big endian systems (without KMS, without DRI). Thanks to Ulrich
+ Eckhardt for the report (Closes: #587999).
+
+ -- Cyril Brulebois <k...@debian.org> Sun, 07 Nov 2010 10:40:53 +0100
+
xserver-xorg-video-ati (1:6.13.1-2) unstable; urgency=low
* Make libudev-dev build dependencies linux-any.
commit 072c48df2b5505a18cb7dc7a957dfaad922bc1e4
Author: Heikki Lindholm <ho...@iki.fi>
Date: Fri Aug 27 02:26:24 2010 -0400
xv: fix non-kms/non-dri Xv column ordering on big endian systems
Column order is wrong on big endian systems, primarly because of a
bits / bytes mix up with the bpp variable. Fix tested with r100 and
r300, screen depth 16 and 32 with YV12 and YUY2 (overlay, textured video),
RGBA and RGBT (overlay).
Should fix: https://bugs.freedesktop.org/show_bug.cgi?id=29041
Signed-off-by: Heikki Lindholm <ho...@iki.fi>
(cherry picked from commit 91f707d308d4bbf16c3d62d046cf280fef5a8f4c)
Signed-off-by: Cyril Brulebois <k...@debian.org>
diff --git a/src/radeon_video.c b/src/radeon_video.c
index dc75279..1a42951 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2216,11 +2216,15 @@ RADEONCopyData(
swap = RADEON_HOST_DATA_SWAP_32BIT;
break;
}
- } else if (bpp != pScrn->bitsPerPixel) {
- if (bpp == 8)
+ } else {
+ switch (pScrn->bitsPerPixel) {
+ case 16:
+ swap = RADEON_HOST_DATA_SWAP_16BIT;
+ break;
+ case 32:
swap = RADEON_HOST_DATA_SWAP_32BIT;
- else
- swap = RADEON_HOST_DATA_SWAP_HDW;
+ break;
+ }
}
#endif
--
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/e1pf2zc-00083s...@alioth.debian.org
