xserver-xorg-video-radeonhd: Changes to 'debian-unstable'
ChangeLog | 27 +++++++++++++++++++++++++++
README | 5 +++++
configure.ac | 2 +-
debian/changelog | 10 ++++++++++
debian/patches/01_gen_pci_ids.diff | 6 +++---
debian/rules | 2 +-
src/rhd_connector.c | 2 +-
src/rhd_id.c | 12 ++++++------
utils/conntest/Imakefile | 10 +++++++---
9 files changed, 61 insertions(+), 15 deletions(-)
New commits:
commit 9e858669b12207b8d04e3755fe9a9ae36664e19d
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 15 21:07:50 2008 +0200
Run dpkg-shlibdeps with --warnings=6
Drivers reference symbols from /usr/bin/Xorg and other modules, and
that's not a bug, so we want dpkg-shlibdeps to shut up about symbols it
can't find.
diff --git a/debian/changelog b/debian/changelog
index 5c6d1aa..d649f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xserver-xorg-video-radeonhd (1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh patch 01_gen_pci_ids.diff.
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find.
-- Julien Cristau <jcristau@debian.org> Tue, 15 Apr 2008 20:50:53 +0200
diff --git a/debian/rules b/debian/rules
index 4f8c20a..632c9b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit 622d198ec92d6bf95afc1a3262739585d6fd04f5
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 15 21:03:48 2008 +0200
Refresh patch 01_gen_pci_ids.diff.
diff --git a/debian/changelog b/debian/changelog
index a17d9b5..5c6d1aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-video-radeonhd (1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh patch 01_gen_pci_ids.diff.
-- Julien Cristau <jcristau@debian.org> Tue, 15 Apr 2008 20:50:53 +0200
diff --git a/debian/patches/01_gen_pci_ids.diff b/debian/patches/01_gen_pci_ids.diff
index b860593..8d4312e 100644
--- a/debian/patches/01_gen_pci_ids.diff
+++ b/debian/patches/01_gen_pci_ids.diff
@@ -1,8 +1,8 @@
Index: xserver-xorg-video-radeonhd/src/Makefile.am
===================================================================
---- xserver-xorg-video-radeonhd.orig/src/Makefile.am 2007-12-01 13:37:24.000000000 +0100
-+++ xserver-xorg-video-radeonhd/src/Makefile.am 2007-12-01 13:37:31.000000000 +0100
-@@ -92,3 +92,9 @@
+--- xserver-xorg-video-radeonhd.orig/src/Makefile.am
++++ xserver-xorg-video-radeonhd/src/Makefile.am
+@@ -102,3 +102,9 @@
radeonhd_drv_la_LIBADD = libatom.la
endif
commit e8658beb020bbdae38d817e4be7584505c94bb4f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Apr 15 20:51:11 2008 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index bc3ad8a..85895ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+commit 761940fde7fef72bff18a8b8e840540452cf675a
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Mon Apr 14 17:21:48 2008 +0200
+
+ Bump to 1.2.1. Add changes to README.
+
+commit a898e097ca4ae26db1d0f71144df7a580f0612bd
+Author: Egbert Eich <eich@freedesktop.org>
+Date: Sat Apr 12 17:57:46 2008 +0200
+
+ Add build rule for rhd_dump to Imakefile for backward compatibility.
+
+commit e54fda75f2fcc141825d928cf71e23dce23ae095
+Author: Stefan Dirsch <sndirsch@suse.de>
+Date: Sun Apr 13 11:35:31 2008 +0200
+
+ Added two new RV670 devices. Removed unsupported M86 device.
+
+ New RV670 devices added: HD 3960, FireStream 9170. Unsupported
+ M86 device removed: HD3650.
+
+commit 19c048d38af6c96182fee7857c3e8a272f77c800
+Author: Matthias Hopf <mhopf@suse.de>
+Date: Fri Apr 11 14:48:21 2008 +0200
+
+ Fix broken assert() in rhd_id.c. Use ASSERT() instead of assert() everywhere.
+
commit 9d131f9035b3b0ff7755dda708e16326aa156e83
Author: Matthias Hopf <mhopf@suse.de>
Date: Thu Apr 10 21:20:42 2008 +0200
diff --git a/debian/changelog b/debian/changelog
index 5c99ef8..a17d9b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-radeonhd (1.2.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 15 Apr 2008 20:50:53 +0200
+
xserver-xorg-video-radeonhd (1.2.0-1) unstable; urgency=low
* New upstream release.
commit 761940fde7fef72bff18a8b8e840540452cf675a
Author: Matthias Hopf <mhopf@suse.de>
Date: Mon Apr 14 17:21:48 2008 +0200
Bump to 1.2.1. Add changes to README.
diff --git a/README b/README
index 3310232..851b6d3 100644
--- a/README
+++ b/README
@@ -33,6 +33,11 @@ Major Changes
Read ChangeLog for a complete list.
+- Version 1.2.1
+
+ - Build-fixes for systems without -NDEBUG, and for rhd_dump
+ - Added two new RV670 devices.
+
- Version 1.2.0
- Added support for RV620, RV635, and R680.
diff --git a/configure.ac b/configure.ac
index 7ca71c8..89b953d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-radeonhd],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd],
xf86-video-radeonhd)
commit a898e097ca4ae26db1d0f71144df7a580f0612bd
Author: Egbert Eich <eich@freedesktop.org>
Date: Sat Apr 12 17:57:46 2008 +0200
Add build rule for rhd_dump to Imakefile for backward compatibility.
diff --git a/utils/conntest/Imakefile b/utils/conntest/Imakefile
index 0821057..36a59c2 100644
--- a/utils/conntest/Imakefile
+++ b/utils/conntest/Imakefile
@@ -1,8 +1,10 @@
#include <Server.tmpl>
#include "../../RadeonHD.tmpl"
-SRCS = rhd_conntest.c git_version.h
-OBJS = rhd_conntest.o
+SRCS_conntest = rhd_conntest.c git_version.h
+OBJS_conntest = rhd_conntest.o
+SRCS_dump = rhd_dump.c git_version.h
+OBJS_dump = rhd_dump.o
INCLUDES = -I$(TOP)/src/AtomBios/includes
@@ -12,6 +14,8 @@ DEFINES = $(INCLUDES) \
SYS_LIBS = -lpci -lz
-NormalProgramTarget(rhd_conntest,$(OBJS),,,$(SYS_LIBS))
+NormalProgramTarget(rhd_conntest,$(OBJS_conntest),,,$(SYS_LIBS))
+NormalProgramTarget(rhd_dump,$(OBJS_dump),,,$(SYS_LIBS))
AllTarget(ProgramTargetName(rhd_conntest))
+AllTarget(ProgramTargetName(rhd_dump))
DependTarget()
commit e54fda75f2fcc141825d928cf71e23dce23ae095
Author: Stefan Dirsch <sndirsch@suse.de>
Date: Sun Apr 13 11:35:31 2008 +0200
Added two new RV670 devices. Removed unsupported M86 device.
New RV670 devices added: HD 3960, FireStream 9170. Unsupported
M86 device removed: HD3650.
diff --git a/src/rhd_id.c b/src/rhd_id.c
index 9d37f96..e06f017 100644
--- a/src/rhd_id.c
+++ b/src/rhd_id.c
@@ -229,6 +229,8 @@ const PCI_ID_LIST = {
RHD_DEVICE_MATCH( 0x950F, RHD_R680 ), /* ATI Radeon HD3870 X2 */
RHD_DEVICE_MATCH( 0x9511, RHD_RV670 ), /* ATI FireGL V7700 */
RHD_DEVICE_MATCH( 0x9515, RHD_RV670 ), /* ATI Radeon HD 3850 AGP */
+ RHD_DEVICE_MATCH( 0x9517, RHD_RV670 ), /* ATI Radeon HD 3960 */
+ RHD_DEVICE_MATCH( 0x9519, RHD_RV670 ), /* FireStream 9170 */
RHD_DEVICE_MATCH( 0x9580, RHD_RV630 ), /* RV630 */
RHD_DEVICE_MATCH( 0x9581, RHD_M76 ), /* Mobility Radeon HD 2600 */
RHD_DEVICE_MATCH( 0x9583, RHD_M76 ), /* Mobility Radeon HD 2600 XT */
@@ -242,7 +244,6 @@ const PCI_ID_LIST = {
RHD_DEVICE_MATCH( 0x958D, RHD_RV630 ), /* FireGL V3600 */
RHD_DEVICE_MATCH( 0x958E, RHD_RV630 ), /* ATI Radeon HD 2600 LE */
RHD_DEVICE_MATCH( 0x9590, RHD_RV635 ), /* ATI Radeon HD 3600 Series */
- RHD_DEVICE_MATCH( 0x9591, RHD_RV635 ), /* ATI Mobility Radeon HD 3650 */
RHD_DEVICE_MATCH( 0x9596, RHD_RV635 ), /* ATI Radeon HD 3650 AGP */
RHD_DEVICE_MATCH( 0x9597, RHD_RV635 ), /* ATI Radeon HD 3600 Series */
RHD_DEVICE_MATCH( 0x9598, RHD_RV635 ), /* ATI Radeon HD 3670 */
@@ -325,7 +326,7 @@ RHDIdentify(int flags)
"\tRV630 : Radeon HD 2600 LE/Pro/XT, HD 2600 Pro/XT AGP; Gemini RV630;\n"
"\t\tFireGL V3600/V5600.\n"
"\tRV635 : Radeon HD 3650, HD 3670.\n"
- "\tRV670 : Radeon HD 3850, HD 3870, FireGL V7700.\n"
+ "\tRV670 : Radeon HD 3690, 3850, HD 3870, FireGL V7700, FireStream 9170.\n"
"\tR680 : Radeon HD 3870 X2.\n");
xf86Msg(X_NONE,
"\tM52 : Mobility Radeon X1300.\n"
@@ -342,8 +343,7 @@ RHDIdentify(int flags)
"\tM74 : Mobility Radeon HD 2400 XT.\n"
"\tM76 : Mobility Radeon HD 2600;\n"
"\t\t(Gemini ATI) Mobility Radeon HD 2600 XT.\n"
- "\tM82 : Mobility Radeon HD 3400.\n"
- "\tM86 : Mobility Radeon HD 3600.\n");
+ "\tM82 : Mobility Radeon HD 3400.\n");
xf86Msg(X_NONE,
"\tRS600 : Radeon Xpress 1200, Xpress 1250.\n"
"\tRS690 : Radeon X1200, X1250, X1270.\n"
commit 19c048d38af6c96182fee7857c3e8a272f77c800
Author: Matthias Hopf <mhopf@suse.de>
Date: Fri Apr 11 14:48:21 2008 +0200
Fix broken assert() in rhd_id.c. Use ASSERT() instead of assert() everywhere.
diff --git a/src/rhd_connector.c b/src/rhd_connector.c
index e2c77cf..dd72057 100644
--- a/src/rhd_connector.c
+++ b/src/rhd_connector.c
@@ -143,7 +143,7 @@ rhdConnectorSynthName(struct rhdConnectorInfo *ConnectorInfo,
char *typec;
char *str1, *str2;
- assert(state != NULL);
+ ASSERT(state != NULL);
if (!*state) {
if (!(*state = xcalloc(sizeof(struct rhdCsState), 1)))
diff --git a/src/rhd_id.c b/src/rhd_id.c
index 3837faf..9d37f96 100644
--- a/src/rhd_id.c
+++ b/src/rhd_id.c
@@ -360,7 +360,7 @@ RHDIdentify(int flags)
enum RHD_FAMILIES
RHDFamily(enum RHD_CHIPSETS chipset)
{
- assert(chipset <= sizeof(RHDChipsetMap)/sizeof(rhdChipsetMapStruct));
+ ASSERT(chipset < sizeof(rhdChipsetMap)/sizeof(struct rhdChipsetMapStruct));
return rhdChipsetMap[chipset].family;
}
@@ -371,7 +371,7 @@ RHDFamily(enum RHD_CHIPSETS chipset)
Bool
RHDIsIGP(enum RHD_CHIPSETS chipset)
{
- assert(chipset <= sizeof(RHDChipsetMap)/sizeof(rhdChipsetMapStruct));
+ ASSERT(chipset < sizeof(rhdChipsetMap)/sizeof(struct rhdChipsetMapStruct));
return rhdChipsetMap[chipset].IGP;
}
Reply to: