From d0af8d36f009d77a80f8752edd0276c0b00eecaf Mon Sep 17 00:00:00 2001 From: matthieu Date: Sat, 19 Apr 2008 14:02:04 +0000 Subject: [PATCH] update to xf86-video-radeonhd-1.2.1. --- driver/xf86-video-radeonhd/ChangeLog | 27 +++++++++++++++++++ driver/xf86-video-radeonhd/README | 5 ++++ driver/xf86-video-radeonhd/configure | 20 +++++++------- driver/xf86-video-radeonhd/configure.ac | 2 +- driver/xf86-video-radeonhd/man/Makefile.in | 2 +- .../xf86-video-radeonhd/src/rhd_connector.c | 2 +- driver/xf86-video-radeonhd/src/rhd_id.c | 12 ++++----- .../utils/conntest/Imakefile | 10 ++++--- 8 files changed, 58 insertions(+), 22 deletions(-) diff --git a/driver/xf86-video-radeonhd/ChangeLog b/driver/xf86-video-radeonhd/ChangeLog index bc3ad8aa5..85895ef70 100644 --- a/driver/xf86-video-radeonhd/ChangeLog +++ b/driver/xf86-video-radeonhd/ChangeLog @@ -1,3 +1,30 @@ +commit 761940fde7fef72bff18a8b8e840540452cf675a +Author: Matthias Hopf +Date: Mon Apr 14 17:21:48 2008 +0200 + + Bump to 1.2.1. Add changes to README. + +commit a898e097ca4ae26db1d0f71144df7a580f0612bd +Author: Egbert Eich +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 +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 +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 Date: Thu Apr 10 21:20:42 2008 +0200 diff --git a/driver/xf86-video-radeonhd/README b/driver/xf86-video-radeonhd/README index 331023220..851b6d385 100644 --- a/driver/xf86-video-radeonhd/README +++ b/driver/xf86-video-radeonhd/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/driver/xf86-video-radeonhd/configure b/driver/xf86-video-radeonhd/configure index 9ae2336b7..dc5ec4dcb 100644 --- a/driver/xf86-video-radeonhd/configure +++ b/driver/xf86-video-radeonhd/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xf86-video-radeonhd 1.2.0. +# Generated by GNU Autoconf 2.59 for xf86-video-radeonhd 1.2.1. # # Report bugs to . # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xf86-video-radeonhd' PACKAGE_TARNAME='xf86-video-radeonhd' -PACKAGE_VERSION='1.2.0' -PACKAGE_STRING='xf86-video-radeonhd 1.2.0' +PACKAGE_VERSION='1.2.1' +PACKAGE_STRING='xf86-video-radeonhd 1.2.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/radeonhd' ac_unique_file="Makefile.am" @@ -974,7 +974,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xf86-video-radeonhd 1.2.0 to adapt to many kinds of systems. +\`configure' configures xf86-video-radeonhd 1.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1040,7 +1040,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xf86-video-radeonhd 1.2.0:";; + short | recursive ) echo "Configuration of xf86-video-radeonhd 1.2.1:";; esac cat <<\_ACEOF @@ -1197,7 +1197,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xf86-video-radeonhd configure 1.2.0 +xf86-video-radeonhd configure 1.2.1 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1211,7 +1211,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xf86-video-radeonhd $as_me 1.2.0, which was +It was created by xf86-video-radeonhd $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1814,7 +1814,7 @@ fi # Define the identity of the package. PACKAGE='xf86-video-radeonhd' - VERSION='1.2.0' + VERSION='1.2.1' cat >>confdefs.h <<_ACEOF @@ -21938,7 +21938,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by xf86-video-radeonhd $as_me 1.2.0, which was +This file was extended by xf86-video-radeonhd $as_me 1.2.1, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22001,7 +22001,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xf86-video-radeonhd config.status 1.2.0 +xf86-video-radeonhd config.status 1.2.1 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/driver/xf86-video-radeonhd/configure.ac b/driver/xf86-video-radeonhd/configure.ac index 7ca71c8a9..89b953d39 100644 --- a/driver/xf86-video-radeonhd/configure.ac +++ b/driver/xf86-video-radeonhd/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) diff --git a/driver/xf86-video-radeonhd/man/Makefile.in b/driver/xf86-video-radeonhd/man/Makefile.in index ce6c73e40..457e91650 100644 --- a/driver/xf86-video-radeonhd/man/Makefile.in +++ b/driver/xf86-video-radeonhd/man/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.in,v 1.5 2008/04/19 13:41:45 matthieu Exp $ +# $Id: Makefile.in,v 1.6 2008/04/19 14:02:04 matthieu Exp $ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. # diff --git a/driver/xf86-video-radeonhd/src/rhd_connector.c b/driver/xf86-video-radeonhd/src/rhd_connector.c index e2c77cf18..dd720576f 100644 --- a/driver/xf86-video-radeonhd/src/rhd_connector.c +++ b/driver/xf86-video-radeonhd/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/driver/xf86-video-radeonhd/src/rhd_id.c b/driver/xf86-video-radeonhd/src/rhd_id.c index 3837faff7..e06f017c2 100644 --- a/driver/xf86-video-radeonhd/src/rhd_id.c +++ b/driver/xf86-video-radeonhd/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" @@ -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; } diff --git a/driver/xf86-video-radeonhd/utils/conntest/Imakefile b/driver/xf86-video-radeonhd/utils/conntest/Imakefile index 082105773..36a59c243 100644 --- a/driver/xf86-video-radeonhd/utils/conntest/Imakefile +++ b/driver/xf86-video-radeonhd/utils/conntest/Imakefile @@ -1,8 +1,10 @@ #include #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()