.gear/rules | 2 + .../tags/e810a72175a84ecda51ee258519c9666e79705aa | 6 + .gear/tags/list | 1 + src/radeon_driver.c | 1 + xinf2fdi | 97 +++++++++ xorg-drv-ati.spec | 221 ++++++++++++++++++++ 6 files changed, 328 insertions(+), 0 deletions(-) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..49bbc6e --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: xf86-video-ati-@version@:. +diff: xf86-video-ati-@version@:. . diff --git a/.gear/tags/e810a72175a84ecda51ee258519c9666e79705aa b/.gear/tags/e810a72175a84ecda51ee258519c9666e79705aa new file mode 100644 index 0000000..2ace29f --- /dev/null +++ b/.gear/tags/e810a72175a84ecda51ee258519c9666e79705aa @@ -0,0 +1,6 @@ +object c83fbdfa076c107012b7dfbbfbbb2feede00542b +type commit +tag xf86-video-ati-6.9.0 +tagger Alex Deucher 1214524148 -0400 + +Radeon driver 6.9.0 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..1ed40a3 --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +e810a72175a84ecda51ee258519c9666e79705aa xf86-video-ati-6.9.0 diff --git a/src/radeon_driver.c b/src/radeon_driver.c index f18ad99..9ead427 100644 --- a/src/radeon_driver.c +++ b/src/radeon_driver.c @@ -1984,6 +1984,7 @@ static Bool RADEONPreInitAccel(ScrnInfoPtr pScrn) } } #else /* USE_XAA */ + if (IS_AVIVO_VARIANT) info->useEXA = TRUE; #endif /* !USE_XAA */ #endif /* USE_EXA */ diff --git a/xinf2fdi b/xinf2fdi new file mode 100755 index 0000000..cc651d0 --- /dev/null +++ b/xinf2fdi @@ -0,0 +1,97 @@ +#!/bin/sh + +IN_FILE= +OUT_FILE= +DRIVER= + +add_match() +{ + if echo $p_id | grep -q "\;"; then + key="int_outof" + else + key="int" + fi + cat >> "$OUT_FILE" << EOF + + + $DRIVER + + + +EOF + +} + +add_ids() { + for ids in $IDS; do + if [ -z "$v_id" ]; then + v_id=${ids/-0x????/} + p_id=${ids/0x????-/} + else + if [ "${ids/-0x????/}" = "$v_id" ]; then + if [ -z "$p_id" ]; then + p_id=${ids/0x????-/} + else + p_id="$p_id;${ids/0x????-/}" + fi + else + add_match + v_id=${ids/-0x????/} + p_id=${ids/0x????-/} + fi + fi + done + add_match +} + +add_device() { + if [ -n "$IDS" ]; then + cat > "$OUT_FILE" << EOF + + + + +EOF + add_ids + cat >> "$OUT_FILE" << EOF + + +EOF + fi +} + +PROG="${0##*/}" + +TEMP=`getopt -n "$PROG" -o x:f:d: -l xinf:,fdi:,driver: -- "$@"` || exit 1 +eval set -- "$TEMP" + +while :; do + case "$1" in + -x|--xinf) + shift + IN_FILE="$1" + shift + ;; + -f|--fdi) + shift + OUT_FILE="$1" + shift + ;; + -d|--driver) + shift + DRIVER="$1" + shift + ;; + --) + shift + break + ;; + esac +done + +[ -n "$IN_FILE" ] || exit 1 +[ -n "$OUT_FILE" ] || exit 1 +[ -n "$DRIVER" ] || exit 1 + +IDS=`sed -ne 's|.*v....$....$d....$....$sv.*|0x\1-0x\2|p' "$IN_FILE" | sort -u` +add_device diff --git a/xorg-drv-ati.spec b/xorg-drv-ati.spec new file mode 100644 index 0000000..4e93167 --- /dev/null +++ b/xorg-drv-ati.spec @@ -0,0 +1,221 @@ +%define _hwdatadir %_datadir/hwdatabase/videoaliases +%define _fdidir %_datadir/hal/fdi/policy/20thirdparty + +Name: xorg-drv-ati +Version: 6.9.0 +Release: alt1 +Serial: 4 +Summary: ATI video driver +License: MIT/X11 +Group: System/X11 +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +Requires: XORG_ABI_VIDEODRV = %get_xorg_abi_videodrv +Requires: xorg-drv-radeon xorg-drv-r128 xorg-drv-mach64 +Provides: xorg-x11-drv-ati = %serial:%version-%release +Obsoletes: xorg-x11-drv-ati + +Source0: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: libmesa-devel libpci-devel libpciaccess-devel xorg-proto-devel xorg-util-macros xorg-sdk + +%description +ati is an Xorg wrapper driver for ATI video cards. It autodetects whether your hardware has a Radeon, +Rage 128, or Mach64 or earlier class of chipset, and loads the radeon(4), r128(4) driver as appropriate. + +The ati driver supports Radeon, Rage 128, and Mach64 and earlier chipsets by loading those drivers. +See those manpages for specific cards supported. + +%package -n xorg-drv-radeon +Summary: ATI RADION video driver +Group: System/X11 +Requires: XORG_ABI_VIDEODRV = %get_xorg_abi_videodrv +Requires: xorg-x11-dri-radeon xorg-x11-drv-multimedia xorg-x11-extensions-glx +Obsoletes: xorg-x11-drv-avivo <= 0.0.999 xorg-x11-drv-radeon +Provides: xorg-x11-drv-avivo = %version xorg-x11-drv-radeon = %serial:%version-%release +Conflicts: xorg-x11-drv-ati <= 6.6.3 + +%description -n xorg-drv-radeon +radeon is an Xorg driver for ATI RADEON based video cards. It contains full support for 8, 15, 16 and 24 bit pixel +depths, dual-head setup, flat panel, hardware 2D acceleration, hardware 3D acceleration, hardware cursor, XV extension, +and the Xinerama extension. + +%prep +%setup -q +%patch -p1 + +%build +%autoreconf +%configure \ + --with-xorg-module-dir=%_x11modulesdir \ + --enable-dri \ + --disable-static + +%make_build + +%install +%make DESTDIR=%buildroot install + +mkdir -p %buildroot%_hwdatadir +sed -ne 's,^$#define$[[:space:]]*$PCI_CHIP_$$.*$[[:space:]]*0x$[0-9A-Fa-f]*$,alias pcivideo:v00001002d0000\4sv*sd*bc*sc*i* ati # \3,p' src/ati_pciids_gen.h \ + > ati.xinf +awk '!/MACH|RAGE/ {print($1,$2,"radeon",$4,$5)}' ati.xinf > %buildroot%_hwdatadir/radeon.xinf + +mkdir -p %buildroot%_fdidir +sh xinf2fdi -x %buildroot%_hwdatadir/radeon.xinf -f %buildroot%_fdidir/20-x11-video-radeon.fdi -d radeon + +%triggerin -n xorg-drv-radeon -- xorg-x11-drv-avivo +subst 's|Driver$.*$\"$avivo$\"|Driver\1"radeon"|' %_sysconfdir/X11/xorg.conf + +%files +%_x11modulesdir/drivers/ati_drv.so +%_man4dir/ati.4* + +%files -n xorg-drv-radeon +%_x11modulesdir/drivers/radeon_drv.so +%dir %_x11modulesdir/multimedia +%_x11modulesdir/multimedia/*.so +%_man4dir/radeon.4* +%dir %_hwdatadir +%_hwdatadir/radeon.xinf +%_fdidir/20-x11-video-radeon.fdi + +%changelog +* Fri Jun 27 2008 Valery Inozemtsev 4:6.9.0-alt1 +- 6.9.0 release + +* Wed Jun 25 2008 Valery Inozemtsev 4:6.8.192-alt1 +- 6.9.0 RC2 + +* Fri Jun 13 2008 Valery Inozemtsev 4:6.8.191-alt1 +- 6.9.0rc1 + +* Mon Jun 02 2008 Valery Inozemtsev 4:6.8.0-alt5 +- renamed xorg-x11-drv-{ati,radeon} to xorg-drv-{ati,radeon} +- added requires XORG_ABI_VIDEODRV = 2.0 + +* Wed May 14 2008 Valery Inozemtsev 4:6.8.0-alt4 +- GIT snapshot 2008-05-14 (71fa57f871dba03260dba2180ce1dab44048ac1a) + + Add RS600 support + +* Fri Apr 18 2008 Valery Inozemtsev 4:6.8.0-alt3 +- GIT snapshot 2008-04-18 (c5d62fa0e8f52c3264ff9db3ff10cdf5a806bfc0) + +* Fri Apr 04 2008 Valery Inozemtsev 4:6.8.0-alt2 +- added conflicts to %name <= 6.6.3 (close #15230) + +* Thu Apr 03 2008 Valery Inozemtsev 4:6.8.0-alt1 +- 6.8.0 release + git 2008-03-28 (9c62c820ba45ebc14d5f36f5d7885863800b6adb) +- XAA by defaults for not avivo +- convert xinf to fdi + +* Sun Mar 23 2008 Valery Inozemtsev 3:6.8.0-alt3 +- separate packages + +* Thu Mar 13 2008 Valery Inozemtsev 3:6.8.0-alt2 +- 6.8.0 release + git fixes +- xf86-video-ati-6.7.195-rh-faster-ddc.patch: Speed up X startup by assuming the + monitor doesn't need a dead chicken waved over it to get DDC. + +* Wed Feb 20 2008 Valery Inozemtsev 3:6.8.0-alt1 +- 6.8.0 + +* Fri Dec 21 2007 Valery Inozemtsev 3:6.7.197-alt1 +- 6.8RC7 + +* Thu Nov 22 2007 Valery Inozemtsev 3:6.7.196-alt1 +- 6.8RC6 + +* Wed Nov 21 2007 Valery Inozemtsev 3:6.6.3-alt6 +- set XAA by defaults + +* Mon Sep 10 2007 Valery Inozemtsev 3:6.6.3-alt5 +- rebuild for xorg-server-1.4 + +* Tue Jul 31 2007 Valery Inozemtsev 3:6.6.3-alt4 +- generate ati.xinf from atipciids.h + +* Fri Jan 05 2007 Valery Inozemtsev 3:6.6.3-alt3 +- fixed %%description + +* Sun Nov 19 2006 Valery Inozemtsev 3:6.6.3-alt2 +- added xf86-video-ati-6.6.3-git-XAA-page-flipping.patch + +* Sat Nov 18 2006 Valery Inozemtsev 3:6.6.3-alt1 +- 6.6.3 + +* Thu Nov 16 2006 Valery Inozemtsev 3:6.6.2-alt5 +- added videoaliases file from RH + +* Wed Nov 08 2006 Valery Inozemtsev 3:6.6.2-alt4 +- added RH patches: xf86-video-ati-6.6.2-rh-ati-prefer-radeon-then-r128.patch, + xf86-video-ati-6.6.2-rh-r128-fp-dpms.patch, + xf86-video-ati-6.6.2-rh-r128-missing-xf86ForceHWCursor-symbol-bug168753.patch, + xf86-video-ati-6.6.2-rh-radeon-6.6.1-dotclock-filter.patch, + xf86-video-ati-6.6.2-rh-radeon-6.6.1-use-mtdriver.patch, + xf86-video-ati-6.6.2-rh-radeon-6.6.2-dac-fix.patch, + xf86-video-ati-6.6.2-rh-radeon-6.6.2-pmac-bios.patch, + xf86-video-ati-6.6.2-rh-radeon-6.6.2-usefbdev-patch.patch + +* Sun Nov 05 2006 Valery Inozemtsev 3:6.6.2-alt3 +- rollback to 6.6.2 +- added xf86-video-ati-6.6.2-git-rn50-memmap.patch + +* Sun Oct 29 2006 Valery Inozemtsev 2:6.6.3-alt2 +- added OpenSuSE patches + +* Fri Oct 27 2006 Valery Inozemtsev 2:6.6.3-alt1 +- rollback to 6.6.3 +- added xf86-video-ati-6.6.3-mach64-Use-private-DMA-buffers.patch + +* Sun Oct 22 2006 Valery Inozemtsev 1:6.6.99-alt1.3 +- GIT snapshot 2006-10-22: + + attempt to fix repeat picture acceleration + +* Wed Oct 18 2006 Valery Inozemtsev 1:6.6.99-alt1.2 +- GIT snapshot 2006-10-17 + +* Fri Oct 06 2006 Valery Inozemtsev 1:6.6.99-alt1 +- 6.6.99 + +* Thu Oct 05 2006 Valery Inozemtsev 1:6.6.2-alt2.git20061003 +- GIT snapshot 2006-10-03 + +* Mon Sep 18 2006 Valery Inozemtsev 1:6.6.2-alt2 +- fixup the rn50/m6/m7 memory map problem + +* Fri Aug 25 2006 Valery Inozemtsev 1:6.6.2-alt1 +- 6.6.2 + +* Fri Jun 16 2006 Valery Inozemtsev 1:6.6.1-alt1 +- 6.6.1 + +* Sat May 13 2006 Valery Inozemtsev 1:6.6.0-alt3 +- CVS snapshot 2006-05-09 + +* Wed May 03 2006 Valery Inozemtsev 1:6.6.0-alt2.cvs20060503 +- CVS snapshot 2006-05-03 + +* Thu Apr 20 2006 Valery Inozemtsev 1:6.6.0-alt1 +- 6.6.0 + +* Sun Feb 19 2006 Valery Inozemtsev 1:6.5.7.3-alt4 +- CVS snapshot 2006-02-17 + +* Mon Jan 23 2006 Valery Inozemtsev 1:6.5.7.3-alt3 +- removed memmap_fix patch (problem for Radeon R100 QD) + +* Sat Jan 14 2006 Valery Inozemtsev 1:6.5.7.3-alt2 +- added memmap_fix patch + +* Wed Dec 28 2005 Valery Inozemtsev 1:6.5.7.3-alt1 +- Xorg-7.0 + +* Sun Dec 04 2005 Valery Inozemtsev 1:6.5.7.1-alt1 +- Xorg-7.0RC3 + +* Sun Nov 27 2005 Valery Inozemtsev 1:6.5.7-alt0.1 +- initial release +