ChangeLog | 1846 ++++++++++++++++++
configure.ac | 6
debian/NEWS | 11
debian/README.source | 73
debian/changelog | 52
debian/control | 31
debian/patches/01_gen_pci_ids.diff | 21
debian/patches/series | 1
debian/rules | 17
debian/xserver-xorg-video-radeon.install | 1
debian/xsfbs/xsfbs.mk | 21
debian/xsfbs/xsfbs.sh | 311 ---
man/radeon.man | 75
src/Makefile.am | 8
src/ati_pciids_gen.h | 24
src/atipciids.h | 1
src/atombios_crtc.c | 208 +-
src/atombios_output.c | 889 ++++----
src/legacy_crtc.c | 52
src/legacy_output.c | 14
src/pcidb/ati_pciids.csv | 24
src/r600_exa.c | 2106 +++++++++++++++++++++
src/r600_reg.h | 132 +
src/r600_reg_auto_r6xx.h | 3087 +++++++++++++++++++++++++++++++
src/r600_reg_r6xx.h | 503 +++++
src/r600_reg_r7xx.h | 149 +
src/r600_shader.c | 1848 ++++++++++++++++++
src/r600_shader.h | 359 +++
src/r600_state.h | 282 ++
src/r600_textured_videofuncs.c | 519 +++++
src/r6xx_accel.c | 1106 +++++++++++
src/radeon.h | 153 +
src/radeon_accel.c | 129 +
src/radeon_atombios.c | 87
src/radeon_atombios.h | 2
src/radeon_bios.c | 17
src/radeon_chipinfo_gen.h | 24
src/radeon_chipset_gen.h | 24
src/radeon_commonfuncs.c | 130 -
src/radeon_crtc.c | 39
src/radeon_cursor.c | 70
src/radeon_dri.c | 308 +--
src/radeon_driver.c | 473 +++-
src/radeon_exa.c | 3
src/radeon_exa_funcs.c | 16
src/radeon_exa_render.c | 54
src/radeon_legacy_memory.c | 4
src/radeon_macros.h | 17
src/radeon_modes.c | 78
src/radeon_output.c | 449 ++--
src/radeon_pci_chipset_gen.h | 24
src/radeon_pci_device_match_gen.h | 24
src/radeon_probe.c | 3
src/radeon_probe.h | 18
src/radeon_reg.h | 139 +
src/radeon_textured_video.c | 366 +++
src/radeon_textured_videofuncs.c | 680 ++++++
src/radeon_tv.c | 6
src/radeon_version.h | 1
src/radeon_video.c | 44
src/radeon_video.h | 12
61 files changed, 15355 insertions(+), 1816 deletions(-)
New commits:
commit 178f5a282f36b1a6ff4de30efc1f0541eec4c20a
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Dec 2 21:05:23 2009 +0100
Prepare Changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 50c8d68..5275d92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.12.4-1) experimental; urgency=low
[ Timo Aaltonen ]
* New upstream release.
@@ -9,7 +9,7 @@ xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
dependencies, closes: #558290.
* Build against xserver 1.7.
- -- Brice Goglin <bgog...@debian.org> Thu, 03 Dec 2009 16:37:52 +0100
+ -- Brice Goglin <bgog...@debian.org> Thu, 03 Dec 2009 16:38:29 +0100
xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low
commit c9de351ba3ab204996cc17d2af77f6fce72d798a
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Dec 2 21:05:09 2009 +0100
Build against Xserver 1.7
diff --git a/debian/changelog b/debian/changelog
index ea53c3e..50c8d68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
[ Brice Goglin ]
* Properly generate each binary package substvars so as to fix shlibs
dependencies, closes: #558290.
+ * Build against xserver 1.7.
- -- Brice Goglin <bgog...@debian.org> Thu, 03 Dec 2009 16:37:07 +0100
+ -- Brice Goglin <bgog...@debian.org> Thu, 03 Dec 2009 16:37:52 +0100
xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 401a890..4bcab8a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.or
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
commit 79d61abe9918642b85a1987704555938937ffa4c
Author: Brice Goglin <bgog...@debian.org>
Date: Wed Dec 2 21:04:28 2009 +0100
Properly generate each binary package substvars
To fix #558290, we need to run the serverabi rule twice with different
PACKAGE values. However, this rule depends on the install target, which
calls dh_clean. So the second invokation of serverabi would erase the
first generated substvars.
To workaround this, we add a install-stamp so that the install rule
is only executed once.
Note that install-stamp must depend on build-stamp and not on build.
Otherwise install-stamp would always be regenerated since build is
.PHONY.
diff --git a/debian/changelog b/debian/changelog
index 7782299..ea53c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:01:49 +0200
+ [ Brice Goglin ]
+ * Properly generate each binary package substvars so as to fix shlibs
+ dependencies, closes: #558290.
+
+ -- Brice Goglin <bgog...@debian.org> Thu, 03 Dec 2009 16:37:07 +0100
xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 64ec665..401a890 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
Package: xserver-xorg-video-ati
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
xserver-xorg-video-r128, xserver-xorg-video-mach64, xserver-xorg-video-radeon
+Provides: ${xviddriver:Provides}
Description: X.Org X server -- ATI display driver wrapper
This driver for the X.Org X server (see xserver-xorg for a further
description)
provides support for the ATI Mach64, Rage128, Radeon and FireGL series.
diff --git a/debian/rules b/debian/rules
index 5c87ec5..43a1aa8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ build-stamp: obj-$(DEB_BUILD_GNU_TYPE)/config.status
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
+ rm -f build-stamp install-stamp
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
@@ -67,16 +67,22 @@ clean:
dh_clean
-install: build
+.PHONY: install
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp
install
+ >$@
+
+serverabi-%: install
+ $(MAKE) -f debian/rules serverabi PACKAGE=xserver-xorg-video-$*
# Build architecture-dependent files here.
-binary-arch: build install serverabi
+binary-arch: build install serverabi-ati serverabi-radeon
dh_testdir
dh_testroot
@@ -91,7 +97,6 @@ binary-arch: build install serverabi
dh_fixperms
dh_installdeb
dh_shlibdeps -- --warnings=6
- cp -f debian/xserver-xorg-video-ati.substvars
debian/xserver-xorg-video-radeon.substvars # xsfbs serverabi hack
dh_gencontrol
dh_md5sums
dh_builddeb
commit 78f02923f09cce903b731b612f47be2ec899a0f7
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Mon Nov 30 16:05:13 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 8e5b67d..7782299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:01:49 +0200
diff --git a/debian/control b/debian/control
index ff7dbbe..64ec665 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
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 6c39d8ef0425e6a2bc2f539c67397acb6c831c4c
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Mon Nov 30 16:04:39 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 25241ab..ef0f5f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+commit b7c14b00ff6a217cb69727b384cc4f4b433a907e
+Author: Dave Airlie <airl...@redhat.com>
+Date: Fri Sep 11 09:31:46 2009 +1000
+
+ ati 6.12.4
+
+commit 93df2faf1ea2008248566326f10ed737e7f6fc66
+Author: Dave Airlie <airl...@redhat.com>
+Date: Fri Sep 11 09:19:17 2009 +1000
+
+ Update to xextproto 7.1 support.
+
+ DPMS header was split into dpms.h (client) and dpmsconst.h (server).
Drivers
+ need to include dpmsconst.h if xextproto 7.1 is available.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+ Conflicts:
+
+ src/drmmode_display.c
+
commit 9589d19eb8cbf7b1a978c7ea3eaacb328fb48cd8
Author: Dave Airlie <airl...@redhat.com>
Date: Thu Sep 10 13:02:26 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index d0597aa..8e5b67d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:6.12.4-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 30 Nov 2009 16:01:49 +0200
+
xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low
* New upstream release.
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcris...@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper
operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit b7c14b00ff6a217cb69727b384cc4f4b433a907e
Author: Dave Airlie <airl...@redhat.com>
Date: Fri Sep 11 09:31:46 2009 +1000
ati 6.12.4
diff --git a/configure.ac b/configure.ac
index 40045c5..f081c67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.12.3,
+ 6.12.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit 93df2faf1ea2008248566326f10ed737e7f6fc66
Author: Dave Airlie <airl...@redhat.com>
Date: Fri Sep 11 09:19:17 2009 +1000
Update to xextproto 7.1 support.
DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
need to include dpmsconst.h if xextproto 7.1 is available.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
Conflicts:
src/drmmode_display.c
diff --git a/configure.ac b/configure.ac
index 7c113e9..40045c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto
$REQUIRED_MODULES])
+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1,
[xextproto 7.1 available]),
+ HAVE_XEXTPROTO_71="no")
+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
index f060d8d..cd98c21 100644
--- a/src/atombios_crtc.c
+++ b/src/atombios_crtc.c
@@ -33,8 +33,13 @@
#include "config.h"
#endif
/* DPMS */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include "radeon.h"
#include "radeon_reg.h"
diff --git a/src/atombios_output.c b/src/atombios_output.c
index e6ef025..57345b3 100644
--- a/src/atombios_output.c
+++ b/src/atombios_output.c
@@ -34,8 +34,13 @@
#include "config.h"
#endif
/* DPMS */
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include <unistd.h>
#include "radeon.h"
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9d8bd39..551cb7f 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -106,8 +106,13 @@
#include "vgaHW.h"
#endif
+#ifdef HAVE_XEXTPROTO_71
+#include <X11/extensions/dpmsconst.h>
+#else
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
+#endif
+
#include "atipciids.h"
#include "radeon_chipset_gen.h"
commit 5e998e05652e64881c103c99138457161c34d468
Author: Brice Goglin <bgog...@debian.org>
Date: Thu Sep 10 07:40:18 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8063489..d0597aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:6.12.3-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.12.3-1) unstable; urgency=low
* New upstream release.
+ More AGP quirks, closes: #545040.
- -- Brice Goglin <bgog...@debian.org> Thu, 10 Sep 2009 07:33:28 +0200
+ -- Brice Goglin <bgog...@debian.org> Thu, 10 Sep 2009 07:40:14 +0200
xserver-xorg-video-ati (1:6.12.2-3) unstable; urgency=low
commit 1da441c95702f86fd4c9431faaafd05f31d3257d
Author: Brice Goglin <bgog...@debian.org>
Date: Thu Sep 10 07:39:47 2009 +0200
New upstream release
diff --git a/ChangeLog b/ChangeLog
index adebbb7..25241ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,170 @@
+commit 9589d19eb8cbf7b1a978c7ea3eaacb328fb48cd8
+Author: Dave Airlie <airl...@redhat.com>
+Date: Thu Sep 10 13:02:26 2009 +1000
+
+ ati 6.12.3
+
+commit 1c09cdd8d23c6f79640b5b653e799089798eea2a
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 15:22:40 2009 +1000
+
+ ati: change to using ABI version check
+ (cherry picked from commit 63c873cbd4d1d21d9f688028c0900c79fadc42c1)
+
+commit 034b6d057cd62ce60961d4f7b3fa4e9eb35c9626
+Author: Dave Airlie <airl...@redhat.com>
+Date: Tue Jul 28 13:32:28 2009 +1000
+
+ ati: update for resources/RAC API removal
+ (cherry picked from commit 21a621c297ac71c65c239ea960c38706e718b91c)
+
+commit b0de26fb70a21f03a66e192913a571dcf0ac616f
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Sun Sep 6 10:53:29 2009 -0400
+
+ RV280: add agp quirk
+
+ deb bug 545040
+
+commit a2968896884545f5c8f3f16c398c1ee4534ad7a8
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Tue Aug 25 11:39:56 2009 -0400
+
+ RV740: disable small DFS transfers
+
+ Seems problematic on all rv740 chips, so until we
+ can find a solution, disable them.
+
+commit 4a2f0022373b553c922e63c84f2de82a5426a1b5
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 24 14:11:24 2009 +1000
+
+ r600: fix bad unit in texture setup
+
+commit 7d91ae120894dec5361d7ac5a981749fa96eed0e
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 17 15:50:21 2009 +1000
+
+ radeon: move detected monitor type debugging.
+
+ We should print this after DAC detection to be useful for TV
+
+commit db7af4cf56a60228110f60f6dc49931f28548cff
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 17 15:31:16 2009 +1000
+
+ atom: recall crtc source script after tv dpms on
+
+ For some reason we lost the DACB source when we dpms tv back on.
+
+commit 2647a20eb4ece70ce668234129220a3e43f324fa
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 17 15:25:17 2009 +1000
+
+ atombios: store dac detect result into save register.
+
+ We end up writing back an empty save register over the dac
+ detection results so the atombios table can no longer
+ figure out the S-video vs composite so sets the wrong one up.
+
+ this gets tv-out on my r580 with a composite connector working.
+
+commit d22557069e1691dbb998015f286ab3a8331f486b
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 17 13:44:20 2009 +1000
+
+ atom/tvout: set the correct scaler up for tv out
+
+ If we need to use the second scaler actually set the second scaler
+ up.
+
+commit dc9799c94c7f2c7f16e09de03376936e24b4e17f
+Author: Dave Airlie <airl...@redhat.com>
+Date: Mon Aug 17 12:17:31 2009 +1000
+
+ r100/r200: dont emit wrong clamp modes.
+
+ for rect textures you don't want to use wrap clamping which
+ is the default.
+
+commit c71efd81b070fc9fee862dce02391e42b6524405
+Author: Dave Airlie <airl...@itt42.(none)>
+Date: Mon Aug 17 09:38:09 2009 +1000
+
+ radeon/tv: fix typo in crtc register modifications
+
+commit dcfecf624a43bbe2c24d03505c4e6cb755dd3b44
+Author: Adam Jackson <a...@redhat.com>
+Date: Mon Aug 10 13:59:49 2009 -0400
+
+ Fix misleading filenames in DRI setup failure messages
+
+commit 2fee5d4925f1ac031f37577c66a148d6e5e8d161
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Tue Aug 11 15:29:17 2009 -0400
+
+ RV280: add agp quirk
+
+ from Hartmut Niemann
+
+commit 9a6cf3c145e1a42f50f8f1a85a4bea5ceeb98578
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Tue Aug 4 11:16:05 2009 -0400
+
+ RS880: enable accel
+
+commit 7c317c6cd8762429743b6d1f62312b35971f7841
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Mon Aug 3 15:55:04 2009 -0400
+
+ radeon: add some new r7xx pci ids
+
+commit 1dd67e5bcd4ee760926fb5bd90fa519060a22577
+Author: Bryce Harrington <br...@canonical.com>
+Date: Sat Aug 1 16:50:43 2009 -0400
+
+ radeon: AGPMode quirk needed for SiS
+
+ fixes bug 23065
+
+commit 35a44bfa8fd6f2e5c7d45162c38a5c9f50c61452
+Author: Bryce Harrington <br...@canonical.com>
+Date: Sat Aug 1 16:48:48 2009 -0400
+
+ radeon: AGPMode quirk needed for IBM Thinkpad T40 with Mobility M7 LW
+
+ fixes bug 23064
+
+commit fc0cdcc3d287228242f0b5d3dad464f0440fe590
+Author: Bryce Harrington <br...@canonical.com>
+Date: Sat Aug 1 16:41:41 2009 -0400
+
+ radeon: AGPMode quirk needed for HP Omnibook 6200
+
+ fixed bug 23063
+
+commit 0a03220810a5fa4eec3f16c3c25bd42dd3b31f1c
+Author: Dave Airlie <airl...@redhat.com>
+Date: Thu Jul 30 09:54:01 2009 +1000
+
+ radeon: fix r600 shadow fb mode with cursor allocation in wrong place
+
+ From RHEL QE testing, we could end up with the cursor at 0 since
+ we think EXA is in use when really it isn't. the info->useEXA = FALSe
+ might be unnecessary but better to be explicit
+
+ stable: fix slightly different
+
+ Signed-off-by: Dave Airlie <airl...@redhat.com>
+
+commit a8225ce61a26bd310b3d649a33e9687cf9626858
+Author: Alex Deucher <alexdeuc...@gmail.com>
+Date: Wed Jul 29 03:34:11 2009 -0400
+
+ radeon: fix typo in object header to connector type conversion
+
+ Should fix bug 19943
+
commit b1f005bf16064db62ae35d362f69250427a45b3b
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Sat Jul 25 14:19:38 2009 -0400
diff --git a/debian/changelog b/debian/changelog
index e0aeb22..8063489 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:6.12.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + More AGP quirks, closes: #545040.
+
+ -- Brice Goglin <bgog...@debian.org> Thu, 10 Sep 2009 07:33:28 +0200
+
xserver-xorg-video-ati (1:6.12.2-3) unstable; urgency=low
* Pull upstream commits from 6.12-branch up to commit b1f005bf:
commit 9589d19eb8cbf7b1a978c7ea3eaacb328fb48cd8
Author: Dave Airlie <airl...@redhat.com>
Date: Thu Sep 10 13:02:26 2009 +1000
ati 6.12.3
diff --git a/configure.ac b/configure.ac
index 709fb19..7c113e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.12.2,
+ 6.12.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
commit 1c09cdd8d23c6f79640b5b653e799089798eea2a
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
ati: change to using ABI version check
(cherry picked from commit 63c873cbd4d1d21d9f688028c0900c79fadc42c1)
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 9488666..9d8bd39 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -93,7 +93,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86RandR12.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86RAC.h"
#include "xf86Resources.h"
#endif
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 234d292..d5f9a14 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -44,7 +44,7 @@
#include "atipcirename.h"
#include "xf86.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
commit 034b6d057cd62ce60961d4f7b3fa4e9eb35c9626
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:28 2009 +1000
ati: update for resources/RAC API removal
(cherry picked from commit 21a621c297ac71c65c239ea960c38706e718b91c)
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 056ff29..9488666 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -92,9 +92,11 @@
/* X and server generic header files */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RAC.h"
#include "xf86RandR12.h"
+#ifndef XSERVER_LIBPCIACCESS
+#include "xf86RAC.h"
#include "xf86Resources.h"
+#endif
#include "xf86cmap.h"
#include "vbe.h"
@@ -2873,12 +2875,14 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_DEV(info->PciInfo),
PCI_DEV_FUNC(info->PciInfo));
+#ifndef XSERVER_LIBPCIACCESS
if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
goto fail;
xf86SetOperatingState(resVga, info->pEnt->index, ResUnusedOpr);
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
+#endif
pScrn->monitor = pScrn->confScreen->monitor;
/* Allocate an xf86CrtcConfig */
diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index 041bab6..234d292 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -44,12 +44,15 @@
#include "atipcirename.h"
#include "xf86.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
#include "radeon_chipset_gen.h"
#include "radeon_pci_chipset_gen.h"
+
#ifdef XSERVER_LIBPCIACCESS
#include "radeon_pci_device_match_gen.h"
#endif
commit b0de26fb70a21f03a66e192913a571dcf0ac616f
Author: Alex Deucher <alexdeuc...@gmail.com>
Date: Sun Sep 6 10:53:29 2009 -0400
RV280: add agp quirk
deb bug 545040
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 8a7ed83..d67d649 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -800,7 +800,9 @@ static radeon_agpmode_quirk radeon_agpmode_quirk_list[] = {
/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (ati ML) */
{ PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5964, 0x148c,0x2073,
4 },
/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (fdo #12544) */
- { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5964, 0x1043,0xc008,
4 },
+ { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5964,
PCI_VENDOR_ASUS,0xc008, 4 },
+ /* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (deb #545040) */
+ { PCI_VENDOR_VIA,0x3189, PCI_VENDOR_ATI,0x5960,
PCI_VENDOR_ASUS,0x004c, 4 },
/* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */
{ PCI_VENDOR_ATI,0xcbb2, PCI_VENDOR_ATI,0x5c61,
PCI_VENDOR_SONY,0x8175, 1 },
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered"
\
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcris...@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
